From a2f5ff61554e603e92b8e55c4f80c02e50f98868 Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Wed, 5 Jun 2024 15:48:43 +0000 Subject: [PATCH] Bug 37036: Pass along the branches table for auto renewals To test: 1. Set up autorenewals bu adjusting circulation rules: 'Automatic renewal' -> 'Yes' 'No automatic renewal before' -> 5 2. Set 'AutoRenewalNotices' to 'according to patron messaging preferences'. 3. Set an AUTO_RENEWALS and AUTO_RENEWALS_DGST notice to include branch info. I am using this to test: Branchcode: [% branch.branchcode %] Branch name: [% branch.branchname %] Branch address: [% branch.branchaddress1 %] Branch address2: [% IF branch.branchaddress2 %][% branch.branchaddress2 %][% END %] Branch city: [% branch.branchcity %], [% branch.branchstate %] [% branch.branchzip %] 4. Make sure your branch has the proper infro. filled out in Libraries administration. 5. Find a patron and adjust the messaging preferences so they receive automatic renewal notices. Also make sure the patron has an email. 5. Check out some items and make them due with the next 5 days. 6. Run the automatic_renewal cron job: perl /kohadevbox/koha/misc/cronjobs/automatic_renewals.pl -c -v 7. Notice no branch information displays. 8. APPLY PATCH 9. Checkout items from multiple issuing branches to a single patron. 10. Make sure the patron's messaging prefs are set to revieve NON-digestable notices. 11. Run the automatic renewal job, each notice should include the branch information from the issuing library. 12. Change the patron's messageing preferences to receieve digestable notices. 13. Run the job without the --digest-per-branch flag. You should get a single notice with the branch info. coming from the patron's home branch. 14. Run the job with the --digest-per-branch flag. You should get seperate digested notices with the branch info. coming from the issueing library branch. Signed-off-by: David Nind Signed-off-by: Emily Lamancusa Signed-off-by: Katrin Fischer (cherry picked from commit b793b24f98112a740e8a373752e1a8cae61dec7d) Signed-off-by: Lucas Gass (cherry picked from commit 98eef1d2bfc641557b169b20ce206be6cd624326) Signed-off-by: Fridolin Somers --- misc/cronjobs/automatic_renewals.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/misc/cronjobs/automatic_renewals.pl b/misc/cronjobs/automatic_renewals.pl index a08bbad34d..30d8e94693 100755 --- a/misc/cronjobs/automatic_renewals.pl +++ b/misc/cronjobs/automatic_renewals.pl @@ -257,6 +257,7 @@ if ( $send_notices && $confirm ) { issues => $issue->itemnumber, items => $issue->itemnumber, biblio => $item->biblionumber, + branches => $issue->branchcode, }, lang => $patron->lang, message_transport_type => $transport, @@ -348,7 +349,6 @@ sub send_digests { } my $library = Koha::Libraries->find( $branchcode ); my $from_address = $library->from_email_address; - foreach my $transport ( keys %{ $borrower_preferences->{'transports'} } ) { my $letter = C4::Letters::GetPreparedLetter ( module => 'circulation', @@ -363,6 +363,7 @@ sub send_digests { loops => { issues => \@{$digest->{issues}} }, tables => { borrowers => $patron->borrowernumber, + branches => $branchcode, }, message_transport_type => $transport, ); -- 2.39.5