gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 37650: (follow-up) Remove FIXME around CheckReserves call 

The FIXME correctly stated that the CheckReserves call and follow-up
only should be executed within the cancel hold scope.

NOTE: Actually, I do not see how to trigger it in current code. Since
checking in a waiting hold triggers the NotIssued error. And the
cancel hold button is not available for holds in queue.

Test plan:
Place a hold on an item.
Checkin at pickup location. Confirm. Hold waiting now?
Try again but checkin at another branch. Transfer triggered?

The hard part (see my note). Try to get at the form where you can
cancel the hold (waiting or first in queue).

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Emily Lamancusa <emily.lamancusa@montgomerycountymd.gov>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
This commit is contained in:
Marcel de Rooy 2025-01-17 08:24:23 +00:00 committed by Katrin Fischer
parent 2f0659b1b2
commit 99b7f5635c
No known key found for this signature in database
GPG Key ID: 0EF6E2C03357A834
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
circ/returns.pl
View File

@ -155,12 +155,23 @@ if ( $query->param('reserve_id') && $op eq 'cud-affect_reserve' ) {
# fix up item type for display
my $item = Koha::Items->find($itemnumber);
my $biblio = $item->biblio;
my $hold = Koha::Holds->find($reserve_id) or die "Hold for item $itemnumber not found\n"; #TODO Not very elegant
if ($cancel_reserve) {
my $hold = Koha::Holds->find($reserve_id);
if ($hold) {
$hold->cancel( { charge_cancel_fee => !$forgivemanualholdsexpire, cancellation_reason => $cancel_reason } );
} # FIXME else?
$hold->cancel( { charge_cancel_fee => !$forgivemanualholdsexpire, cancellation_reason => $cancel_reason } );
# check if we have other reserves for this document, if we have a result send the message of transfer
my ( undef, $nextreservinfo, undef ) = CheckReserves( $item, C4::Context->preference('ConfirmFutureHolds') );
if ( $userenv_branch ne $nextreservinfo->{'branchcode'} ) {
my $patron = Koha::Patrons->find( $nextreservinfo->{'borrowernumber'} );
$template->param(
itemtitle => $biblio->title,
itembiblionumber => $biblio->biblionumber,
iteminfo => $biblio->author,
patron => $patron,
diffbranch => 1,
);
}
} else {
my $diffBranchSend = ( $userenv_branch ne $diffBranchReturned ) ? $diffBranchReturned : undef;
@ -168,7 +179,6 @@ if ( $query->param('reserve_id') && $op eq 'cud-affect_reserve' ) {
# i.e., whether to apply waiting status
ModReserveAffect( $itemnumber, $borrowernumber, $diffBranchSend, $reserve_id, $desk_id );
my $hold = Koha::Holds->find($reserve_id);
if ($diffBranchSend) {
my $tobranch = $hold->pickup_library();
@ -177,21 +187,6 @@ if ( $query->param('reserve_id') && $op eq 'cud-affect_reserve' ) {
$transfer->transit;
}
}
# check if we have other reserves for this document, if we have a result send the message of transfer
# FIXME do we need to do this if we didn't take the cancel_reserve branch above?
my ( undef, $nextreservinfo, undef ) = CheckReserves( $item, C4::Context->preference('ConfirmFutureHolds') );
if ( $userenv_branch ne $nextreservinfo->{'branchcode'} ) {
my $patron = Koha::Patrons->find( $nextreservinfo->{'borrowernumber'} );
$template->param(
itemtitle => $biblio->title,
itembiblionumber => $biblio->biblionumber,
iteminfo => $biblio->author,
patron => $patron,
diffbranch => 1,
);
}
}
if ( $query->param('recall_id') && $op eq 'cud-affect_recall' ) {