[open-ils-commits] [GIT] Evergreen ILS branch rel_3_0 updated. 59266376dd5fa9ac7a443559a60d5ec030f7a17a
Evergreen Git
git at git.evergreen-ils.org
Fri Jan 12 13:49:34 EST 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_0 has been updated
via 59266376dd5fa9ac7a443559a60d5ec030f7a17a (commit)
from d5a8a5288d26d86355c2fa7b046a928ab6e25ddb (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 59266376dd5fa9ac7a443559a60d5ec030f7a17a
Author: Kyle Huckins <khuckins at catalyte.io>
Date: Thu Jan 11 18:10:51 2018 +0000
lp1742194 - Print Current Bills only printing circ bills
- Check xact for Circulation before assigning circulation data to
xact for printing.
To test
-------
[1] Set up a patron with at least one "grocery" bill.
[2] In the web staff client, go to
Patron Account > Bills > Actions > Print Bills
[3] Note that the current bills summary is not printed
and that there an error in the browser console.
[4] Apply the patch and repeat step #2. This time, the
bills summary should be printed.
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/web/js/ui/default/staff/circ/patron/bills.js b/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
index 89e686d..a7e9b64 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
@@ -498,8 +498,10 @@ function($scope , $q , $routeParams , egCore , egConfirmDialog , $location,
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()
+ }
+ if (xact.circulation()) {
+ newXact.copy_barcode = xact.circulation().target_copy().barcode(),
+ newXact.title = xact.circulation().target_copy().call_number().record().simple_record().title()
}
xacts.push(newXact);
}
@@ -962,8 +964,10 @@ function($scope, $q , egCore , patronSvc , billSvc , egPromptDialog , $location
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()
+ }
+ if (xact.circulation()) {
+ newXact.copy_barcode = xact.circulation().target_copy().barcode(),
+ newXact.title = xact.circulation().target_copy().call_number().record().simple_record().title()
}
xacts.push(newXact);
}
-----------------------------------------------------------------------
Summary of changes:
.../web/js/ui/default/staff/circ/patron/bills.js | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list