[open-ils-commits] [GIT] Evergreen ILS branch master updated. fc25b345602b337b585c1dc64e26714b03b28de8

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  fc25b345602b337b585c1dc64e26714b03b28de8 (commit)
      from  0eac25ef0cedb566371f77fc680d8494bac7ad79 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fc25b345602b337b585c1dc64e26714b03b28de8
Author: Garry Collum <gcollum at gmail.com>
Date:   Wed May 23 22:17:38 2018 -0400

    LP#1745232 - Bill History Receipt doesn't have Finish Date
    
    Adds xact.finish and xact.summary.last_payment to the example data.  Also adds xact.summary.last_payment_ts to the template body to indicate when the last payment was made.  Also adds a list of variables that can be used in the template in the template's description.
    
    To test -
    1. apply the patch
    2. find a patron with billings, or add some billings to a patron record.
    3. make payments on some of the billings using various methods.
    4. go to billing history and print the history list.
    
    Signed-off-by: Garry Collum <gcollum at gmail.com>
    Signed-off-by: John Amundson <jamundson at cwmars.org>
    Signed-off-by: Jason Stephenson <jason at sigio.com>

diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_bills_historical.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_bills_historical.tt2
index 6b0279d..3a5e4cc 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_bills_historical.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_bills_historical.tt2
@@ -5,9 +5,24 @@ to this template includes:
 * transasctions - a list of transactions, each of which
   contains:
 
-  xact.summary - information about the transaction
-  xact.title - Copy title
+  current_location.name - Current location's name
+  current_location.shortname - Current location's shortname
+  today - Today's date and time
+  xact.id - Bill unique id
   xact.copy_barcode - Copy barcode
+  xact.xact_finish - Billing finish date and time
+  xact.xact_start - Billing start date and time
+  xact.summary - Information about the transaction
+    xact.summary.balance_owed - Balance owed
+    xact.summary.last_billing_note - Last billing note
+    xact.summary.last_billing_type - Last billing type
+    xact.summary.last_payment_note - Last payment note
+    xact.summary.last_payment_ts - Last payment date and time 
+    xact.summary.last_payment_type - Last payment type
+    xact.summary.total_owed - Total billed 
+    xact.summary.total_paid - Total paid
+    xact.summary.xact_type - Billing type 
+  xact.title - Copy title
 
 -->
 Welcome to {{current_location.name}}!<br/>
@@ -19,7 +34,7 @@ You had the following bills:
     <dd>
     <table> 
       <tr valign="top">
-        <td>[% l('Date:') %]</td>
+        <td>[% l('Billing Date:') %]</td>
         <td>{{xact.xact_start | date:$root.egDateAndTimeFormat}}</td>
       </tr> 
       <tr valign="top">
@@ -39,7 +54,8 @@ You had the following bills:
       <tr valign="top">
         <td>[% l('Last Payment') %]:</td>
         <td>{{xact.summary.last_payment_type}}<br/>
-            {{xact.summary.last_payment_note}}
+            {{xact.summary.last_payment_note}}<br/>
+            {{xact.summary.last_payment_ts | date:$root.egDateAndTimeFormat}}
         </td>
       </tr> 
       <tr valign="top">
diff --git a/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js b/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
index 012eab0..f599bc0 100644
--- a/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
+++ b/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
@@ -476,24 +476,28 @@ function($scope , $q , egCore , ngToast) {
             {
                 id : 1,
                 xact_start : new Date().toISOString(),
+                xact_finish : new Date().toISOString(),
                 summary : {
                     xact_type : 'circulation',
                     last_billing_type : 'Overdue materials',
                     total_owed : 1.50,
                     last_payment_note : 'Test Note 1',
                     last_payment_type : 'cash_payment',
+                    last_payment_ts : new Date().toISOString(),
                     total_paid : 0.50,
                     balance_owed : 1.00
                 }
             }, {
                 id : 2,
                 xact_start : new Date().toISOString(),
+                xact_finish : new Date().toISOString(),
                 summary : {
                     xact_type : 'circulation',
                     last_billing_type : 'Overdue materials',
                     total_owed : 2.50,
                     last_payment_note : 'Test Note 2',
                     last_payment_type : 'credit_payment',
+                    last_payment_ts : new Date().toISOString(),
                     total_paid : 0.50,
                     balance_owed : 2.00
                 }

-----------------------------------------------------------------------

Summary of changes:
 .../share/print_templates/t_bills_historical.tt2   |   24 ++++++++++++++++---
 .../js/ui/default/staff/admin/workstation/app.js   |    4 +++
 2 files changed, 24 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS