From 7f42d41767773f669304af39c330e772e1e6ba2e Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Wed, 21 Mar 2018 11:52:25 -0400 Subject: [PATCH] Bug 20457: Overdue and pre-overdue cronjobs not skipping phone notices The overdue and pre-overdue cron scripts are not skipping the generation of phone notices. This causes many phone notices to be created that will always be left at 'pending' as the Talking Tech outbound script creates its own phone notices and puts them in the message queue. Test Plan: 1) Enable Talking Tech 2) Enable predue and overdue notice phone transports for a patron 3) Generate overdues and predues, notice phone notices are generated 4) Apply the patch 5) Repeat steps 2-3 6) Note phone notices are not generated --- misc/cronjobs/advance_notices.pl | 4 ++++ misc/cronjobs/overdue_notices.pl | 2 ++ 2 files changed, 6 insertions(+) diff --git a/misc/cronjobs/advance_notices.pl b/misc/cronjobs/advance_notices.pl index 2274737aaf..b90bffdc3b 100755 --- a/misc/cronjobs/advance_notices.pl +++ b/misc/cronjobs/advance_notices.pl @@ -262,6 +262,7 @@ UPCOMINGITEM: foreach my $upcoming ( @$upcoming_dues ) { ## Get branch info for borrowers home library. foreach my $transport ( keys %{$borrower_preferences->{'transports'}} ) { + next if $transport eq 'phone'; my $letter = parse_letter( { letter_code => $letter_type, borrowernumber => $upcoming->{'borrowernumber'}, branchcode => $upcoming->{'branchcode'}, @@ -296,6 +297,7 @@ UPCOMINGITEM: foreach my $upcoming ( @$upcoming_dues ) { ## Get branch info for borrowers home library. foreach my $transport ( keys %{$borrower_preferences->{'transports'}} ) { + next if $transport eq 'phone'; my $letter = parse_letter( { letter_code => $letter_type, borrowernumber => $upcoming->{'borrowernumber'}, branchcode => $upcoming->{'branchcode'}, @@ -364,6 +366,7 @@ PATRON: while ( my ( $borrowernumber, $digest ) = each %$upcoming_digest ) { my %branch_info = get_branch_info( $borrowernumber ); foreach my $transport ( keys %{ $borrower_preferences->{'transports'} } ) { + next if $transport eq 'phone'; my $letter = parse_letter( { letter_code => $letter_type, @@ -421,6 +424,7 @@ PATRON: while ( my ( $borrowernumber, $digest ) = each %$due_digest ) { my %branch_info = get_branch_info( $borrowernumber ); for my $transport ( keys %{ $borrower_preferences->{'transports'} } ) { + next if $transport eq 'phone'; my $letter = parse_letter( { letter_code => $letter_type, diff --git a/misc/cronjobs/overdue_notices.pl b/misc/cronjobs/overdue_notices.pl index 74973816c5..ee62087d15 100755 --- a/misc/cronjobs/overdue_notices.pl +++ b/misc/cronjobs/overdue_notices.pl @@ -680,6 +680,8 @@ END_SQL my $print_sent = 0; # A print notice is not yet sent for this patron for my $mtt ( @message_transport_types ) { + next if $mtt eq 'phone'; + 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. -- 2.14.3 (Apple Git-98)