From 375fbd1704d9f5d7d6bc729c7d2c514ccc94bb3b Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
Date: Wed, 7 Dec 2022 18:41:26 +0000
Subject: [PATCH] Bug 32421: Add collection column to holds to pull

To test:

1. Place some holds
2. Go to Circulation > Holds to pull
3. Notice there is not column to indicate collection ( CCODE )
4. Apply patch and restart services
5. Step 2 again, this time you should see a column for holds to pull
6. Using both the Columns button and via 'Table setting' attempt to hide the column and other columns. Ensure everything is being heiiden correctly.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Bug 32421: (follow-up) Correct table settings

Signed-off-by: Laura Escamilla <laura.escamilla@bywatersolutions.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 admin/columns_settings.yml                               | 2 ++
 circ/pendingreserves.pl                                  | 1 +
 .../prog/en/modules/circ/pendingreserves.tt              | 9 +++++++++
 3 files changed, 12 insertions(+)

diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
index a4163be70b..aa29dfd4d6 100644
--- a/admin/columns_settings.yml
+++ b/admin/columns_settings.yml
@@ -1541,6 +1541,8 @@ modules:
               columnname: itemtypes
             -
               columnname: locations
+            -
+              columnname: collection
             -
               columnname: hold_date
             -
diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl
index 07df53bc3c..21016bc354 100755
--- a/circ/pendingreserves.pl
+++ b/circ/pendingreserves.pl
@@ -269,6 +269,7 @@ foreach my $bibnum ( @biblionumbers ){
 
     # get available values for each biblio
     my $fields = {
+        collections     => 'ccode',
         locations       => 'location',
         callnumbers     => 'itemcallnumber',
         enumchrons      => 'enumchron',
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
index 98ee66fcbb..5d44bf09e7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
@@ -80,6 +80,7 @@
         <th>Available enumeration</th>
         <th class="string-sort">Available item types</th>
         <th class="string-sort">Available locations</th>
+        <th class="string-sort">Available collections</th>
         <th>Earliest hold date</th>
         <th>Hold notes</th>
         <th class="string-sort">Pickup location</th>
@@ -191,6 +192,13 @@
             [% END %]
             </ul>
         </td>
+        <td>
+            <ul>
+            [% FOREACH ccode IN hold_info.collections %]
+                <li>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => ccode ) | html %]</li>
+            [% END %]
+            </ul>
+        </td>
         <td data-order="[% hold.reservedate | html %]">
             [% hold.reservedate | $KohaDates %] in [% Branches.GetName ( hold.branchcode ) | html %]
         </td>
@@ -259,6 +267,7 @@
         <td id="locationfilter"></td>
         <td></td>
         <td></td>
+        <td></td>
         <td id="pickup-location"></td>
         <td></td>
         </tr>
-- 
2.39.5