Bug 22759: Fix wrong check of branch rule in C4::Circulation::TooMany
The condition in TooMany applied branch limits only if the rule didn't have a branchcode, this was wrong To test: 1 - Find a title in the catalog, add 8 items, all of a single itemtype, 4 for branch A, four for branch B 2 - Remove any specific circ rules 3 - Set a default circ rule for the itemtype used above, limiting the max issue quantity to 3 4 - Find a patron and checkout the items from branch A 5 - You should be allowed to checkout 3, but the fourth should trigger 'too many' 6 - Now checkout the items from branch B, again you can checkout 3 and not four 7 - Apply this patch 8 - Assuming you have 6 items out now, try one from either branch, you should trigger 'too many' and have 6 9 - Return two from branch B and one from branch A 10 - Now you have three items issued total 11 - An item from either branch should be refused now 12 - Test with different values of 'CircControl' and confirm your expectations are met Signed-off-by: Liz Rea <wizzyrea@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
This commit is contained in:
parent
6d9839d800
commit
d9ce156793
|
|
@ -458,15 +458,15 @@ sub TooMany {
|
|||
$count_query .= " AND borrowernumber = ? ";
|
||||
push @bind_params, $borrower->{'borrowernumber'};
|
||||
my $rule_branch = $maxissueqty_rule->branchcode;
|
||||
unless ($rule_branch) {
|
||||
if ($rule_branch) {
|
||||
if (C4::Context->preference('CircControl') eq 'PickupLibrary') {
|
||||
$count_query .= " AND issues.branchcode = ? ";
|
||||
push @bind_params, $branch;
|
||||
push @bind_params, $rule_branch;
|
||||
} elsif (C4::Context->preference('CircControl') eq 'PatronLibrary') {
|
||||
; # if branch is the patron's home branch, then count all loans by patron
|
||||
} else {
|
||||
$count_query .= " AND items.homebranch = ? ";
|
||||
push @bind_params, $branch;
|
||||
push @bind_params, $rule_branch;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue