From eee42efeba0222ca22be8c600812e082ab6e2b6f Mon Sep 17 00:00:00 2001 From: Matt Blenkinsop Date: Tue, 3 Dec 2024 16:51:46 +0000 Subject: [PATCH] Bug 30301: Update cronjob to check for mandatory notice The patches on this bug add the ability for staff members to set the patron expiry notice as mandatory at the category level. When set, the cronjob will automatically send an expiry notice regardless of existing messaging preferences. If it is turned off, the old messaging preferences will still be in place and actioned Test plan: 1) Apply patch and run updatedatabase 2) In system preferences set MembershipExpiryDaysNotice to 5 3) Choose a patron and edit their expiry date to today's date, ensuring they have a primary email set 4) Create a MEMBERSHIP_EXPIRY notice (content of the notice is irrelevant, just needs to exist) 5) Run perl misc/cronjobs/membership_expiry.pl -c -v -before 10 -after 10 6) Check the patron's messages, there should be no expiry notice queued 7) Set the patron's category 'enforce expiry notice' field to Yes 8) Repeat step 5, there should be a notice queued 9) Set that patron's primary contact method to primary email and run step 5 again 10) There should be a notice queued for an email 11) Set the category level enforce expiry notice back to No 12) Choose a second patron and set an email address, expiry date to today and set the patron expiry messaging preference for that patron to 'email' 13) Repeat step 5 - this time only one notice should be queued on the second patron, no new notice should queue for the first 14) Re-set the category level option to Yes 15) Repeat step 5 - this time both patron's should have notices queued 16) Unset the category level option again, the behaviour should be the same as step 13 17) Set the category level option back to Yes and check the patron messaign preferences menus in both the OPAC and Staff client - the patron expiry option should not be visible while the cateogry level enforcement is set to Yes --- Koha/Patron.pm | 4 ++++ misc/cronjobs/membership_expiry.pl | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/Koha/Patron.pm b/Koha/Patron.pm index d2bf6f05960..ea50a239870 100644 --- a/Koha/Patron.pm +++ b/Koha/Patron.pm @@ -2658,6 +2658,10 @@ sub queue_notice { @message_transports = @{$params->{message_transports}}; } return unless defined $letter_code; + if ( $params->{expiry_notice_mandatory} ) { + push( @message_transports, $params->{primary_contact_method} || 'print' ) if scalar(@message_transports) == 0; + } + $letter_params->{letter_code} = $letter_code; my $print_sent = 0; my %return; diff --git a/misc/cronjobs/membership_expiry.pl b/misc/cronjobs/membership_expiry.pl index 50e213d9620..37f8b71cd5b 100755 --- a/misc/cronjobs/membership_expiry.pl +++ b/misc/cronjobs/membership_expiry.pl @@ -244,6 +244,8 @@ my $upcoming_mem_expires = Koha::Patrons->search_upcoming_membership_expires( after => $after, } ); +my @mandatory_expiry_notice_categories = + map { $_->categorycode } Koha::Patron::Categories->search( { 'me.enforce_expiry_notice' => 1 } )->as_list; my $where_literal = join ' AND ', @where; $upcoming_mem_expires = $upcoming_mem_expires->search( \$where_literal ) if @where; @@ -290,6 +292,12 @@ while ( my $expiring_patron = $upcoming_mem_expires->next ) { message_name => 'Patron_Expiry', }; + my $is_notice_mandatory = grep( $expiring_patron->categorycode, @mandatory_expiry_notice_categories ); + if ($is_notice_mandatory) { + $sending_params->{expiry_notice_mandatory} = 1; + $sending_params->{primary_contact_method} = $expiring_patron->primary_contact_method; + } + my $result = $expiring_patron->queue_notice($sending_params); $count_enqueued++ if $result->{sent}; } -- 2.39.3 (Apple Git-146)