From 2a1ffa86943d5b0f524638a0f51fe242dade401b Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
Date: Mon, 5 Apr 2021 22:39:43 +0000
Subject: [PATCH] Bug 28092: Add reserve notes column to holds to pull
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

To test:
-PLace a hold and add a reserve note to that hold
-Go to Circulation > Holds to pull
-Notice there is no reserve notes column
-Apply patch and restart all the things
-Reload the Holds to pull report and you should see a reserve notes column
-Go to table settings (/cgi-bin/koha/admin/columns_settings.pl) and make sure you can properly hide the column.
-Test other columns in the table and make sure you can properly hide them

Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
Signed-off-by: Petro Vashchuk <stalkernoid@gmail.com>
Signed-off-by: Joonas Kylmälä <joonas.kylmala@helsinki.fi>
---
 admin/columns_settings.yml                                      | 2 ++
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
index 0a14a84508..df9290d727 100644
--- a/admin/columns_settings.yml
+++ b/admin/columns_settings.yml
@@ -1196,6 +1196,8 @@ modules:
             -
               columnname: hold_date
             -
+              columnname: reserve_notes
+            -
               columnname: action
 
     holdsratios:
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 77367bd3b0..06503b871c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
@@ -78,6 +78,7 @@
         <th class="string-sort">Available item types</th>
         <th class="string-sort">Available locations</th>
         <th class="title-string">Earliest hold date</th>
+        <th>Reserve notes</th>
         <th>Action</th>
         </tr>
     </thead>
@@ -177,6 +178,7 @@
         <td>
             <span title="[% hold.reservedate | html %]">[% hold.reservedate | $KohaDates %] in [% Branches.GetName ( hold.branchcode ) | html %]</span>
         </td>
+        <td>[% hold.reservenotes | html %]</td>
         <td>
             <form name="cancelReserve" action="/cgi-bin/koha/circ/pendingreserves.pl" method="post">
                 <input type="hidden" name="op" value="cancel_reserve" />
@@ -238,6 +240,7 @@
         <td id="locationfilter"></td>
         <td></td>
         <td></td>
+        <td></td>
         </tr>
     </tfoot>
     </table>
-- 
2.11.0