From 5358aed6ff29a3ce4ae695af101d9d115efce43c Mon Sep 17 00:00:00 2001 From: phasefx Date: Mon, 25 Jul 2005 13:52:37 +0000 Subject: [PATCH] checkout receipt fix, and don't treat item already circulating as a bug git-svn-id: svn://svn.open-ils.org/ILS/trunk@1415 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../chrome/content/evergreen/patron/patron_display.js | 8 ++++++-- .../staff_client/chrome/content/evergreen/util/print.js | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.js b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.js index 00158c078e..e02c097403 100755 --- a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.js +++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.js @@ -267,7 +267,7 @@ function patron_display_patron_checkout_items_init(p) { var checkouts = []; function print_receipt() { - p._current_checkouts = checkouts; + p._patron._current_checkouts = checkouts; var params = { 'au' : p._patron, 'lib' : mw.G.user_ou, @@ -309,7 +309,11 @@ function patron_display_patron_checkout_items_init(p) { } } catch(E) { tb.select(); - handle_error(E); + if (typeof(E) == 'object') { + handle_error(E,true); + } else { + s_alert(E); + } } tb.focus(); } diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/print.js b/Evergreen/staff_client/chrome/content/evergreen/util/print.js index 625ae051e0..265f9c1939 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/util/print.js +++ b/Evergreen/staff_client/chrome/content/evergreen/util/print.js @@ -22,9 +22,9 @@ function print_circ_receipt(circ_type,params,sample_view) { case 'checkout' : circs = params.au._current_checkouts; break; } for (var i = 0; i < circs.length; i++) { - params.current_circ = circs()[i].circ; - params.current_copy = circs()[i].copy; - params.current_mvr = circs()[i].record; + params.current_circ = circs[i].circ; + params.current_copy = circs[i].copy; + params.current_mvr = circs[i].record; params.current_index = i; s += print_template_replace(params.line_item, params); } -- 2.43.2