From b2847c885d421b3b25d2f94a17b83e9ea7d4505d Mon Sep 17 00:00:00 2001
From: Lari Taskula <lari.taskula@jns.fi>
Date: Thu, 21 Dec 2017 16:55:58 +0200
Subject: [PATCH] Bug 7614: (follow-up) If patron's home library is not a
 pickup library, let them choose another one

This patch fixes an issue where patron is not allowed to place a hold in OPAC
while their home library is not a pickup library.

Instead, they should be presented with a list of other available pickup locations.
---
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt |  5 +++++
 opac/opac-reserve.pl                                     | 13 +++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
index 221fbd4..68984a5 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
@@ -104,6 +104,11 @@
                             </li>
                         [% END %]
 
+                        [% IF ( no_pickup_locations ) %]
+                            <li id="no_pickup_locations">
+                                None of the libraries are available for pickup location.
+                            </li>
+                        [% END %]
                     [% ELSE %]
 
                         [% IF ( none_available ) %]
diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
index 8331d72..be3fcfa 100755
--- a/opac/opac-reserve.pl
+++ b/opac/opac-reserve.pl
@@ -393,6 +393,7 @@ my $numBibsAvailable = 0;
 my $itemdata_enumchron = 0;
 my $anyholdable = 0;
 my $itemLevelTypes = C4::Context->preference('item-level_itypes');
+my $pickup_locations = Koha::Libraries->search({ pickup_location => 1 });
 $template->param('item_level_itypes' => $itemLevelTypes);
 
 foreach my $biblioNum (@biblionumbers) {
@@ -532,7 +533,7 @@ foreach my $biblioNum (@biblionumbers) {
         my $policy_holdallowed = !$itemLoopIter->{already_reserved};
         $policy_holdallowed &&=
             IsAvailableForItemLevelRequest($itemInfo,$borr) &&
-            CanItemBeReserved($borrowernumber,$itemNum,$branch) eq 'OK';
+            CanItemBeReserved($borrowernumber,$itemNum) eq 'OK';
 
         if ($policy_holdallowed) {
             if ( my $hold_allowed = OPACItemHoldsAllowed( $itemInfo, $borr ) ) {
@@ -591,7 +592,7 @@ foreach my $biblioNum (@biblionumbers) {
         }
     }
 
-    $biblioLoopIter{holdable} &&= CanBookBeReserved($borrowernumber,$biblioNum,$branch) eq 'OK';
+    $biblioLoopIter{holdable} &&= CanBookBeReserved($borrowernumber,$biblioNum) eq 'OK';
 
     # For multiple holds per record, if a patron has previously placed a hold,
     # the patron can only place more holds of the same type. That is, if the
@@ -616,6 +617,14 @@ foreach my $biblioNum (@biblionumbers) {
     $anyholdable = 1 if $biblioLoopIter{holdable};
 }
 
+unless ($pickup_locations->count) {
+    $numBibsAvailable = 0;
+    $anyholdable = 0;
+    $template->param(
+        message => 1,
+        no_pickup_locations => 1
+    );
+}
 
 if ( $numBibsAvailable == 0 || $anyholdable == 0) {
     $template->param( none_available => 1 );
-- 
2.7.4