From faae1443ae9f3db4e0e4e62f1af8dea6e0b277c3 Mon Sep 17 00:00:00 2001
From: Chris Sharp <csharp@georgialibraries.org>
Date: Thu, 2 Nov 2017 06:56:47 -0400
Subject: [PATCH] PINES Receipt Template Customizations for Web Client

Additional receipt template default changes.

Signed-off-by: McCanna <tmccanna@georgialibraries.org>
---
 .../staff/share/print_templates/t_bill_payment.tt2 |  9 ++--
 .../share/print_templates/t_bills_current.tt2      | 49 ++++++++++++----------
 .../share/print_templates/t_bills_historical.tt2   | 17 +++++---
 3 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_bill_payment.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_bill_payment.tt2
index 2c7c4a718f..40a290cf74 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_bill_payment.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_bill_payment.tt2
@@ -48,19 +48,18 @@
           <td valign="top">{{payment.xact.id}}</td>
         </tr>
         <tr>
-          <td valign="top">Type: &nbsp; </td>
-          <td valign="top"><span ng-if="payment.xact.summary.xact_type == 'grocery'">{{payment.xact.summary.last_billing_type}}</span>
-          <span ng-if="payment.xact.summary.xact_type != 'grocery'" style="text-transform:capitalize;">{{payment.xact.summary.xact_type}}</span></td>
+          <td valign="top">Last Billing Type: &nbsp; </td>
+          <td valign="top">{{payment.xact.summary.last_billing_type}}</td>
         </tr>
         <tr>
           <td valign="top">Received: &nbsp;</td>
 		  <td valign="top">{{payment.amount | currency}}</td>
         </tr>
-        <tr>
+        <tr ng-if="payment.xact.title">
           <td valign="top">Title:</td>
           <td valign="top">{{payment.xact.title}}</td>
         </tr>
-        <tr>
+        <tr ng-if="payment.xact.copy_barcode">
           <td valign="top">Barcode:</td>
           <td valign="top">{{payment.xact.copy_barcode}}</td>
         </tr>
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_bills_current.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_bills_current.tt2
index 0834bb5f56..73cde2d72d 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_bills_current.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_bills_current.tt2
@@ -5,35 +5,40 @@
 <div ng-repeat="xact in transactions">
     <br/>
     <table> 
-      <tr>
-        <td valign="top"><b>Bill ID:</b></td>
-        <td valign="top"><b>{{xact.id}}</b></td>
+      <tr valign="top">
+        <td><b>Bill ID:</b></td>
+        <td><b>{{xact.id}}</b></td>
       </tr> 
-      <tr>
-        <td valign="top">Bill Start Date: &nbsp; </td>
-        <td valign="top">{{xact.xact_start | date:'M/d/yyyy'}}</td>
+      <tr valign="top">
+        <td>Bill Start Date: &nbsp; </td>
+        <td>{{xact.xact_start | date:'M/d/yyyy'}}</td>
       </tr> 
-      <tr>
-        <td valign="top">Type:</td>
-        <td valign="top"><span ng-if="xact.summary.xact_type == 'grocery'">{{xact.summary.last_billing_type}}</span>
-<span ng-if="xact.summary.xact_type != 'grocery'" style="text-transform:capitalize;">{{xact.summary.xact_type}}</span></td>
+        <tr>
+          <td valign="top">Last Billing Type: &nbsp; </td>
+          <td valign="top">{{xact.summary.last_billing_type}}</td>
+        </tr>
+        <tr ng-if="xact.title">
+          <td valign="top">Title:</td>
+          <td valign="top">{{xact.title}}</td>
+        </tr>
+        <tr ng-if="xact.copy_barcode">
+          <td valign="top">Barcode:</td>
+          <td valign="top">{{xact.copy_barcode}}</td>
+        </tr>
+      <tr valign="top">
+        <td>Total Billed:</td>
+        <td>{{xact.summary.total_owed | currency}}</td>
       </tr> 
-      <tr>
-        <td valign="top">Total Billed:</td>
-        <td valign="top">{{xact.summary.total_owed | currency}}</td>
+      <tr valign="top">
+        <td>Total Paid:</td>
+        <td>{{xact.summary.total_paid | currency}}</td>
       </tr> 
-      <tr>
-        <td valign="top">Total Paid:</td>
-        <td valign="top">{{xact.summary.total_paid | currency}}</td>
-      </tr> 
-      <tr>
-        <td valign="top"><b>Balance:</b></td>
-        <td valign="top"><b>{{xact.summary.balance_owed | currency}}</b></td>
+      <tr valign="top">
+        <td><b>Balance:</b></td>
+        <td><b>{{xact.summary.balance_owed | currency}}</b></td>
       </tr> 
     </table>
   </div><!-- ng-repeat -->
 <hr/>
 {{current_location.shortname}} {{today | date:'short'}}
 <br/>
-
-
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 4d602c2d8f..1d18d97dce 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
@@ -13,11 +13,18 @@
         <td valign="top">Bill Start Date: &nbsp; </td>
         <td valign="top">{{xact.xact_start | date:'M/d/yyyy'}}</td>
       </tr> 
-      <tr>
-        <td valign="top">Type:</td>
-        <td valign="top"><span ng-if="xact.summary.xact_type == 'grocery'">{{xact.summary.last_billing_type}}</span>
-<span ng-if="xact.summary.xact_type != 'grocery'" style="text-transform:capitalize;">{{xact.summary.xact_type}}</span></td>
-      </tr> 
+        <tr>
+          <td valign="top">Last Billing Type: &nbsp; </td>
+          <td valign="top">{{xact.summary.last_billing_type}}</td>
+        </tr>
+        <tr ng-if="xact.title">
+          <td valign="top">Title:</td>
+          <td valign="top">{{xact.title}}</td>
+        </tr>
+        <tr ng-if="xact.copy_barcode">
+          <td valign="top">Barcode:</td>
+          <td valign="top">{{xact.copy_barcode}}</td>
+        </tr>
       <tr>
         <td valign="top">Total Billed:</td>
         <td valign="top">{{xact.summary.total_owed | currency}}</td>
-- 
2.11.0