Bugzilla – Attachment 132207 Details for
Bug 30222
Auto_renew_digest still sends every day when renewals are not allowed
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 30222: Further simplify logic
Bug-30222-Further-simplify-logic.patch (text/plain), 3.42 KB, created by
Jonathan Druart
on 2022-03-25 08:09:12 UTC
(
hide
)
Description:
Bug 30222: Further simplify logic
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2022-03-25 08:09:12 UTC
Size:
3.42 KB
patch
obsolete
>From 7ab85a91bbcafb83866acd7e6d93301db4bf863c Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Tue, 15 Mar 2022 13:34:39 +0000 >Subject: [PATCH] Bug 30222: Further simplify logic > >For any borrower, we are either: >1 - following their preference, and that should set 'wants_email' >OR >2 - Never sending / following the cron, and can determine 'wants_email' > from the 'send_notices' variable > >This patch adds an 'else' if not using preferences to accomplish this > >Follow test plan on previous patches > >Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com> > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >--- > misc/cronjobs/automatic_renewals.pl | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > >diff --git a/misc/cronjobs/automatic_renewals.pl b/misc/cronjobs/automatic_renewals.pl >index e3593300b43..ecd3c24f504 100755 >--- a/misc/cronjobs/automatic_renewals.pl >+++ b/misc/cronjobs/automatic_renewals.pl >@@ -108,8 +108,9 @@ to 'Never send emails' or 'Follow patron messaging preferences' > > END_WARN > } else { >- # If not following cron then we should not send if set to never >- # and always send any generated according to preferences if following those >+ # If not following cron then: >+ # - we should not send if set to never >+ # - we will send any notice generated according to preferences if following those > $send_notices = $send_notices_pref eq 'never' ? 0 : 1; > } > >@@ -140,7 +141,7 @@ my %report; > while ( my $auto_renew = $auto_renews->next ) { > print "examining item '" . $auto_renew->itemnumber . "' to auto renew\n" if $verbose; > >- my ( $borrower_preferences, $wants_email, $wants_digest ); >+ my ( $borrower_preferences, $wants_email, $wants_digest ) = ( undef, 0, 0 ); > if ( $send_notices_pref eq 'preferences' ){ > $borrower_preferences = C4::Members::Messaging::GetMessagingPreferences( > { >@@ -155,12 +156,11 @@ while ( my $auto_renew = $auto_renews->next ) { > $wants_digest = 1 > if $wants_email > && $borrower_preferences->{wants_digest}; >+ } else { # Preference is never or cron >+ $wants_email = $send_notices; >+ $wants_digest = 0; > } > >- $send_notices = 1 >- if !$send_notices >- && $wants_email; >- > # CanBookBeRenewed returns 'auto_renew' when the renewal should be done by this script > my ( $ok, $error ) = CanBookBeRenewed( $auto_renew->borrowernumber, $auto_renew->itemnumber, undef, 1 ); > my $updated; >@@ -175,7 +175,7 @@ while ( my $auto_renew = $auto_renews->next ) { > $auto_renew->auto_renew_error(undef)->store; > } > push @{ $report{ $auto_renew->borrowernumber } }, $auto_renew >- if $send_notices && !$wants_digest; >+ if ( $wants_email ) && !$wants_digest; > } elsif ( $error eq 'too_many' > or $error eq 'on_reserve' > or $error eq 'restriction' >@@ -194,7 +194,7 @@ while ( my $auto_renew = $auto_renews->next ) { > if ( not $auto_renew->auto_renew_error or $updated ) { > $auto_renew->auto_renew_error($error)->store if $confirm; > push @{ $report{ $auto_renew->borrowernumber } }, $auto_renew >- if $error ne 'auto_too_soon' && ( $send_notices && !$wants_digest ); # Do not notify if it's too soon >+ if $error ne 'auto_too_soon' && ( $wants_email && !$wants_digest ); # Do not notify if it's too soon > } > } > >-- >2.25.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 30222
:
131586
|
131587
|
131659
|
131660
|
131662
|
131663
|
131721
|
131728
|
131729
|
131730
|
132205
|
132206
| 132207 |
132208
|
132209