From 822af2bedd96c9cad60a9db74a496139f7882961 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Tue, 26 Mar 2019 13:56:04 +0000 Subject: [PATCH] Bug 20837: Alter IsAvailableForItemForItemLevelRequest to use ReservesControlBranch Also use Koha objects for fetching itemtype info To test: Same test plan as above, ensure item availability is affected the the system preference prove t/db_dependent/Holds/DisallowHoldIfItemsAvailable.t --- C4/Reserves.pm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/C4/Reserves.pm b/C4/Reserves.pm index 3b210f5b31..e311c2b129 100644 --- a/C4/Reserves.pm +++ b/C4/Reserves.pm @@ -1173,9 +1173,7 @@ sub IsAvailableForItemLevelRequest { my $patron = Koha::Patrons->find( $borrower->{borrowernumber} ); my $item_object = Koha::Items->find( $item->{itemnumber } ); my $itemtype = $item_object->effective_itemtype; - my $notforloan_per_itemtype - = $dbh->selectrow_array("SELECT notforloan FROM itemtypes WHERE itemtype = ?", - undef, $itemtype); + my $notforloan_per_itemtype = Koha::ItemTypes->find($itemtype)->notforloan; return 0 if $notforloan_per_itemtype || @@ -1202,8 +1200,7 @@ sub IsAvailableForItemLevelRequest { my $any_available = 0; foreach my $i (@items) { - - my $circ_control_branch = C4::Circulation::_GetCircControlBranch( $i->unblessed(), $borrower ); + my $circ_control_branch = GetReservesControlBranch( $i->unblessed(), $borrower ); my $branchitemrule = C4::Circulation::GetBranchItemRule( $circ_control_branch, $i->itype ); $any_available = 1 -- 2.11.0