From e690a35470631be99183a857bff137e289e5e162 Mon Sep 17 00:00:00 2001 From: Matthias Le Gac Date: Tue, 2 Apr 2024 16:26:17 -0400 Subject: [PATCH] Bug 9762: Change how to pass the param --- C4/Circulation.pm | 53 ++++++++++++++++++--------------------------- circ/circulation.pl | 1 + 2 files changed, 22 insertions(+), 32 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 4870aaca113..ae74dbb5e95 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -321,21 +321,6 @@ A recall for this item was found, and the item needs to be transferred to the re =cut -my $query = CGI->new; - -my $stickyduedate = $query->param('stickyduedate'); -my $duedatespec = $query->param('duedatespec'); -my $restoreduedatespec = $query->param('restoreduedatespec') || $duedatespec; -if ( $restoreduedatespec && $restoreduedatespec eq "highholds_empty" ) { - undef $restoreduedatespec; -} -my $issueconfirmed = $query->param('issueconfirmed'); -my $cancelreserve = $query->param('cancelreserve'); -my $cancel_recall = $query->param('cancel_recall'); -my $recall_id = $query->param('recall_id'); -my $debt_confirmed = $query->param('debt_confirmed') || 0; # Don't show the debt error dialog twice -my $charges = $query->param('charges') || q{}; - sub transferbook { my $params = shift; my $tbr = $params->{to_branch}; @@ -809,6 +794,7 @@ sub CanBookBeIssued { my $onsite_checkout = $params->{onsite_checkout} || 0; my $override_high_holds = $params->{override_high_holds} || 0; + my $issueconfirmed = $params->{issueconfirmed} || 0; my $item_object = $params->{item}; if ( !$item_object and $barcode ) { @@ -834,7 +820,7 @@ sub CanBookBeIssued { my $now = dt_from_string(); my $message; - my @message; + my @message_log; $duedate ||= CalcDateDue( $now, $effective_itemtype, $circ_library->branchcode, $patron ); @@ -846,7 +832,7 @@ sub CanBookBeIssued { } else { $message = "sticky due date is invalid or due date in the past"; } - push( @message, "sticky due date is invalid or due date in the past" ); + push( @message_log, "sticky due date is invalid or due date in the past" ); } } @@ -900,7 +886,7 @@ sub CanBookBeIssued { } else { $message = "borrower is restricted"; } - push( @message, "borrower is restricted" ); + push( @message_log, "borrower is restricted" ); } } @@ -980,7 +966,7 @@ sub CanBookBeIssued { } else { $message = "borrower had amend"; } - push( @message, "borrower had amend" ); + push( @message_log, "borrower had amend" ); } } elsif ( $patron_borrowing_status->{noissuescharge}->{overlimit} && !$allowfineoverride ) { $issuingimpossible{DEBT} = $patron_borrowing_status->{noissuescharge}->{charge}; @@ -992,7 +978,7 @@ sub CanBookBeIssued { } else { $message = "borrower had amend"; } - push( @message, "borrower had amend" ); + push( @message_log, "borrower had amend" ); } } } @@ -1080,7 +1066,7 @@ sub CanBookBeIssued { } else { $message = "item is checked out for someone else"; } - push( @message, "item is checked out for someone else" ); + push( @message_log, "item is checked out for someone else" ); } } } @@ -1115,7 +1101,7 @@ sub CanBookBeIssued { } else { $message = "too many checkout"; } - push( @message, "too many checkout" ); + push( @message_log, "too many checkout" ); } } else { $issuingimpossible{TOO_MANY} = $toomany->{reason}; @@ -1150,7 +1136,7 @@ sub CanBookBeIssued { } else { $message = "item not for loan"; } - push( @message, "item not for loan" ); + push( @message_log, "item not for loan" ); } } } else { @@ -1203,7 +1189,7 @@ sub CanBookBeIssued { } else { $message = "item lost"; } - push( @message, "item lost" ); + push( @message_log, "item lost" ); } } if ( C4::Context->preference("IndependentBranches") ) { @@ -1313,7 +1299,10 @@ sub CanBookBeIssued { } else { $message = "item is on reserve and waiting, but has been reserved by some other patron."; } - push( @message, "item is on reserve and waiting, but has been reserved by some other patron" ); + push( + @message_log, + "item is on reserve and waiting, but has been reserved by some other patron" + ); } } elsif ( $restype eq "Reserved" ) { @@ -1333,7 +1322,7 @@ sub CanBookBeIssued { } else { $message = "item is on reserve for someone else"; } - push( @message, "item is on reserve for someone else" ); + push( @message_log, "item is on reserve for someone else" ); } } elsif ( $restype eq "Transferred" ) { @@ -1353,7 +1342,7 @@ sub CanBookBeIssued { } else { $message = "item is determined hold being transferred for someone else"; } - push( @message, "item is determined hold being transferred for someone else" ); + push( @message_log, "item is determined hold being transferred for someone else" ); } } elsif ( $restype eq "Processing" ) { @@ -1373,7 +1362,7 @@ sub CanBookBeIssued { } else { $message = "item is determined hold being processed for someone else"; } - push( @message, "item is determined hold being processed for someone else" ); + push( @message_log, "item is determined hold being processed for someone else" ); } } } @@ -1423,7 +1412,7 @@ sub CanBookBeIssued { } else { $message = "age restriction"; } - push( @message, "age restriction" ); + push( @message_log, "age restriction" ); } else { $issuingimpossible{AGE_RESTRICTION} = "$agerestriction"; } @@ -1493,7 +1482,7 @@ sub CanBookBeIssued { my $infos = ( { - message => \@message, + message => \@message_log, borrowernumber => $borrower->borrowernumber, barcode => $barcode, manager_id => $user, @@ -1511,7 +1500,7 @@ sub CanBookBeIssued { ) if C4::Context->preference("IssueLog"); } - return ( \%issuingimpossible, \%needsconfirmation, \%alerts, \%messages, ); + return ( \%issuingimpossible, \%needsconfirmation, \%alerts, \%messages, \@message_log ); } =head2 CanBookBeReturned @@ -4122,7 +4111,7 @@ sub SendCirculationAlert { $items = updateWrongTransfer($itemNumber,$borrowernumber,$waitingAtLibrary,$FromLibrary); -This function validate the line of brachtransfer but with the wrong destination (mistake from a librarian ...), and create a new line in branchtransfer from the actual library to the original library of reservation +This function validate the line of brachtransfer but with the wrong destination (mistake from a librarian ...), and create a new line in branchtransfer from the actual library to the original library of reservation =cut diff --git a/circ/circulation.pl b/circ/circulation.pl index 3ac158f0026..c4c0008c134 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -348,6 +348,7 @@ if ( @$barcodes && $op eq 'cud-checkout' ) { { onsite_checkout => $onsite_checkout, override_high_holds => $override_high_holds || $override_high_holds_tmp || 0, + issueconfirmed => $issueconfirmed, } ); } catch { -- 2.49.0