From cb3c6c4b637ee5c0bfb506aa2ec9ab66448e9acb Mon Sep 17 00:00:00 2001
From: Kyle Hall <kyle@bywatersolutions.com>
Date: Thu, 9 Jun 2022 14:06:45 -0400
Subject: [PATCH] Bug 24860: Add ability to select an item group when placing a
 hold - OPAC

Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>

Signed-off-by: Rebecca Coert <rcoert@arlingtonva.us>
---
 .../bootstrap/en/includes/holds-table.inc     |  3 +++
 .../bootstrap/en/modules/opac-reserve.tt      | 24 +++++++++++++++++--
 opac/opac-reserve.pl                          |  5 ++++
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc
index 2263737ec8..7ba9f7a7f3 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc
@@ -58,6 +58,9 @@
                                 </strong>
                             [% END %]
                             [% HOLD.biblio.author | html %]
+                            [% IF HOLD.item_group_id %]
+                               <p>Next available item from item group: <strong>[% HOLD.item_group.description | html %]</strong></p>
+                            [% END %]
                             [% IF HOLD.item_level_hold %]
                                 <p class="hint">Item on hold: [% HOLD.item.barcode | html %]</p>
                             [% END %]
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 4e8b2d1ba2..0e894de614 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
@@ -306,6 +306,20 @@
                                                     </li>
                                                 [% END %]
 
+                                                [% UNLESS bibitemloo.forced_hold_level && ( bibitemloo.forced_hold_level == 'item' || bibitemloo.forced_hold_level == 'record' ) %]
+                                                    [% IF bibitemloo.object.item_groups %]
+                                                        <li>
+                                                            <label for="itemtype">Request specific item group:</label>
+                                                            <select name="item_group_id_[% bibitemloo.biblionumber | html %]" id="item_group_id_[% bibitemloo.biblionumber | html %]">
+                                                                <option value="">Any item group</option>
+                                                                [% FOREACH g IN bibitemloo.object.item_groups.search({}, { order_by => ['display_order'] }) %]
+                                                                    <option value="[% g.id | html %]">[% g.description | html %]</option>
+                                                                [% END %]
+                                                            </select>
+                                                        </li>
+                                                    [% END %]
+                                                [% END %]
+
                                                 [% IF ( OpacHoldNotes ) %]
                                                     <li>
                                                         <div class="notesrow" id="notesrow_[% bibitemloo.biblionumber | html %]">
@@ -321,7 +335,7 @@
                                                 [% IF bibitemloo.itemholdable %]
                                                     <!-- ITEM HOLDS -->
                                                     <li class="lradio place_on_type" style="display:none;">
-                                                        [% IF NOT bibitemloo.force_hold %]
+                                                        [% UNLESS bibitemloo.forced_hold_level == 'item' || bibitemloo.forced_hold_level == 'item_group' %]
                                                             <label class="radio inline" for="reqany_[% bibitemloo.biblionumber | html %]">Next available item</label>
                                                             <input type="radio" name="reqtype_[% bibitemloo.biblionumber | html %]"
                                                                     id="reqany_[% bibitemloo.biblionumber | html %]"
@@ -591,10 +605,16 @@
             var select_specific = $("#reqspecific_"+biblioNum).is(":checked");
             // If the checkbox is checked AND we want a specific item, we display the items block
             if ( $(checkbox).is(":checked") && select_specific ) {
+                if ( $(`#item_group_id_${biblioNum}`).length ) {
+                    $(`#item_group_id_${biblioNum}`).val("").attr('disabled', 'disabled');
+                }
                 $(newCopiesRowId).show();
             } else {
+                if ( $(`#item_group_id_${biblioNum}`).length ) {
+                    $(`#item_group_id_${biblioNum}`).removeAttr('disabled');
+                }
                 $(newCopiesRowId).hide();
-             }
+            }
         };
 
         $("#place_on_hdr").show();
diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
index e62a3ba9af..893ac3b988 100755
--- a/opac/opac-reserve.pl
+++ b/opac/opac-reserve.pl
@@ -290,6 +290,7 @@ if ( $query->param('place_reserve') ) {
             $itemNum = undef;
         }
         my $notes = $query->param('notes_'.$biblioNum)||'';
+        my $item_group_id = $query->param("item_group_id_$biblioNum") || undef;
 
         if (   $maxreserves
             && $reserve_cnt >= $maxreserves )
@@ -321,6 +322,7 @@ if ( $query->param('place_reserve') ) {
                     itemnumber       => $itemNum,
                     found            => $found,
                     itemtype         => $itemtype,
+                    item_group_id    => $item_group_id,
                 }
             );
             $failed_holds++ unless $reserve_id;
@@ -442,6 +444,7 @@ foreach my $biblioNum (@biblionumbers) {
     $biblioLoopIter{reservecount} = $biblioData->{reservecount};
     $biblioLoopIter{already_reserved} = $biblioData->{already_reserved};
     $biblioLoopIter{reqholdnotes}=0; #TODO: For future use
+    $biblioLoopIter{object} = $biblio;
 
     if (!$itemLevelTypes && $biblioData->{itemtype}) {
         $biblioLoopIter{translated_description} = $itemtypes->{$biblioData->{itemtype}}{translated_description};
@@ -668,7 +671,9 @@ foreach my $biblioNum (@biblionumbers) {
     )->forced_hold_level();
     if ($forced_hold_level) {
         $biblioLoopIter{force_hold}   = 1 if $forced_hold_level eq 'item';
+        $biblioLoopIter{force_hold}   = 0 if $forced_hold_level eq 'item_group';
         $biblioLoopIter{itemholdable} = 0 if $forced_hold_level eq 'record';
+        $biblioLoopIter{itemholdable} = 0 if $forced_hold_level eq 'item_group';
         $biblioLoopIter{forced_hold_level} = $forced_hold_level;
     }
 
-- 
2.30.2