Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 19301: Remove C4::Reserves::OnShelfHoldsAllowed

Browse source 
At this point the subroutine is not used anymore

Signed-off-by: Alex Buckley <alexbuckley@catalyst.net.nz>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Jonathan Druart 2017-09-12 14:04:08 -03:00
parent 39e1fbcbe9
commit c06bc6422f
2 changed files with 1 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
C4/Reserves.pm
View file

@ -1148,22 +1148,6 @@ sub IsAvailableForItemLevelRequest {
} }
} }
=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 { sub _get_itype {
my $item = shift; my $item = shift;
@ -1191,13 +1175,6 @@ sub _get_itype {
return $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 =head2 AlterPriority
AlterPriority( $where, $reserve_id ); AlterPriority( $where, $reserve_id );

26
t/db_dependent/Reserves.t
View file

@ -17,7 +17,7 @@
use Modern::Perl; use Modern::Perl;
use Test::More tests => 58; use Test::More tests => 56;
use Test::MockModule; use Test::MockModule;
use Test::Warn; use Test::Warn;
@ -540,30 +540,6 @@ $item = GetItem($itemnumber);
ok( C4::Reserves::IsAvailableForItemLevelRequest($item, $borrower), "Reserving a book on item level" ); 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) # tests for MoveReserve in relation to ConfirmFutureHolds (BZ 14526)
# hold from A pos 1, today, no fut holds: MoveReserve should fill it # hold from A pos 1, today, no fut holds: MoveReserve should fill it
$dbh->do('DELETE FROM reserves', undef, ($bibnum)); $dbh->do('DELETE FROM reserves', undef, ($bibnum));