From 2a9d6c618109b4ac40eb95d368ae83aa64e85e00 Mon Sep 17 00:00:00 2001
From: Cesar Velez <cesar.velez@equinoxinitiative.org>
Date: Fri, 5 Jan 2018 14:23:01 -0500
Subject: [PATCH] LP#1739669 - add PaymentType and persistkey bill payment hist
 grid

This adds "circ.patron.billhistory_payments" as the persist-key for that
grid and also adds a Payment Type column. Note that the Payment Type is
that of the individual payment, while the Last Payment Type is that
of the most recent payment on the billing in question.

To test
-------
[1] Set up a patron bill that has multiple payments on it off
    different types (e.g., cash, credit, etc.)
[2] Apply the patch.
[3] In the payments tab of the Bill History page in the web staff
    client, note that there is now a Payment Type column available.
    Verify that it matches the types of the payments entered in
    step 1.
[4] Verify that column settings for that payment history grid can be
    saved.

Signed-off by: Cesar Velez <cesar.velez@equinoxinitiative.org>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>

Signed-off-by: Jason Etheridge <jason@EquinoxInitiative.org>
---
 Open-ILS/src/templates/staff/circ/patron/t_bill_history_payments.tt2 | 5 +++--
 1 file changed, 3 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 9c1a53acc0..328ab1d097 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
@@ -5,8 +5,8 @@
     idl-class="mp"
     id-field="id"
     grid-controls="gridControls"
-    dateformat="{{$root.egDateAndTimeFormat}}">
-
+    dateformat="{{$root.egDateAndTimeFormat}}"
+    persist-key="circ.patron.billhistory_payments">
     <eg-grid-action 
       label="[% l('Full Details') %]" handler="showFullDetails"></eg-grid-action>
 
@@ -18,6 +18,7 @@
     <eg-grid-field path="xact.summary.xact_type" label="[% l('Transaction Type') %]"></eg-grid-field>
     <eg-grid-field path="xact.summary.last_billing_type" label="[% l('Last Billing Type') %]"></eg-grid-field>
 
+    <eg-grid-field path="payment_type" label="Payment Type"></eg-grid-field>
     <eg-grid-field label="[% l('Title') %]" name="title" 
       path="xact.circulation.target_copy.call_number.record.simple_record.title">
       <a target="_self" href="[% ctx.base_path %]/staff/cat/catalog/record/{{item.record_id}}">{{item.title}}</a>
-- 
2.11.0