From 69e4cf5089366984877b4c88acc69a8b1254a009 Mon Sep 17 00:00:00 2001 From: Terran McCanna Date: Thu, 11 Jun 2015 18:15:13 -0400 Subject: [PATCH] LP#1454871: Fix KPAC Hold Notification Preferences Correction to KPAC holds notification default preferences to allow for SMS text messaging options. Prior to this correction, KPAC hold notifications would only pick up hold preferences if set to email and/or phone. This correction allows it to pick up email and/or phone and/or sms notification preferences. To test, set hold preferences to different options, place hold via the KPAC, and then view the hold to see which preferences were recognized. (May need to show columns for Phone Notify, Text Notify, and Email Notify.) Signed-off-by: Terran McCanna Signed-off-by: Josh Stompro Signed-off-by: Galen Charlton --- Open-ILS/src/templates/kpac/getit.tt2 | 36 ++++++++++++++++++--------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/Open-ILS/src/templates/kpac/getit.tt2 b/Open-ILS/src/templates/kpac/getit.tt2 index 95d293146f..dd1d5c5bd6 100644 --- a/Open-ILS/src/templates/kpac/getit.tt2 +++ b/Open-ILS/src/templates/kpac/getit.tt2 @@ -86,18 +86,30 @@ [%- END -%] [%- IF ctx.user.email -%] - [%- IF ctx.notify_method == 'email' OR ctx.notify_method == 'email|phone' -%] - - [%- END -%] - [%- END -%] - - [%- IF allow_phone_notifications == 'true' -%] - [%- IF ctx.notify_method == 'phone' OR ctx.notify_method == 'email|phone' -%] - - - [%- END -%] - [%- END -%] + [% ctx.notify_method.search('email') ? + '' : '' %] + [%- END -%] + + [%- IF allow_phone_notifications == 'true' -%] + [% IF ctx.default_phone %] + [% phone_value = ctx.default_phone %] + [% ELSE %] + [% phone_value= ctx.user.day_phone %] + [% END %] + + [% ctx.notify_method.search('phone') ? + ' + ' : '' %] + [%- END -%] + + [% IF ctx.get_org_setting(ctx.search_ou, 'sms.enable') == 1 %] + [% setting_notify = 'opac.default_sms_notify'; + setting_carrier = 'opac.default_sms_carrier'; %] + [% ctx.notify_method.search('sms') ? + ' + + ' : '' %] + [% END %] [% END %] -- 2.43.2