[open-ils-commits] [GIT] Evergreen ILS branch rel_3_0 updated. e36fb5f86df30d9328838e4f57c9514ab19bd0f9
Evergreen Git
git at git.evergreen-ils.org
Fri Nov 17 12:21:42 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 e36fb5f86df30d9328838e4f57c9514ab19bd0f9 (commit)
via b181904f2b448a67e1fc03ea06876092beb77baf (commit)
from 778bf4788ea7ef9ab328fcd8f8a424289ec51a7a (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 e36fb5f86df30d9328838e4f57c9514ab19bd0f9
Author: Kathy Lussier <klussier at masslnc.org>
Date: Fri Nov 17 12:11:12 2017 -0500
LP#1708487: Update helper text in print template
Update the helper text for title and barcode for bills printer templates to
include xact.
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
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 a229d80..c2dcd25 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,9 +5,9 @@ to this template includes:
* transasctions - a list of transactions, each of which
contains:
- summary - information about the transaction
- title - Copy title
- 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 5a75e3b..6b0279d 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,9 @@ to this template includes:
* transasctions - a list of transactions, each of which
contains:
- summary - information about the transaction
- title - Copy title
- 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/>
commit b181904f2b448a67e1fc03ea06876092beb77baf
Author: Kyle Huckins <khuckins at catalyte.io>
Date: Mon Oct 30 15:55:24 2017 +0000
LP#1708487 Add Title and Barcode to Bill Print Templates
- Add additional documentation to Bills, Current; Bills, Payment; and Bills,
Historical print templates.
- Convert xacts to objects containing all required information for print
templates
Signed-off-by: Kyle Huckins <khuckins at catalyte.io>
Changes to be committed:
modified: Open-ILS/src/templates/staff/share/print_templates/t_bill_payment.tt2
modified: Open-ILS/src/templates/staff/share/print_templates/t_bills_current.tt2
modified: Open-ILS/src/templates/staff/share/print_templates/t_bills_historical.tt2
modified: Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
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 2f2cfec..57e50fe 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
@@ -8,6 +8,9 @@ includes:
* new_balance - balance after the payments were applied
* payments - list of specific payments
+Individual payments within payments contain:
+* payment.xact.copy_barcode - Copy barcode
+* payment.xact.title - Copy title
-->
Welcome to {{current_location.name}}!<br/>
A receipt of your transaction:<hr/>
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 d75850f..a229d80 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
@@ -6,7 +6,8 @@ to this template includes:
contains:
summary - information about the transaction
-
+ title - Copy title
+ 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 57efdc5..5a75e3b 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
@@ -6,6 +6,8 @@ to this template includes:
contains:
summary - information about the transaction
+ title - Copy title
+ copy_barcode - Copy barcode
-->
Welcome to {{current_location.name}}!<br/>
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 1ead1cc..89e686d 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
@@ -464,7 +464,14 @@ function($scope , $q , $routeParams , egCore , egConfirmDialog , $location,
var xacts = [];
egCore.pcrud.search('mbt',
{id : ids},
- {flesh : 1, flesh_fields : {'mbt' : ['summary']}},
+ {flesh : 5, flesh_fields : {
+ 'mbt' : ['summary', 'circulation'],
+ 'circ' : ['target_copy'],
+ 'acp' : ['call_number'],
+ 'acn' : ['record'],
+ 'bre' : ['simple_record']
+ }
+ },
{authoritative : true}
).then(
function() {
@@ -480,7 +487,21 @@ function($scope , $q , $routeParams , egCore , egConfirmDialog , $location,
},
null,
function(xact) {
- xacts.push(egCore.idl.toHash(xact));
+ newXact = {
+ billing_total : xact.billing_total(),
+ billings : xact.billings(),
+ grocery : xact.grocery(),
+ id : xact.id(),
+ payment_total : xact.payment_total(),
+ payments : xact.payments(),
+ summary : egCore.idl.toHash(xact.summary()),
+ unrecovered : xact.unrecovered(),
+ xact_finish : xact.xact_finish(),
+ xact_start : xact.xact_start(),
+ copy_barcode : xact.circulation().target_copy().barcode(),
+ title : xact.circulation().target_copy().call_number().record().simple_record().title()
+ }
+ xacts.push(newXact);
}
);
}
@@ -907,7 +928,14 @@ function($scope, $q , egCore , patronSvc , billSvc , egPromptDialog , $location
var xacts = [];
egCore.pcrud.search('mbt',
{id : ids},
- {flesh : 1, flesh_fields : {'mbt' : ['summary']}},
+ {flesh : 5, flesh_fields : {
+ 'mbt' : ['summary', 'circulation'],
+ 'circ' : ['target_copy'],
+ 'acp' : ['call_number'],
+ 'acn' : ['record'],
+ 'bre' : ['simple_record']
+ }
+ },
{authoritative : true}
).then(
function() {
@@ -923,12 +951,24 @@ function($scope, $q , egCore , patronSvc , billSvc , egPromptDialog , $location
},
null,
function(xact) {
- xacts.push(egCore.idl.toHash(xact));
+ newXact = {
+ billing_total : xact.billing_total(),
+ billings : xact.billings(),
+ grocery : xact.grocery(),
+ id : xact.id(),
+ payment_total : xact.payment_total(),
+ payments : xact.payments(),
+ summary : egCore.idl.toHash(xact.summary()),
+ unrecovered : xact.unrecovered(),
+ xact_finish : xact.xact_finish(),
+ xact_start : xact.xact_start(),
+ copy_barcode : xact.circulation().target_copy().barcode(),
+ title : xact.circulation().target_copy().call_number().record().simple_record().title()
+ }
+ xacts.push(newXact);
}
);
}
-
-
}])
.controller('BillPaymentHistoryCtrl',
-----------------------------------------------------------------------
Summary of changes:
.../staff/share/print_templates/t_bill_payment.tt2 | 3 +
.../share/print_templates/t_bills_current.tt2 | 5 +-
.../share/print_templates/t_bills_historical.tt2 | 4 +-
.../web/js/ui/default/staff/circ/patron/bills.js | 52 +++++++++++++++++--
4 files changed, 55 insertions(+), 9 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list