LP1772444: Updating list of variables in bill template descriptions

Bill: repaired merge conflicts and applied some additional docs
consistency across the two billing templates.

Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
Signed-off-by: Bill Erickson <berickxx@gmail.com>

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 c2dcd25..786b868 100644 (file)
--- 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
@@ -2,12 +2,26 @@
 Template for printing a list of current bills. Data specific
 to this template includes:
 
+* today - Today's date and time
+* current_location - the current library
+    current_location.name - Current location's name
+    current_location.shortname - Current location's shortname
+* patron - the patron who was billed, which contains:
+    patron.prefix - Prefix of the patron 
+    patron.first_given_name - First given name of the patron 
+    patron.second_given_name - Second given name of the patron 
+    patron.family_name - Family name of the patron 
+    patron.suffix - Suffix of the patron 
+    patron.card - The patron's barcode number
+    patron.expire_date - The patron's expiration date
+    patron.alias - The patron's alias
+    patron.has_email - Whether or not the patron has an email address
+    patron.has_phone - Whether or not the patron has a phone number
 * transasctions - a list of transactions, each of which
   contains:
-
-  xact.summary - information about the transaction
-  xact.title - Copy title
-  xact.copy_barcode - Copy barcode
+    xact.summary - information about the transaction
+    xact.title - Copy title
+    xact.copy_barcode - Copy barcode
 -->
 Welcome to {{current_location.name}}!<br/>
 You have the following bills:

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 3a5e4cc..ed789a5 100644 (file)
--- 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
@@ -2,12 +2,22 @@
 Template for printing a list of past bills. Data specific
 to this template includes:
 
-* transasctions - a list of transactions, each of which
-  contains:
-
-  current_location.name - Current location's name
-  current_location.shortname - Current location's shortname
-  today - Today's date and time
+* today - Today's date and time
+* current_location - the current library
+    current_location.name - Current location's name
+    current_location.shortname - Current location's shortname
+* patron - the patron who was billed, which contains:
+    patron.prefix - Prefix of the patron
+    patron.first_given_name - First given name of the patron
+    patron.second_given_name - Second given name of the patron
+    patron.family_name - Family name of the patron            
+    patron.suffix - Suffix of the patron
+    patron.card - The patron's barcode number
+    patron.expire_date - The patron's expiration date
+    patron.alias - The patron's alias
+    patron.has_email - Whether or not the patron has an email address
+    patron.has_phone - Whether or not the patron has a phone number
+* transasctions - a list of transactions, each of which contains:
   xact.id - Bill unique id
   xact.copy_barcode - Copy barcode
   xact.xact_finish - Billing finish date and time
@@ -23,6 +33,9 @@ to this template includes:
     xact.summary.total_paid - Total paid
     xact.summary.xact_type - Billing type 
   xact.title - Copy title
+    xact.summary - information about the transaction
+    xact.title - Copy title
+    xact.copy_barcode - Copy barcode
 
 -->
 Welcome to {{current_location.name}}!<br/>