From 7ba6871ca17804af03d1b766664b583ba7a22342 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Thu, 6 Sep 2018 08:21:24 -0400 Subject: [PATCH] Bug 7534 [QA Followup]: Don't do pickup branch checking for determining holdability in the OPAC --- Koha/Schema/Result/Branch.pm | 12 ++++++++++-- opac/opac-reserve.pl | 8 ++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Koha/Schema/Result/Branch.pm b/Koha/Schema/Result/Branch.pm index bb571b18de..bb78882556 100644 --- a/Koha/Schema/Result/Branch.pm +++ b/Koha/Schema/Result/Branch.pm @@ -140,6 +140,12 @@ __PACKAGE__->table("branches"); is_nullable: 1 size: 16 +=head2 pickup_location + + data_type: 'tinyint' + default_value: 1 + is_nullable: 0 + =cut __PACKAGE__->add_columns( @@ -187,6 +193,8 @@ __PACKAGE__->add_columns( { data_type => "varchar", is_nullable => 1, size => 255 }, "marcorgcode", { data_type => "varchar", is_nullable => 1, size => 16 }, + "pickup_location", + { data_type => "tinyint", default_value => 1, is_nullable => 0 }, ); =head1 PRIMARY KEY @@ -609,8 +617,8 @@ __PACKAGE__->has_many( ); -# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-02-16 17:54:53 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:QOMUFz2EjvAVWCkIpNmvtg +# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-09-06 11:46:42 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:hoXg+9Mgi3IglRt0NgHPCQ # You can replace this text with custom code or comments, and it will be preserved on regeneration diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl index 89af3b0e52..684e57d1c3 100755 --- a/opac/opac-reserve.pl +++ b/opac/opac-reserve.pl @@ -269,10 +269,10 @@ if ( $query->param('place_reserve') ) { my $rank = $biblioData->{rank}; if ( $itemNum ne '' ) { - $canreserve = 1 if CanItemBeReserved( $borrowernumber, $itemNum, $branch )->{status} eq 'OK'; + $canreserve = 1 if CanItemBeReserved( $borrowernumber, $itemNum )->{status} eq 'OK'; } else { - $canreserve = 1 if CanBookBeReserved( $borrowernumber, $biblioNum, $branch )->{status} eq 'OK'; + $canreserve = 1 if CanBookBeReserved( $borrowernumber, $biblioNum )->{status} eq 'OK'; # Inserts a null into the 'itemnumber' field of 'reserves' table. $itemNum = undef; @@ -525,7 +525,7 @@ foreach my $biblioNum (@biblionumbers) { my $policy_holdallowed = !$itemLoopIter->{already_reserved}; $policy_holdallowed &&= IsAvailableForItemLevelRequest($itemInfo,$patron_unblessed) && - CanItemBeReserved($borrowernumber,$itemNum, $branch)->{status} eq 'OK'; + CanItemBeReserved( $borrowernumber, $itemNum )->{status} eq 'OK'; if ($policy_holdallowed) { my $opac_hold_policy = Koha::IssuingRules->get_opacitemholds_policy( { item => $item, patron => $patron } ); @@ -585,7 +585,7 @@ foreach my $biblioNum (@biblionumbers) { } } - $biblioLoopIter{holdable} &&= CanBookBeReserved($borrowernumber,$biblioNum,$branch)->{status} eq 'OK'; + $biblioLoopIter{holdable} &&= CanBookBeReserved( $borrowernumber, $biblioNum )->{status} eq 'OK'; # For multiple holds per record, if a patron has previously placed a hold, # the patron can only place more holds of the same type. That is, if the -- 2.11.0