[open-ils-commits] [GIT] Evergreen ILS branch rel_3_0 updated. 1ac9976fa102b2505e18bbeb4e999e4aab5be5ef
Evergreen Git
git at git.evergreen-ils.org
Thu Nov 9 11:04:21 EST 2017
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_0 has been updated
via 1ac9976fa102b2505e18bbeb4e999e4aab5be5ef (commit)
via d6e3f5ffa59106c84ed86565c11b9c314af59ca1 (commit)
from 6120ed55b4f9939e8a210980a46af1dd3bba87ce (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 1ac9976fa102b2505e18bbeb4e999e4aab5be5ef
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Tue Nov 7 13:41:55 2017 -0500
LP#1708488: adjust how patron financial summary is exposed to checkout receipts
This patch builds on the previous patch by grabbing the patron's
financial summary from the patron stats values. The "patron_money"
template value is no longer associated with a particular loan, meaning
that you can do things like this:
<span ng-if="patron_money.balance_owed">You owe the library ${{patron_money.balance_owed}}</span>
The additional values include
* patron_money.balance_owed - current balance
* patron_money.total_paid - payments made on outstanding fines/fees
* patron_money.total_owed - total of outstanding fines/fees
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Signed-off-by: Terra McCanna <tmccanna at georgialibraries.org>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_checkout.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_checkout.tt2
index 9c3c6b9..6b445b9 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_checkout.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_checkout.tt2
@@ -1,13 +1,18 @@
<!--
Template for printing checkout receipts; fields available include:
+* patron_money - summary of the patron's current financial obligations:
+
+ * patron_money.balance_owed - current balance
+ * patron_money.total_paid - payments made on outstanding fines/fees
+ * patron_money.total_owed - total of outstanding fines/fees
+
* circulations - list of loans made during this session. Each
includes:
* title
* copy_barcode
* due_date
- * patron_money.balance_owed - must be grabbed from a specific circulation, e.g. circulations[0].patron_money.balance_owed
-->
<div>
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 0213828..d5205d0 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
@@ -469,15 +469,16 @@ function($scope , $q , egCore , ngToast) {
},
copy : seed_copy,
title : seed_record.title,
- author : seed_record.author,
- patron_money : {
- balance_owed : "$5.00",
- total_owed : "$10.10",
- total_paid : "$5.10"
- }
+ author : seed_record.author
},
],
+ patron_money : {
+ balance_owed : 5.01,
+ total_owed : 10.12,
+ total_paid : 5.11
+ },
+
in_house_uses : [
{
num_uses : 3,
diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js b/Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js
index e3ad2f7..83a6a6f 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js
@@ -264,7 +264,6 @@ function($scope , $q , $routeParams , egCore , egUser , patronSvc ,
if (co.circ) {
print_data.circulations.push({
circ : egCore.idl.toHash(co.circ),
- patron_money : egCore.idl.toHash(co.evt[0].payload.patron_money),
copy : egCore.idl.toHash(co.acp),
call_number : egCore.idl.toHash(co.acn),
title : co.title,
@@ -273,6 +272,8 @@ function($scope , $q , $routeParams , egCore , egUser , patronSvc ,
};
});
+ print_data.patron_money = patronSvc.patron_stats.fines;
+
return egCore.print.print({
context : 'default',
template : 'checkout',
commit d6e3f5ffa59106c84ed86565c11b9c314af59ca1
Author: Kyle Huckins <khuckins at catalyte.io>
Date: Fri Oct 27 16:24:04 2017 +0000
LP#1708488 Checkout Print Template Balance Owed
Add Patron's money summary to Circulations in Checkout print template.
Signed-off-by: Kyle Huckins <khuckins at catalyte.io>
Signed-off-by: Terra McCanna <tmccanna at georgialibraries.org>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_checkout.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_checkout.tt2
index 327a05e..9c3c6b9 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_checkout.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_checkout.tt2
@@ -7,6 +7,7 @@ Template for printing checkout receipts; fields available include:
* title
* copy_barcode
* due_date
+ * patron_money.balance_owed - must be grabbed from a specific circulation, e.g. circulations[0].patron_money.balance_owed
-->
<div>
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 d3468af..0213828 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
@@ -469,7 +469,12 @@ function($scope , $q , egCore , ngToast) {
},
copy : seed_copy,
title : seed_record.title,
- author : seed_record.author
+ author : seed_record.author,
+ patron_money : {
+ balance_owed : "$5.00",
+ total_owed : "$10.10",
+ total_paid : "$5.10"
+ }
},
],
diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js b/Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js
index 4234f5c..e3ad2f7 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js
@@ -264,6 +264,7 @@ function($scope , $q , $routeParams , egCore , egUser , patronSvc ,
if (co.circ) {
print_data.circulations.push({
circ : egCore.idl.toHash(co.circ),
+ patron_money : egCore.idl.toHash(co.evt[0].payload.patron_money),
copy : egCore.idl.toHash(co.acp),
call_number : egCore.idl.toHash(co.acn),
title : co.title,
-----------------------------------------------------------------------
Summary of changes:
.../staff/share/print_templates/t_checkout.tt2 | 6 ++++++
.../js/ui/default/staff/admin/workstation/app.js | 6 ++++++
.../js/ui/default/staff/circ/patron/checkout.js | 2 ++
3 files changed, 14 insertions(+), 0 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list