From 6ae26d002aad014c5da9647d254c145e875bb859 Mon Sep 17 00:00:00 2001 From: Matt Blenkinsop Date: Tue, 3 Dec 2024 16:51:14 +0000 Subject: [PATCH] Bug 30301: Update templates Signed-off-by: Hanna Leiker Signed-off-by: Nick Clemens --- admin/categories.pl | 3 ++ .../en/includes/messaging-preference-form.inc | 31 +++++++++++++------ .../prog/en/modules/admin/categories.tt | 15 +++++++++ .../bootstrap/en/modules/opac-messaging.tt | 1 + opac/opac-messaging.pl | 1 + 5 files changed, 42 insertions(+), 9 deletions(-) diff --git a/admin/categories.pl b/admin/categories.pl index 60935838880..04b5e5cc024 100755 --- a/admin/categories.pl +++ b/admin/categories.pl @@ -79,6 +79,7 @@ if ( $op eq 'add_form' ) { my $noissuescharge = $input->param('noissuescharge') || undef; my $noissueschargeguarantees = $input->param('noissueschargeguarantees') || undef; my $noissueschargeguarantorswithguarantees = $input->param('noissueschargeguarantorswithguarantees') || undef; + my $enforce_expiry_notice = $input->param('enforce_expiry_notice'); my @branches = grep { $_ ne q{} } $input->multi_param('branches'); my $can_be_guarantee = $input->param('can_be_guarantee'); @@ -120,6 +121,7 @@ if ( $op eq 'add_form' ) { $category->noissueschargeguarantees($noissueschargeguarantees); $category->noissueschargeguarantorswithguarantees($noissueschargeguarantorswithguarantees); $category->force_password_reset_when_set_by_staff($force_password_reset_when_set_by_staff); + $category->enforce_expiry_notice($enforce_expiry_notice); eval { $category->store; $category->replace_library_limits( \@branches ); @@ -157,6 +159,7 @@ if ( $op eq 'add_form' ) { noissuescharge => $noissuescharge, noissueschargeguarantees => $noissueschargeguarantees, noissueschargeguarantorswithguarantees => $noissueschargeguarantorswithguarantees, + enforce_expiry_notice => $enforce_expiry_notice, force_password_reset_when_set_by_staff => $force_password_reset_when_set_by_staff, } ); 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 0f6eeca4fe2..6737f1266de 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 @@ -22,6 +22,7 @@ [% FOREACH messaging_preference IN messaging_preferences %] [% NEXT IF !Koha.Preference( 'ILLModule' ) && messaging_preference.message_name.match('^Ill_') %] [% NEXT IF !Koha.Preference('MembershipExpiryDaysNotice') && messaging_preference.Patron_Expiry %] + [% NEXT IF messaging_preference.Patron_Expiry && (category.enforce_expiry_notice || patron.category.enforce_expiry_notice) %] [% NEXT IF messaging_preference.Auto_Renewals && Koha.Preference('AutoRenewalNotices') != 'preferences' %] [% NEXT IF !Koha.Preference('UseRecalls') && messaging_preference.message_name.match('^Recall_') %] @@ -43,7 +44,7 @@ Item checkout [% END %] [% ELSIF ( messaging_preference.Patron_Expiry ) %] - Patron account expiry + Patron expiry [% ELSIF ( messaging_preference.Ill_ready ) %] Interlibrary loan ready [% ELSIF ( messaging_preference.Ill_unavailable ) %] @@ -62,15 +63,27 @@ [% IF ( messaging_preference.takes_days ) %] - + [% FOREACH select_day IN messaging_preference.select_days %] + [% IF ( select_day.selected ) %] + + [% ELSE %] + + [% END %] [% END %] - [% END %] - + + [% ELSE %] + + [% END %] [% ELSE %] - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt index a8a7adde0a6..fe51cdb85fe 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt @@ -508,6 +508,19 @@ [%- SET pref_NoIssuesChargeGuarantorsWithGuarantees_link = 'NoIssuesChargeGuarantees' -%]
If set, this will override the global value set in the [%- pref_NoIssuesChargeGuarantorsWithGuarantees_link | $raw | $KohaSpan -%] preference.
+
  • + + +
    Make the expiry notice mandatory for all patrons in this category and prevent patrons from opting out in the messaging preferences
    +
  • @@ -656,6 +669,7 @@ Checkout charge limit Guarantees checkout charge limit Guarantors with guarantees checkout charge limit + Enforce patron expiry notice Actions @@ -831,6 +845,7 @@ [% ELSE %] [% 0.00 | $Price %] [% END %] + [% IF category.enforce_expiry_notice %]Yes[% ELSE %]No[% END %] Edit Delete 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 6c4c4db1c6b..4c092e4e40b 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt @@ -68,6 +68,7 @@ [% FOREACH messaging_preference IN messaging_preferences %] [% NEXT IF !Koha.Preference( 'ILLModule' ) && messaging_preference.message_name.match('^Ill_') %] [% NEXT IF !Koha.Preference('MembershipExpiryDaysNotice') && messaging_preference.Patron_Expiry %] + [% NEXT IF messaging_preference.Patron_Expiry && enforce_expiry_notice %] [% NEXT IF messaging_preference.Auto_Renewals && Koha.Preference('AutoRenewalNotices') != 'preferences' %] [% NEXT IF !Koha.Preference('UseRecalls') && messaging_preference.message_name.match('^Recall_') %] diff --git a/opac/opac-messaging.pl b/opac/opac-messaging.pl index 66f070c6774..399451790a2 100755 --- a/opac/opac-messaging.pl +++ b/opac/opac-messaging.pl @@ -84,6 +84,7 @@ $template->param( SMSnumber => $patron->smsalertnumber, # FIXME This is already sent 2 lines above SMSSendDriver => C4::Context->preference("SMSSendDriver"), TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification"), + enforce_expiry_notice => $patron->category->enforce_expiry_notice, ); if ( $opac_messaging && C4::Context->preference("SMSSendDriver") eq 'Email' ) { -- 2.39.5