From 8b1175e2674ff158974aa784a83f3ba810a215fb Mon Sep 17 00:00:00 2001 From: Katrin Fischer <katrin.fischer.83@web.de> Date: Mon, 21 Sep 2020 05:08:32 +0000 Subject: [PATCH] Bug 13625: Change messaging preferences descriptions according to RenewalSendNotice Sending out renewal notices depends on the RenewalSendNotice and the patron having the checkout notice checked in their messaging preferences. To test: - Apply patch - Take a look at the messaging preferences table on the following pages: - OPAC > patron account > your messaging tab - Staff interface > patron account > details tab - Staff interface > patron account > edit patron - Toggle the RenewalSendNotice preferences - The label on the last notice should switch between "Item checkout" and "Item checkout and renewal" depending on the pref setting Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> --- .../prog/en/includes/messaging-preference-form.inc | 7 ++++++- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt | 7 ++++++- 2 files changed, 12 insertions(+), 2 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 2f948c6236..d2faaabb7d 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 @@ -19,7 +19,12 @@ [% ELSIF ( messaging_preference.Upcoming_Events ) %]Upcoming events [% ELSIF ( messaging_preference.Hold_Filled ) %]Hold filled [% ELSIF ( messaging_preference.Item_Check_in ) %]Item check-in - [% ELSIF ( messaging_preference.Item_Checkout ) %]Item checkout + [% ELSIF ( messaging_preference.Item_Checkout ) %] + [% IF Koha.Preference( 'RenewalSendNotice' ) %] + Item checkout and renewal + [% ELSE %] + Item checkout + [% END %] [% ELSE %]Unknown [% END %]</td> [% IF ( messaging_preference.takes_days ) %] <td> 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 a2122b70fe..0b44d80ade 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt @@ -60,7 +60,12 @@ [% ELSIF ( messaging_preference.Upcoming_Events ) %]Upcoming events [% ELSIF ( messaging_preference.Hold_Filled ) %]Hold filled [% ELSIF ( messaging_preference.Item_Check_in ) %]Item check-in - [% ELSIF ( messaging_preference.Item_Checkout ) %]Item checkout + [% ELSIF ( messaging_preference.Item_Checkout ) %] + [% IF Koha.Preference( 'RenewalSendNotice' ) %] + Item checkout and renewal + [% ELSE %] + Item checkout + [% END %] [% ELSE %]Unknown [% END %]</td> [% IF ( messaging_preference.takes_days ) %] <td><select class="input-mini" name="[% messaging_preference.message_attribute_id | html %]-DAYS"> -- 2.20.1