From baffe97f3e8b1b7db36ca27391310c111e291aef Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Fri, 26 May 2023 10:58:33 +0000
Subject: [PATCH] Bug 33845: Display hold notes in staff client circulation
 paes

This patch adds the reservenotes column to svc holds, and ensures they display on
circulation and memeber details

To test:
1 - Enable system preference 'OpacHoldNotes'
2 - Place a hold for a ptron via the OPAC
3 - View the patron in the staff client
4 - Click on the 'Holds' tab
5 - Ensure you can see the hold note
6 - Click on the 'Circulation' tab on the left
7 - Click the 'Holds' tab and confirm you can view the note

Signed-off-by: Andrew Fuerste-Henry <andrewfh@dubcolib.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 koha-tmpl/intranet-tmpl/prog/en/includes/patron-detail-tabs.inc | 1 +
 koha-tmpl/intranet-tmpl/prog/js/holds.js                        | 1 +
 svc/holds                                                       | 1 +
 3 files changed, 3 insertions(+)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-detail-tabs.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-detail-tabs.inc
index fa6ff2f34f..78ce636879 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-detail-tabs.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-detail-tabs.inc
@@ -150,6 +150,7 @@
                                     <th>Pickup at</th>
                                     <th>Expiration</th>
                                     <th>Priority</th>
+                                    <th>Notes</th>
                                     <th>Delete?</th>
                                     <th>Suspend?</th>
                                     <th>Status</th>
diff --git a/koha-tmpl/intranet-tmpl/prog/js/holds.js b/koha-tmpl/intranet-tmpl/prog/js/holds.js
index 7004ae6ab8..802c6e1dcd 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/holds.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/holds.js
@@ -233,6 +233,7 @@ $(document).ready(function() {
                             }
                         }
                     },
+                    { "data": "reservenotes" },
                     {
                         "bSortable": false,
                         "mDataProp": function( oObj ) {
diff --git a/svc/holds b/svc/holds
index 8043297573..49888cdaf2 100755
--- a/svc/holds
+++ b/svc/holds
@@ -113,6 +113,7 @@ while ( my $h = $holds_rs->next() ) {
         waiting_at     => $h->branch()->branchname(),
         waiting_here   => $h->branch()->branchcode() eq $branch,
         priority       => $h->priority(),
+        reservenotes   => $h->reservenotes(),
         itemtype_limit => $itemtype_limit,
         reservedate_formatted => $h->reservedate() ? output_pref(
             { dt => dt_from_string( $h->reservedate() ), dateonly => 1 }
-- 
2.39.5