From d33ddf6e6e954027c698574dd2b8f776982bc72d Mon Sep 17 00:00:00 2001
From: Jane Sandberg <sandbej@linnbenton.edu>
Date: Wed, 21 Aug 2019 10:26:47 -0700
Subject: [PATCH] LP1739607: Add missing columns to patron record

To test:
1) Open up a patron record with some bills.
2) On the Items Out tab, notice that there is a column named Location
3) On the Bills tab, open up Bill history.
4) In the history transactions grid, note that the column picker is
missing the following columns:
  * Item owning library
  * Checkout/renewal library
  * Due date
  * Fines Stopped Reason
5) In the history payments grid, note that the column picker is missing
the same columns.
6) Apply this commit.
7) Note that the Items Out tab's column is renamed to "Shelving
Location".
8) Notice that both Bill history grids column pickers include the
requested columns.

Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
Signed-off-by: Josh Stompro <stompro@stompro.org>
Signed-off-by: Jason Boyer <jboyer@equinoxinitiative.org>
---
 .../templates/staff/circ/patron/t_bill_history_payments.tt2  | 5 ++++-
 .../src/templates/staff/circ/patron/t_bill_history_xacts.tt2 | 4 ++++
 Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2     | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Open-ILS/src/templates/staff/circ/patron/t_bill_history_payments.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_bill_history_payments.tt2
index 328ab1d097..bbea99843a 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_bill_history_payments.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_bill_history_payments.tt2
@@ -37,7 +37,10 @@
     <!-- needed for item link -->
     <eg-grid-field name="copy_id" 
       path="xact.circulation.target_copy.id" required hidden></eg-grid-field>
-
+    <eg-grid-field path="xact.circulation.target_copy.circ_lib.shortname" name="owning_lib" label="[% l('Item Owning Library') %]"></eg-grid-field>
+    <eg-grid-field path="xact.circulation.circ_lib.shortname" name="circ_lib" label="[% l('Checkout or Renewal Library') %]" hidden></eg-grid-field>
+    <eg-grid-field path="xact.circulation.due_date" label="[% l('Due Date') %]" datefilter="egDueDate" hidden></eg-grid-field>
+    <eg-grid-field path="xact.circulation.stop_fines" label="[% l('Fine Stop Reason') %]" hidden></eg-grid-field>
     <!-- ... -->
 
     <eg-grid-field path="xact.id" required hidden></eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_bill_history_xacts.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_bill_history_xacts.tt2
index 99d6a86b59..b429440805 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_bill_history_xacts.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_bill_history_xacts.tt2
@@ -47,6 +47,10 @@
 
     <eg-grid-field path="summary.*" hidden></eg-grid-field>
     <eg-grid-field path="circulation.target_copy.*" hidden></eg-grid-field>
+    <eg-grid-field path="circulation.target_copy.circ_lib.shortname" label="[% l('Item Owning Library') %]"></eg-grid-field>
+    <eg-grid-field path="circulation.circ_lib.shortname" label="[% l('Checkout or Renewal Library') %]" hidden></eg-grid-field>
+    <eg-grid-field path="circulation.due_date" label="[% l('Due Date') %]" datefilter="egDueDate" hidden></eg-grid-field>
+    <eg-grid-field path="circulation.stop_fines" label="[% l('Fine Stop Reason') %]" hidden></eg-grid-field>
     <eg-grid-field path="circulation.target_copy.call_number.*" hidden></eg-grid-field>
     <eg-grid-field path="circulation.target_copy.call_number.prefix.label" label="[% l('CN Prefix') %]" hidden></eg-grid-field>
     <eg-grid-field path="circulation.target_copy.call_number.suffix.label" label="[% l('CN Suffix') %]" hidden></eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2
index 6c10e6fda0..8dc89022e1 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2
@@ -87,7 +87,7 @@
   <eg-grid-field label="[% l('Circulation Library') %]" path='target_copy.circ_lib.shortname' hidden></eg-grid-field>
   <eg-grid-field label="[% l('Age-based Hold Protection') %]" path='target_copy.age_protect.name' hidden></eg-grid-field>
   <eg-grid-field label="[% l('Floating Group') %]" path='target_copy.floating.name' hidden></eg-grid-field>
-  <eg-grid-field label="[% l('Location') %]" path='target_copy.location.name' hidden></eg-grid-field>
+  <eg-grid-field label="[% l('Shelving Location') %]" path='target_copy.location.name' hidden></eg-grid-field>
   <eg-grid-field label="[% l('Owning Library') %]" path='target_copy.call_number.owning_lib.shortname' hidden></eg-grid-field>
   <eg-grid-field label="[% l('Renewals Remaining') %]" path='renewal_remaining'></eg-grid-field>
   <eg-grid-field label="[% l('Fines Stopped') %]" path='stop_fines'></eg-grid-field>
-- 
2.43.2