[open-ils-commits] [GIT] Evergreen ILS branch rel_3_1 updated. e221845b6e66e3f5aa1bdd5cac838852e4591d19
Evergreen Git
git at git.evergreen-ils.org
Tue Jun 19 13:05:54 EDT 2018
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, rel_3_1 has been updated
via e221845b6e66e3f5aa1bdd5cac838852e4591d19 (commit)
via 28dd68c6be7cb41ed2fd7494e2cda4fa5e86d386 (commit)
from 95f442cbc728f08721c9a1ef6e8d7b47efcf1cda (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 e221845b6e66e3f5aa1bdd5cac838852e4591d19
Author: Jane Sandberg <sandbej at linnbenton.edu>
Date: Thu Jun 7 10:11:43 2018 -0700
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 at linnbenton.edu>
Signed-off-by: Bill Erickson <berickxx at 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
--- 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
--- 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/>
commit 28dd68c6be7cb41ed2fd7494e2cda4fa5e86d386
Author: Jason Boyer <jboyer at library.in.gov>
Date: Mon May 21 12:09:09 2018 -0400
LP1772444: Add Patron Names to Bill Receipts
The bills_current and bills_historical receipt templates
were missing patron information. This has been added to
match most other receipt templates (money_summary is not
included since it could potentially be stale).
Signed-off-by: Jason Boyer <jboyer at library.in.gov>
Signed-off-by: Bill Erickson <berickxx at gmail.com>
diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js b/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
index e1d1686..89110aa 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
@@ -527,13 +527,26 @@ function($scope , $q , $routeParams , egCore , egConfirmDialog , $location,
{authoritative : true}
).then(
function() {
+ var cusr = patronSvc.current;
egCore.print.print({
context : 'receipt',
template : 'bills_current',
scope : {
transactions : xacts,
current_location : egCore.idl.toHash(
- egCore.org.get(egCore.auth.user().ws_ou()))
+ egCore.org.get(egCore.auth.user().ws_ou())),
+ patron : {
+ prefix : cusr.prefix(),
+ first_given_name : cusr.first_given_name(),
+ second_given_name : cusr.second_given_name(),
+ family_name : cusr.family_name(),
+ suffix : cusr.suffix(),
+ card : { barcode : cusr.card().barcode() },
+ expire_date : cusr.expire_date(),
+ alias : cusr.alias(),
+ has_email : Boolean(cusr.email() && cusr.email().match(/.*@.*/).length),
+ has_phone : Boolean(cusr.day_phone() || cusr.evening_phone() || cusr.other_phone())
+ }
}
});
},
@@ -1008,13 +1021,26 @@ function($scope, $q , egCore , patronSvc , billSvc , egPromptDialog , $location
{authoritative : true}
).then(
function() {
+ var cusr = patronSvc.current;
egCore.print.print({
context : 'receipt',
template : 'bills_historical',
scope : {
transactions : xacts,
current_location : egCore.idl.toHash(
- egCore.org.get(egCore.auth.user().ws_ou()))
+ egCore.org.get(egCore.auth.user().ws_ou())),
+ patron : {
+ prefix : cusr.prefix(),
+ first_given_name : cusr.first_given_name(),
+ second_given_name : cusr.second_given_name(),
+ family_name : cusr.family_name(),
+ suffix : cusr.suffix(),
+ card : { barcode : cusr.card().barcode() },
+ expire_date : cusr.expire_date(),
+ alias : cusr.alias(),
+ has_email : Boolean(cusr.email() && cusr.email().match(/.*@.*/).length),
+ has_phone : Boolean(cusr.day_phone() || cusr.evening_phone() || cusr.other_phone())
+ }
}
});
},
-----------------------------------------------------------------------
Summary of changes:
.../share/print_templates/t_bills_current.tt2 | 22 ++++++++++++--
.../share/print_templates/t_bills_historical.tt2 | 25 ++++++++++++----
.../web/js/ui/default/staff/circ/patron/bills.js | 30 ++++++++++++++++++-
3 files changed, 65 insertions(+), 12 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list