From 79320274961c3f9a59eb7815eca8de66302ffef9 Mon Sep 17 00:00:00 2001 From: Kyle Hall Date: Fri, 15 Jul 2022 14:10:37 -0400 Subject: [PATCH] Bug 31166: Digest option is not selectable for phone when PhoneNotification is enabled Digests are not available via Talking Tech, but the artificial limit should not be in place for the non-TT phone notices. If only phone is selected, digest remains disabled. Test Plan: 1) Apply this patch 2) Enable TalkingTechPhoneNotification 3) Verify behavior hasn't changed 4) Disable TalkingTechPhoneNotification, Enable PhoneNotification 5) Note disgest option is now selectable if only phone is selected Signed-off-by: Evelyn Hartline Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi Bug 31166: (QA follow-up) Remove debugging lines Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi Bug 31166: (QA follow-up) Implement on OPAC side Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi Squashed by RM (cherry picked from commit 0622e118dbdd1687127c0734386e07ca268fd90d) Signed-off-by: Martin Renvoize --- .../prog/en/includes/messaging-preference-form.inc | 12 ++++++++---- .../prog/js/messaging-preference-form.js | 6 +++++- .../bootstrap/en/modules/opac-messaging.tt | 13 ++++++++++--- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc index accdad7c19..0638545742 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc @@ -1,6 +1,10 @@ [% USE Koha %] + @@ -109,12 +113,12 @@ + value="itiva" checked="checked" class="pmp_phone active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> [% ELSE %] + value="itiva" class="pmp_phone active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> [% END %] [% END %] @@ -141,12 +145,12 @@ + value="phone" checked="checked" class="pmp_phone active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> [% ELSE %] + value="phone" class="pmp_phone active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js b/koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js index 9fc1eb079f..5fdc5c1917 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js +++ b/koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js @@ -55,7 +55,8 @@ $(document).ready(function(){ } function toggle_digest(id){ - if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) { + let phone_checked = TalkingTechItivaPhoneNotification ? false : PhoneNotification ? $("#phone"+id).prop("checked") : false; + if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") || phone_checked ) { $("#digest"+id).attr("disabled", false).tooltip('disable'); } else { $("#digest"+id).attr("disabled", true).prop("checked",false).tooltip('enable'); @@ -74,6 +75,9 @@ $(document).ready(function(){ $(".pmp_sms").click(function(){ toggle_digest(Number($(this).attr("id").replace("sms", ""))); }); + $(".pmp_phone").click(function(){ + toggle_digest(Number($(this).attr("id").replace("phone", ""))); + }); // $('#memberentry_messaging_prefs [data-toggle="tooltip"][disabled]').tooltip(); }); diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt index 97e57a0ce3..598ba1f20a 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt @@ -110,13 +110,13 @@
[% IF ( messaging_preference.transports_phone ) %] [% ELSE %] @@ -259,7 +259,11 @@ $("#info_digests").tooltip(); function toggle_digest(id){ - if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) { + let PhoneNotification = [% Koha.Preference('PhoneNotification') || 0 | html %]; + let TalkingTechItivaPhoneNotification = [% Koha.Preference('TalkingTechItivaPhoneNotification') || 0 | html %]; + let phone_checked = TalkingTechItivaPhoneNotification ? false : PhoneNotification ? $("#phone"+id).prop("checked") : false; + + if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") || phone_checked ) { $("#digest"+id).attr("disabled", false).tooltip('disable'); } else { $("#digest"+id).attr("disabled", true).prop("checked",false).tooltip('enable'); @@ -278,6 +282,9 @@ $(".pmp_sms").click(function(){ toggle_digest(Number($(this).attr("id").replace("sms", ""))); }); + $(".pmp_phone").click(function(){ + toggle_digest(Number($(this).attr("id").replace("phone", ""))); + }); }); -- 2.39.5