From c081c3197448df15ea47965b2629f5dd2db0a65e 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 --- admin/categories.pl | 5 ++++- .../en/includes/messaging-preference-form.inc | 1 + .../prog/en/modules/admin/categories.tt | 15 +++++++++++++++ .../bootstrap/en/modules/opac-messaging.tt | 1 + opac/opac-messaging.pl | 1 + 5 files changed, 22 insertions(+), 1 deletion(-) diff --git a/admin/categories.pl b/admin/categories.pl index ce1bd85d287..cd58eb5d854 100755 --- a/admin/categories.pl +++ b/admin/categories.pl @@ -78,8 +78,9 @@ elsif ( $op eq 'cud-add_validate' ) { my $min_password_length = $input->param('min_password_length'); my $require_strong_password = $input->param('require_strong_password'); my $noissuescharge = $input->param('noissuescharge') || undef; - my $noissueschargeguarantees = $input->param('noissueschargeguarantees') || 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'); @@ -121,6 +122,7 @@ elsif ( $op eq 'cud-add_validate' ) { $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 ); @@ -158,6 +160,7 @@ elsif ( $op eq 'cud-add_validate' ) { 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 b7c0c63d9d0..a7731401559 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 @@ -18,6 +18,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_') %] 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 aa1785de62a..4b07bb08b63 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt @@ -495,6 +495,19 @@
If set, this will override the global value set in the NoIssuesChargeGuarantorsWithGuarantees preference
+
  • + + +
    Make the expiry notice mandatory for all patrons in this category and prevent patrons from opting out in the messaging preferences
    +
  • @@ -643,6 +656,7 @@ Checkout charge limit Guarantees checkout charge limit Guarantors with guarantees checkout charge limit + Enforce patron expiry notice Actions @@ -796,6 +810,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 38a88151d22..3785bfa6926 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt @@ -60,6 +60,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 a3eab4d74fe..39fc76d0892 100755 --- a/opac/opac-messaging.pl +++ b/opac/opac-messaging.pl @@ -77,6 +77,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.3 (Apple Git-146)