From 3b4f995a178fc5cbf10edddadfa45af385b2a5a9 Mon Sep 17 00:00:00 2001
From: Kyle Huckins <khuckins@catalyte.io>
Date: Wed, 28 Nov 2018 21:09:04 +0000
Subject: [PATCH] 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>

 Changes to be committed:
	modified:   Open-ILS/src/templates/opac/myopac/prefs.tt2
	modified:   Open-ILS/src/templates/opac/myopac/prefs_notify.tt2

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Signed-off-by: Chris Sharp <csharp@georgialibraries.org>
---
 Open-ILS/src/templates/opac/myopac/prefs.tt2        | 10 +++++-----
 Open-ILS/src/templates/opac/myopac/prefs_notify.tt2 | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Open-ILS/src/templates/opac/myopac/prefs.tt2 b/Open-ILS/src/templates/opac/myopac/prefs.tt2
index 39bba393ac..cf7670cdc5 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 bbde0d8367..dc8173f7dd 100644
--- a/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2
+++ b/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2
@@ -76,6 +76,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>
@@ -83,18 +88,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>
-- 
2.11.0