From 732cd4a6ca84fbc5d069cd127a2a15bc755c63a7 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Thu, 9 Feb 2023 14:56:01 -0500 Subject: [PATCH] Bug 32934: Correctly honor the no block due date for SIP checkout messages --- C4/Circulation.pm | 10 +++++----- C4/SIP/ILS/Transaction/Checkout.pm | 6 ++++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 5255c69e26b..9e6b70d0caf 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -4027,7 +4027,7 @@ sub ProcessOfflineOperation { if ( $operation->{action} eq 'return' ) { $report = ProcessOfflineReturn( $operation ); } elsif ( $operation->{action} eq 'issue' ) { - $report = ProcessOfflineIssue( $operation ); + ( $report ) = ProcessOfflineIssue( $operation ); } elsif ( $operation->{action} eq 'payment' ) { $report = ProcessOfflinePayment( $operation ); } @@ -4085,15 +4085,15 @@ sub ProcessOfflineIssue { $operation->{timestamp}, ); } - AddIssue( + my $checkout = AddIssue( $patron->unblessed, - $operation->{'barcode'}, - undef, + $operation->{barcode}, + $operation->{due_date}, undef, $operation->{timestamp}, undef, ); - return "Success."; + return ( "Success.", $checkout ); } else { return "Borrower not found."; } diff --git a/C4/SIP/ILS/Transaction/Checkout.pm b/C4/SIP/ILS/Transaction/Checkout.pm index d9056f1c824..109cc3eb064 100644 --- a/C4/SIP/ILS/Transaction/Checkout.pm +++ b/C4/SIP/ILS/Transaction/Checkout.pm @@ -134,11 +134,13 @@ sub do_checkout { if ( $no_block_due_date ) { $overridden_duedate = $no_block_due_date; - ProcessOfflineIssue({ + my ( $msg, $checkout ) = ProcessOfflineIssue({ cardnumber => $patron->cardnumber, barcode => $barcode, - timestamp => $no_block_due_date, + due_date => $no_block_due_date, + timestamp => dt_from_string, }); + $self->{due} = $self->duedatefromissue($checkout, $itemnumber); } else { # can issue my $issue = AddIssue( $patron->unblessed, $barcode, $overridden_duedate, 0 ); -- 2.39.1