Bug 29408: Add JSDoc documentation for kohaTable function

[koha-ffzg.git] / opac / opac-reserve.pl

diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
index 139d710..a7391e2 100755 (executable)
--- a/opac/opac-reserve.pl
+++ b/opac/opac-reserve.pl
@@ -21,36 +21,34 @@
 use Modern::Perl;
 
 use CGI qw ( -utf8 );
-use C4::Auth;    # checkauth, getborrowernumber.
-use C4::Koha;
-use C4::Circulation;
-use C4::Reserves;
-use C4::Biblio;
-use C4::Items;
-use C4::Output;
+use C4::Auth qw( get_template_and_user );
+use C4::Koha qw( getitemtypeimagelocation getitemtypeimagesrc );
+use C4::Circulation qw( GetBranchItemRule GetTransfers );
+use C4::Reserves qw( CanItemBeReserved CanBookBeReserved AddReserve GetReservesControlBranch IsAvailableForItemLevelRequest );
+use C4::Biblio qw( GetBiblioData GetFrameworkCode GetMarcBiblio );
+use C4::Items qw( GetHostItemsInfo GetItemsInfo );
+use C4::Output qw( output_html_with_http_headers );
 use C4::Context;
 use C4::Members;
 use C4::Overdues;
-use C4::Debug;
 
 use Koha::AuthorisedValues;
 use Koha::Biblios;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string output_pref );
 use Koha::CirculationRules;
 use Koha::Items;
 use Koha::ItemTypes;
 use Koha::Checkouts;
 use Koha::Libraries;
 use Koha::Patrons;
-use Date::Calc qw/Today Date_to_Days/;
-use List::MoreUtils qw/uniq/;
+use List::MoreUtils qw( uniq );
 
 my $maxreserves = C4::Context->preference("maxreserves");
 
 my $query = CGI->new;
 
-# if RequestOnOpac (for placing holds) is disabled, leave immediately
-if ( ! C4::Context->preference('RequestOnOpac') ) {
+# if OPACHoldRequests (for placing holds) is disabled, leave immediately
+if ( ! C4::Context->preference('OPACHoldRequests') ) {
     print $query->redirect("/cgi-bin/koha/errors/404.pl");
     exit;
 }
@@ -60,7 +58,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "opac-reserve.tt",
         query           => $query,
         type            => "opac",
-        debug           => 1,
     }
 );
 
@@ -70,17 +67,12 @@ for ( C4::Context->preference("OPACShowHoldQueueDetails") ) {
     m/priority/ and $show_priority = 1;
 }
 
-my $patron = Koha::Patrons->find( $borrowernumber );
+my $patron = Koha::Patrons->find( $borrowernumber, { prefetch => ['categorycode'] } );
 my $category = $patron->category;
-# no OpacHiddenItems rules used if category is excepted
-my $item_hide_rules =
-    ( $category->override_hidden_items )
-    ? {}
-    : C4::Context->yaml_preference('OpacHiddenItems');
 
 my $can_place_hold_if_available_at_pickup = C4::Context->preference('OPACHoldsIfAvailableAtPickup');
 unless ( $can_place_hold_if_available_at_pickup ) {
-    my @patron_categories = split '\|', C4::Context->preference('OPACHoldsIfAvailableAtPickupExceptions');
+    my @patron_categories = split ',', C4::Context->preference('OPACHoldsIfAvailableAtPickupExceptions');
     if ( @patron_categories ) {
         my $categorycode = $patron->categorycode;
         $can_place_hold_if_available_at_pickup = grep { $_ eq $categorycode } @patron_categories;
@@ -88,7 +80,7 @@ unless ( $can_place_hold_if_available_at_pickup ) {
 }
 
 # check if this user can place a reserve, -1 means use sys pref, 0 means dont block, 1 means block
-if ( $patron->category->effective_BlockExpiredPatronOpacActions ) {
+if ( $category->effective_BlockExpiredPatronOpacActions ) {
 
     if ( $patron->is_expired ) {
 
@@ -100,7 +92,7 @@ if ( $patron->category->effective_BlockExpiredPatronOpacActions ) {
 }
 
 # Pass through any reserve charge
-my $reservefee = $patron->category->reservefee;
+my $reservefee = $category->reservefee;
 if ( $reservefee > 0){
     $template->param( RESERVE_CHARGE => $reservefee);
 }
@@ -251,8 +243,10 @@ if ( $query->param('place_reserve') ) {
             my $type = $item->effective_itemtype;
             my $rule = GetBranchItemRule( $patron->branchcode, $type );
 
-            if ( $rule->{hold_fulfillment_policy} eq 'any' ) {
+            if ( $rule->{hold_fulfillment_policy} eq 'any' || $rule->{hold_fulfillment_policy} eq 'patrongroup' ) {
                 $branch = $patron->branchcode;
+            } elsif ( $rule->{hold_fulfillment_policy} eq 'holdgroup' ){
+                $branch = $item->homebranch;
             } else {
                 my $policy = $rule->{hold_fulfillment_policy};
                 $branch = $item->$policy;
@@ -467,7 +461,7 @@ foreach my $biblioNum (@biblionumbers) {
     my @notforloan_avs = Koha::AuthorisedValues->search_by_koha_field({ kohafield => 'items.notforloan', frameworkcode => $frameworkcode });
     my $notforloan_label_of = { map { $_->authorised_value => $_->opac_description } @notforloan_avs };
 
-    my $visible_items = { map { $_->itemnumber => 1 } $biblio->items->filter_by_visible_in_opac( { rules => $item_hide_rules } ) };
+    my $visible_items = { map { $_->itemnumber => $_ } $biblio->items->filter_by_visible_in_opac( { patron => $patron } )->as_list };
 
     # Only keep the items that are visible in the opac (i.e. those in %visible_items)
     # FIXME: We should get rid of itemInfos altogether and use $visible_items
@@ -478,7 +472,7 @@ foreach my $biblioNum (@biblionumbers) {
     my $numCopiesOPACAvailable = 0;
     foreach my $itemInfo (@{$biblioData->{itemInfos}}) {
         my $itemNum = $itemInfo->{itemnumber};
-        my $item = Koha::Items->find( $itemNum );
+        my $item = $visible_items->{$itemNum};
         my $itemLoopIter = {};
 
         $itemLoopIter->{itemnumber} = $itemNum;