From a66ad7d38cc889a3e80d4df2526ee4017baf02e5 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Mon, 4 Oct 2021 18:43:52 +0000 Subject: [PATCH] Bug 29062: (follow-up) Adjust SendCirculationAlert --- C4/Circulation.pm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 5da1d80258..a2d87a1708 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -2257,6 +2257,7 @@ sub AddReturn { item => $item->unblessed, borrower => $patron->unblessed, branch => $branch, + issue => $issue }); } @@ -3520,8 +3521,8 @@ B: sub SendCirculationAlert { my ($opts) = @_; - my ($type, $item, $borrower, $branch) = - ($opts->{type}, $opts->{item}, $opts->{borrower}, $opts->{branch}); + my ($type, $item, $borrower, $branch, $issue) = + ($opts->{type}, $opts->{item}, $opts->{borrower}, $opts->{branch}, $opts->{issue}); my %message_name = ( CHECKIN => 'Item_Check_in', CHECKOUT => 'Item_Checkout', @@ -3531,7 +3532,14 @@ sub SendCirculationAlert { borrowernumber => $borrower->{borrowernumber}, message_name => $message_name{$type}, }); - my $issues_table = ( $type eq 'CHECKOUT' || $type eq 'RENEWAL' ) ? 'issues' : 'old_issues'; + my ($issues_table, $issues_id); + if( $type eq 'CHECKIN' ){ + $issues_table = 'old_issues'; + $issues_id = $issue->issue_id; + } else { + $issues_table = 'issues'; + $issues_id = $item->{itemnumber}; + } my $schema = Koha::Database->new->schema; my @transports = keys %{ $borrower_preferences->{transports} }; @@ -3550,7 +3558,7 @@ sub SendCirculationAlert { message_transport_type => $mtt, lang => $borrower->{lang}, tables => { - $issues_table => $item->{itemnumber}, + $issues_table => $issues_id, 'items' => $item->{itemnumber}, 'biblio' => $item->{biblionumber}, 'biblioitems' => $item->{biblionumber}, -- 2.20.1