From 22dd944105af4f931f1d74b1cb44fca74869ec12 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 12 Feb 2021 12:11:54 +0100 Subject: [PATCH] Bug 27068: Perltidy _checkHoldPolicy --- C4/HoldsQueue.pm | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/C4/HoldsQueue.pm b/C4/HoldsQueue.pm index 943879e172..b0af40b938 100644 --- a/C4/HoldsQueue.pm +++ b/C4/HoldsQueue.pm @@ -371,20 +371,38 @@ sub GetItemsAvailableToFillHoldRequestsForBib { =cut sub _checkHoldPolicy { - my ($item, $request) = @_; + my ( $item, $request ) = @_; return 0 unless $item->{holdallowed}; - return 0 if $item->{holdallowed} == 1 && $item->{homebranch} ne $request->{borrowerbranch}; - return 0 if $item->{'holdallowed'} == 3 && !Koha::Libraries->find($item->{homebranch})->validate_hold_sibling({branchcode => $request->{borrowerbranch}}); + return 0 + if $item->{holdallowed} == 1 + && $item->{homebranch} ne $request->{borrowerbranch}; + + return 0 + if $item->{'holdallowed'} == 3 + && !Koha::Libraries->find( $item->{homebranch} ) + ->validate_hold_sibling( { branchcode => $request->{borrowerbranch} } ); my $hold_fulfillment_policy = $item->{hold_fulfillment_policy}; - return 0 if $hold_fulfillment_policy eq 'holdgroup' && !Koha::Libraries->find($item->{homebranch})->validate_hold_sibling({branchcode => $request->{branchcode}}); - return 0 if $hold_fulfillment_policy eq 'homebranch' && $request->{branchcode} ne $item->{$hold_fulfillment_policy}; - return 0 if $hold_fulfillment_policy eq 'holdingbranch' && $request->{branchcode} ne $item->{$hold_fulfillment_policy}; + return 0 + if $hold_fulfillment_policy eq 'holdgroup' + && !Koha::Libraries->find( $item->{homebranch} ) + ->validate_hold_sibling( { branchcode => $request->{branchcode} } ); + + return 0 + if $hold_fulfillment_policy eq 'homebranch' + && $request->{branchcode} ne $item->{$hold_fulfillment_policy}; + + return 0 + if $hold_fulfillment_policy eq 'holdingbranch' + && $request->{branchcode} ne $item->{$hold_fulfillment_policy}; - return 0 if $hold_fulfillment_policy eq 'patrongroup' && !Koha::Libraries->find($request->{borrowerbranch})->validate_hold_sibling({branchcode => $request->{branchcode}}); + return 0 + if $hold_fulfillment_policy eq 'patrongroup' + && !Koha::Libraries->find( $request->{borrowerbranch} ) + ->validate_hold_sibling( { branchcode => $request->{branchcode} } ); return 1; -- 2.20.1