From 32f2733de34c34249b4dd406644b4f3c43660ba6 Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Tue, 10 Mar 2020 07:27:25 -0400
Subject: [PATCH] Bug 24860: Add ability to select a volume 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      | 23 ++++++++++++++++++-
 opac/opac-reserve.pl                          |  7 ++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

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 cf72809082..a45de1399c 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.volume_id %]
+                                <br/><strong>Next available item from volume <i>[% HOLD.volume.description | html %]</i></strong>
+                            [% END %]
                         </td>
                         <td class="reservedate">
                             <span title="[% HOLD.reservedate | html %]">
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 ec4aaf5b03..c9372327fe 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 forced_hold_level && ( forced_hold_level == 'item' || forced_hold_level == 'record' ) %]
+                                                    [% IF bibitemloo.object.volumes %]
+                                                        <li>
+                                                            <label for="itemtype">Request specific volume:</label>
+                                                            <select name="volume_id_[% bibitemloo.biblionumber | html %]" id="volume_id_[% bibitemloo.biblionumber | html %]" size="1">
+                                                                <option value="">Any volume</option>
+                                                                [% FOREACH v IN bibitemloo.object.volumes %]
+                                                                    <option value="[% v.id | html %]">[% v.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 == 'volume' %]
                                                             <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 %]"
@@ -330,6 +344,7 @@
                                                                     checked="checked"
                                                             />
                                                         [% END %]
+
                                                         <label class="radio inline" for="reqspecific_[% bibitemloo.biblionumber | html %]">A specific item</label>
                                                         <input type="radio" name="reqtype_[% bibitemloo.biblionumber | html %]"
                                                                id="reqspecific_[% bibitemloo.biblionumber | html %]"
@@ -570,8 +585,14 @@
             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 ( $(`#volume_id_${biblioNum}`).length ) {
+                    $(`#volume_id_${biblioNum}`).val("").attr('disabled', 'disabled');
+                }
                 $(newCopiesRowId).show();
             } else {
+                if ( $(`#volume_id_${biblioNum}`).length ) {
+                    $(`#volume_id_${biblioNum}`).removeAttr('disabled');
+                }
                 $(newCopiesRowId).hide();
              }
         };
diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
index b0ed088689..a614a9521c 100755
--- a/opac/opac-reserve.pl
+++ b/opac/opac-reserve.pl
@@ -286,6 +286,7 @@ if ( $query->param('place_reserve') ) {
             $itemNum = undef;
         }
         my $notes = $query->param('notes_'.$biblioNum)||'';
+        my $volume_id = $query->param("volume_id_$biblioNum") || undef;
 
         if (   $maxreserves
             && $reserve_cnt >= $maxreserves )
@@ -320,6 +321,7 @@ if ( $query->param('place_reserve') ) {
                     itemnumber       => $itemNum,
                     found            => $found,
                     itemtype         => $itemtype,
+                    volume_id        => $volume_id,
                 }
             );
             $failed_holds++ unless $reserve_id;
@@ -430,6 +432,7 @@ foreach my $biblioNum (@biblionumbers) {
     }
 
     my $frameworkcode = GetFrameworkCode( $biblioData->{biblionumber} );
+    $biblioLoopIter{object} = $biblio;
     $biblioLoopIter{biblionumber} = $biblioData->{biblionumber};
     $biblioLoopIter{title} = $biblioData->{title};
     $biblioLoopIter{subtitle} = $biblioData->{'subtitle'};
@@ -633,7 +636,11 @@ 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 'volume';
+
         $biblioLoopIter{itemholdable} = 0 if $forced_hold_level eq 'record';
+        $biblioLoopIter{itemholdable} = 0 if $forced_hold_level eq 'volume';
+
         $biblioLoopIter{forced_hold_level} = $forced_hold_level;
     }
 
-- 
2.24.1 (Apple Git-126)