From 8fe5ed12564b344258f3c951e793cd934b38a69e Mon Sep 17 00:00:00 2001 From: Jason Boyer <jboyer@library.in.gov> Date: Mon, 21 May 2018 12:09:09 -0400 Subject: [PATCH] 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@library.in.gov> Signed-off-by: Bill Erickson <berickxx@gmail.com> --- .../web/js/ui/default/staff/circ/patron/bills.js | 30 ++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) 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 e1d1686070..89110aa859 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()) + } } }); }, -- 2.11.0