From 61b64efe02da4604f77f4703b9f00faac9497dcd Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 3 Mar 2016 08:58:06 +0000 Subject: [PATCH] Bug 15967: Fix regression from bug 14133 - notify the library if patron is not MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Regression introduced by bug 14133, see but 14133 comment 13. Test plan: Without this patch applied, if a patron cannot be notified (no email address or sms number), the print notice generated for the library was not. With this patch applied, the print notice should be generated using the print template Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer Signed-off-by: Brendan A Gallagher (cherry picked from commit faaa2cbcdb1970866be4f8a7001bf2de305823a9) Signed-off-by: Julian Maurice (cherry picked from commit 8664af5e20716d1a849b1deb26e48927b4921c5a) Signed-off-by: Frédéric Demians --- misc/cronjobs/overdue_notices.pl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/misc/cronjobs/overdue_notices.pl b/misc/cronjobs/overdue_notices.pl index a16491f388..d7aa43dd64 100755 --- a/misc/cronjobs/overdue_notices.pl +++ b/misc/cronjobs/overdue_notices.pl @@ -670,10 +670,10 @@ END_SQL my $print_sent = 0; # A print notice is not yet sent for this patron for my $mtt ( @message_transport_types ) { - + my $effective_mtt = $mtt; if ( ($mtt eq 'email' and not scalar @emails_to_use) or ($mtt eq 'sms' and not $data->{smsalertnumber}) ) { # email or sms is requested but not exist, do a print. - $mtt = 'print'; + $effective_mtt = 'print'; } my $letter = parse_letter( { letter_code => $overdue_rules->{"letter$i"}, @@ -685,7 +685,7 @@ END_SQL 'items.content' => $titles, 'count' => $itemcount, }, - message_transport_type => $mtt, + message_transport_type => $effective_mtt, } ); unless ($letter) { @@ -745,19 +745,19 @@ END_SQL } ); } - unless ( $mtt eq 'print' and $print_sent == 1 ) { + unless ( $effective_mtt eq 'print' and $print_sent == 1 ) { # Just sent a print if not already done. C4::Letters::EnqueueLetter( { letter => $letter, borrowernumber => $borrowernumber, - message_transport_type => $mtt, + message_transport_type => $effective_mtt, from_address => $admin_email_address, to_address => join(',', @emails_to_use), } ); # A print notice should be sent only once per overdue level. # Without this check, a print could be sent twice or more if the library checks sms and email and print and the patron has no email or sms number. - $print_sent = 1 if $mtt eq 'print'; + $print_sent = 1 if $effective_mtt eq 'print'; } } } -- 2.39.5