@@ -, +, @@ --- C4/Reserves.pm | 23 ----------------------- t/db_dependent/Reserves.t | 26 +------------------------- 2 files changed, 1 insertion(+), 48 deletions(-) --- a/C4/Reserves.pm +++ a/C4/Reserves.pm @@ -1177,22 +1177,6 @@ sub IsAvailableForItemLevelRequest { return $item->{onloan} || GetReserveStatus($item->{itemnumber}) eq "Waiting"; } -=head2 OnShelfHoldsAllowed - - OnShelfHoldsAllowed($itemtype,$borrowercategory,$branchcode); - -Checks issuingrules, using the borrowers categorycode, the itemtype, and branchcode to see if onshelf -holds are allowed, returns true if so. - -=cut - -sub OnShelfHoldsAllowed { - my ($item, $borrower) = @_; - - my $itype = _get_itype($item); - return _OnShelfHoldsAllowed($itype,$borrower->{categorycode},$item->{holdingbranch}); -} - sub _get_itype { my $item = shift; @@ -1220,13 +1204,6 @@ sub _get_itype { return $itype; } -sub _OnShelfHoldsAllowed { - my ($itype,$borrowercategory,$branchcode) = @_; - - my $issuing_rule = Koha::IssuingRules->get_effective_issuing_rule({ categorycode => $borrowercategory, itemtype => $itype, branchcode => $branchcode }); - return $issuing_rule ? $issuing_rule->onshelfholds : undef; -} - =head2 AlterPriority AlterPriority( $where, $reserve_id ); --- a/t/db_dependent/Reserves.t +++ a/t/db_dependent/Reserves.t @@ -17,7 +17,7 @@ use Modern::Perl; -use Test::More tests => 58; +use Test::More tests => 56; use Test::MockModule; use Test::Warn; @@ -540,30 +540,6 @@ $item = GetItem($itemnumber); ok( C4::Reserves::IsAvailableForItemLevelRequest($item, $borrower), "Reserving a book on item level" ); -my $itype = C4::Reserves::_get_itype($item); -my $categorycode = $borrower->{categorycode}; -my $holdingbranch = $item->{holdingbranch}; -my $issuing_rule = Koha::IssuingRules->get_effective_issuing_rule( - { - categorycode => $categorycode, - itemtype => $itype, - branchcode => $holdingbranch - } -); - -$dbh->do( - "UPDATE issuingrules SET onshelfholds = 1 WHERE categorycode = ? AND itemtype= ? and branchcode = ?", - undef, - $issuing_rule->categorycode, $issuing_rule->itemtype, $issuing_rule->branchcode -); -ok( C4::Reserves::OnShelfHoldsAllowed($item, $borrower), "OnShelfHoldsAllowed() allowed" ); -$dbh->do( - "UPDATE issuingrules SET onshelfholds = 0 WHERE categorycode = ? AND itemtype= ? and branchcode = ?", - undef, - $issuing_rule->categorycode, $issuing_rule->itemtype, $issuing_rule->branchcode -); -ok( !C4::Reserves::OnShelfHoldsAllowed($item, $borrower), "OnShelfHoldsAllowed() disallowed" ); - # tests for MoveReserve in relation to ConfirmFutureHolds (BZ 14526) # hold from A pos 1, today, no fut holds: MoveReserve should fill it $dbh->do('DELETE FROM reserves', undef, ($bibnum)); --