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

Bug 36362: (QA follow-up) Tidy code 

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit a62d39ea11)
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit b507aad0cb)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
This commit is contained in:
Kyle M Hall 2024-07-19 12:23:43 -04:00 committed by Fridolin Somers
parent f3020fc947
commit 1edeffba84
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Koha/Item.pm
View File

@ -920,28 +920,26 @@ sub pickup_locations {
my $patron = $params->{patron};
my $circ_control_branch = Koha::Policy::Holds->holds_control_library( $self, $patron );
my $branchitemrule =
C4::Circulation::GetBranchItemRule( $circ_control_branch, $self->itype );
my $branchitemrule = C4::Circulation::GetBranchItemRule( $circ_control_branch, $self->itype );
if (
$branchitemrule->{holdallowed} eq 'from_local_hold_group' &&
!$self->home_branch->validate_hold_sibling( {branchcode => $patron->branchcode} ) ||
$branchitemrule->{holdallowed} eq 'from_home_library' &&
$self->home_branch->branchcode ne $patron->branchcode
) {
if ( $branchitemrule->{holdallowed} eq 'from_local_hold_group'
&& !$self->home_branch->validate_hold_sibling( { branchcode => $patron->branchcode } )
|| $branchitemrule->{holdallowed} eq 'from_home_library'
&& $self->home_branch->branchcode ne $patron->branchcode )
{
return Koha::Libraries->new()->empty;
}
my $pickup_libraries;
if ($branchitemrule->{hold_fulfillment_policy} eq 'holdgroup') {
if ( $branchitemrule->{hold_fulfillment_policy} eq 'holdgroup' ) {
$pickup_libraries = $self->home_branch->get_hold_libraries;
} elsif ($branchitemrule->{hold_fulfillment_policy} eq 'patrongroup') {
my $plib = Koha::Libraries->find({ branchcode => $patron->branchcode});
} elsif ( $branchitemrule->{hold_fulfillment_policy} eq 'patrongroup' ) {
my $plib = Koha::Libraries->find( { branchcode => $patron->branchcode } );
$pickup_libraries = $plib->get_hold_libraries;
} elsif ($branchitemrule->{hold_fulfillment_policy} eq 'homebranch') {
$pickup_libraries = Koha::Libraries->search({ branchcode => $self->homebranch });
} elsif ($branchitemrule->{hold_fulfillment_policy} eq 'holdingbranch') {
$pickup_libraries = Koha::Libraries->search({ branchcode => $self->holdingbranch });
} elsif ( $branchitemrule->{hold_fulfillment_policy} eq 'homebranch' ) {
$pickup_libraries = Koha::Libraries->search( { branchcode => $self->homebranch } );
} elsif ( $branchitemrule->{hold_fulfillment_policy} eq 'holdingbranch' ) {
$pickup_libraries = Koha::Libraries->search( { branchcode => $self->holdingbranch } );
} else {
$pickup_libraries = Koha::Libraries->search();
}