From: Kyle Huckins <khuckins@catalyte.io>
Date: Wed, 28 Nov 2018 21:09:04 +0000 (+0000)
Subject: lp1777677 Test Notification OPAC success prompt
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=48b0f0e498f36f40bcfdfdc456d431cd9e8f7da8;p=evergreen%2Fpines.git

lp1777677 Test Notification OPAC success prompt

- Move OPAC success prompt higher up to ensure message is
seen.
- Ensure OPAC SMS test notification doesn't send email.

Signed-off-by: Kyle Huckins <khuckins@catalyte.io>
Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Signed-off-by: Chris Sharp <csharp@georgialibraries.org>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---

diff --git a/Open-ILS/src/templates/opac/myopac/prefs.tt2 b/Open-ILS/src/templates/opac/myopac/prefs.tt2
index 724116c666..e609908534 100644
--- a/Open-ILS/src/templates/opac/myopac/prefs.tt2
+++ b/Open-ILS/src/templates/opac/myopac/prefs.tt2
@@ -91,6 +91,11 @@
                     title="[% l('Change Password') %]">[% l("Change") %]</a></td>
                 [%- END %]
             </tr>
+            <tr id="test_notification_banner" style="display:none">
+                <td colspan="4">
+                    [% INCLUDE "opac/myopac/test_notification.tt2" %]
+                </td>
+            </tr>
             <tr>
                 <td class='color_4 light_border'>[% l("Email Address") %]</td>
                 <td class='light_border'>[% ctx.user.email | html %]</td>
@@ -108,11 +113,6 @@
                     title="[% l('Update Email Address') %]">[% l('Change') %]</a></td>
                 [%- END %]
             </tr>
-            <tr id="test_notification_banner" style="display:none">
-                <td colspan="4">
-                    [% INCLUDE "opac/myopac/test_notification.tt2" %]
-                </td>
-            </tr>
             <tr>
             [% IF ctx.user.ident_value %]<tr class="hide_me">
                 <td class='color_4 light_border'>
diff --git a/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2 b/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2
index 346b744230..a868c40f94 100644
--- a/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2
+++ b/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2
@@ -125,6 +125,11 @@
                         <td>[% INCLUDE "opac/parts/sms_carrier_selector.tt2" sms_carrier_hide_label="true" %]</td>
                     </tr>
                     [% setting = 'opac.default_sms_notify' %]
+                    <tr id="test_notification_banner" style="display:none">
+                        <td colspan="4">
+                            [% INCLUDE "opac/myopac/test_notification.tt2" %]
+                        </td>
+                    </tr>
                     <tr>
                         <td><label for='[% setting %]'>[% l('Default Mobile Number') %]</label></td>
                         <td>
@@ -132,18 +137,13 @@
                                 [% IF ctx.user_setting_map.$setting; %] value='[% ctx.user_setting_map.$setting | html %]' [% END %]/>
                             [% IF ctx.user_setting_map.$setting; %]
                             <a href="#" onclick="sendTestNotification(
-                                [% ctx.user.id %], [% ctx.user.home_ou.id %], 'email', '[% ctx.authtoken %]'
+                                [% ctx.user.id %], [% ctx.user.home_ou.id %], 'sms_text', '[% ctx.authtoken %]'
                             )"
                             title="[% l('Send Test Text Message') %]">[% l('Send Test Text Message') %]</a><br />
                             [% l('Hint: use the full 10 digits of your phone #, no spaces, no dashes'); %]
                             [% END %]
                         </td>
                     </tr>
-                    <tr id="test_notification_banner" style="display:none">
-                        <td colspan="4">
-                            [% INCLUDE "opac/myopac/test_notification.tt2" %]
-                        </td>
-                    </tr>
                     [% END %]
                     [% FOR optin IN ctx.opt_in_settings %]
                     <tr>