Attachment 91274 Details for Bug 22284 – Bug 22284: (follow-up) Remove HomeOrHolding from reserves

[patch] Bug 22284: (follow-up) Remove HomeOrHolding from reserves

Bug-22284-follow-up-Remove-HomeOrHolding-from-rese.patch (text/plain), 3.54 KB, created by Josef Moravec on 2019-07-04 05:28:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josef Moravec

Created: 2019-07-04 05:28:41 UTC

Size: 3.54 KB

patch

obsolete

>From 1e60f92592c950accb94104fd66d4fc5128eb953 Mon Sep 17 00:00:00 2001
>From: Agustin Moyano <agustinmoyano@theke.io>
>Date: Mon, 27 May 2019 23:30:05 -0300
>Subject: [PATCH] Bug 22284: (follow-up) Remove HomeOrHolding from reserves
>
>Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
>---
> C4/Reserves.pm | 14 +++++---------
> 1 file changed, 5 insertions(+), 9 deletions(-)
>
>diff --git a/C4/Reserves.pm b/C4/Reserves.pm
>index 7030b9a297..5518799360 100644
>--- a/C4/Reserves.pm
>+++ b/C4/Reserves.pm
>@@ -460,11 +460,9 @@ sub CanItemBeReserved {
>         return { status => 'cannotReserveFromOtherBranches' };
>     }
> 
>-    my $branch_control = C4::Context->preference('HomeOrHoldingBranch');
>-    my $itembranchcode = $branch_control eq 'holdingbranch' ? $item->holdingbranch : $item->homebranch;
>-    my $item_library = Koha::Libraries->find( {branchcode => $itembranchcode} );
>+    my $item_library = Koha::Libraries->find( {branchcode => $item->homebranch} );
>     if ( $branchitemrule->{holdallowed} == 3) {
>-        if($borrower->{branchcode} ne $itembranchcode && !$item_library->validate_hold_sibling( {branchcode => $borrower->{branchcode}} )) {
>+        if($borrower->{branchcode} ne $item->homebranch && !$item_library->validate_hold_sibling( {branchcode => $borrower->{branchcode}} )) {
>             return { status => 'branchNotInHoldGroup' };
>         }
>     }
>@@ -812,7 +810,7 @@ sub CheckReserves {
>                     my $branchitemrule = C4::Circulation::GetBranchItemRule($branch,$item->effective_itemtype);
>                     next if ($branchitemrule->{'holdallowed'} == 0);
>                     next if (($branchitemrule->{'holdallowed'} == 1) && ($branch ne $patron->branchcode));
>-                    my $library = Koha::Libraries->find({branchcode=>$branch});
>+                    my $library = Koha::Libraries->find({branchcode=>$item->homebranch});
>                     next if (($branchitemrule->{'holdallowed'} == 3) && (!$library->validate_hold_sibling({branchcode => $patron->branchcode}) ));
>                     my $hold_fulfillment_policy = $branchitemrule->{hold_fulfillment_policy};
>                     next if ( ($hold_fulfillment_policy eq 'holdgroup') && (!$library->validate_hold_sibling({branchcode => $res->{branchcode}})) );
>@@ -1225,9 +1223,7 @@ sub IsAvailableForItemLevelRequest {
>         foreach my $i (@items) {
>             my $reserves_control_branch = GetReservesControlBranch( $i->unblessed(), $patron->unblessed );
>             my $branchitemrule = C4::Circulation::GetBranchItemRule( $reserves_control_branch, $i->itype );
>-            my $branch_control = C4::Context->preference('HomeOrHoldingBranch');
>-            my $itembranchcode = $branch_control eq 'holdingbranch' ? $item->holdingbranch : $item->homebranch;
>-            my $item_library = Koha::Libraries->find( {branchcode => $itembranchcode} );
>+            my $item_library = Koha::Libraries->find( {branchcode => $i->homebranch} );
> 
> 
>             $any_available = 1
>@@ -1240,7 +1236,7 @@ sub IsAvailableForItemLevelRequest {
>                 && !C4::Context->preference('AllowHoldsOnDamagedItems') )
>               || Koha::ItemTypes->find( $i->effective_itemtype() )->notforloan
>               || $branchitemrule->{holdallowed} == 1 && $patron->branchcode ne $i->homebranch
>-              || $branchitemrule->{holdallowed} == 3 && !$item_library->validate_hold_sibling( {branchcode => $pickup_branchcode} );
>+              || $branchitemrule->{holdallowed} == 3 && !$item_library->validate_hold_sibling( {branchcode => $patron->branchcode} );
>         }
> 
>         return $any_available ? 0 : 1;
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 22284: 88138 | 88139 | 88140 | 88141 | 88142 | 88143 | 88144 | 88145 | 88369 | 88561 | 88793 | 88794 | 88795 | 88796 | 88797 | 88798 | 88799 | 88800 | 88801 | 88802 | 88939 | 88940 | 88941 | 88942 | 88943 | 88944 | 88945 | 88946 | 88947 | 88948 | 88949 | 88955 | 88956 | 88957 | 88958 | 88959 | 88960 | 88961 | 88962 | 88963 | 88964 | 88965 | 89060 | 89061 | 89062 | 89063 | 89064 | 89065 | 89066 | 89067 | 89068 | 89069 | 89070 | 89071 | 89072 | 89073 | 89074 | 89075 | 89076 | 89077 | 89078 | 89079 | 89080 | 89081 | 89082 | 89083 | 89084 | 89085 | 89122 | 89123 | 89124 | 89125 | 89126 | 89127 | 89128 | 89129 | 89130 | 89131 | 89132 | 89133 | 89134 | 89135 | 89523 | 89836 | 89837 | 89838 | 89839 | 89840 | 89841 | 89842 | 89843 | 89844 | 89845 | 89846 | 89847 | 89848 | 89849 | 90133 | 90134 | 90197 | 90198 | 90199 | 90200 | 90201 | 90469 | 90525 | 91261 | 91262 | 91263 | 91264 | 91265 | 91266 | 91267 | 91268 | 91269 | 91270 | 91271 | 91272 | 91273 | 91274 | 91275 | 91276 | 91277 | 91278 | 91279 | 91280 | 91282 | 91701 | 91702 | 91703 | 91704 | 91705 | 91706 | 91707 | 91708 | 91709 | 91710 | 91711 | 91712 | 91713 | 91714 | 91715 | 91716 | 91717 | 91718 | 91719 | 91720 | 91721 | 91750 | 91751 | 91752 | 91753 | 91754 | 91755 | 91756 | 91757 | 91758 | 92554 | 92555 | 92556 | 92557 | 92558 | 92559 | 92560 | 92561 | 92562 | 92563 | 92564 | 92565 | 92566 | 92567 | 92568 | 92569 | 92570 | 92571 | 92572 | 92573 | 92574 | 92752 | 92753 | 92754 | 92755 | 92756 | 92757 | 92758 | 92759 | 92760 | 92761 | 92762 | 92763 | 92764 | 92849 | 92850 | 92851 | 92852 | 92853 | 92854 | 92855 | 92856 | 92857 | 92858 | 92859 | 92860 | 92861 | 94483 | 94484 | 94485 | 94486 | 94487 | 94488 | 94489 | 94490 | 94491 | 94492 | 94493 | 94494 | 94495 | 96437 | 96438 | 96439 | 96440 | 96441 | 96442 | 96443 | 96444 | 96445 | 96446 | 96447 | 96448 | 96449 | 96450 | 96544 | 96545 | 96546 | 96547 | 96548 | 96549 | 96550 | 96551 | 96552 | 96553 | 96554 | 96555 | 96556 | 96557 | 96558 | 115202