From 08147111826811480cd71b298c694af26699c14c Mon Sep 17 00:00:00 2001 From: phasefx Date: Thu, 21 Jul 2005 13:12:01 +0000 Subject: [PATCH] checkboxes and little tweaks git-svn-id: svn://svn.open-ils.org/ILS/trunk@1333 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../content/evergreen/patron/patron_bills.js | 29 ++++++++++++++++------ .../evergreen/patron/patron_display_overlay.xul | 2 +- .../chrome/content/evergreen/util/util.js | 10 +++++--- 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_bills.js b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_bills.js index 97932f3275..c303c4d08d 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_bills.js +++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_bills.js @@ -76,13 +76,17 @@ function patron_bills_init(p) { var total = dollars_float_to_cents_integer( tb.value ); for (var i = 0; i < p.current_payments.length; i++) { var bill = p.current_payments[i]; - var bo = dollars_float_to_cents_integer( bill.balance_owed ); - if ( bo > total ) { - bill.textbox.value = cents_as_dollars( total ); - total = 0; + if (bill.checkbox.checked) { + var bo = dollars_float_to_cents_integer( bill.balance_owed ); + if ( bo > total ) { + bill.textbox.value = cents_as_dollars( total ); + total = 0; + } else { + bill.textbox.value = cents_as_dollars( bo ); + total = total - bo; + } } else { - bill.textbox.value = cents_as_dollars( bo ); - total = total - bo; + bill.textbox.value = '0.00'; } } p.update_payment_applied(); @@ -161,7 +165,16 @@ function patron_bills_list_box_init( p ) { ]; p.list_box = list_box_init( { 'w' : p.w, 'node' : p.node, 'cols' : p.patron_bills_cols, 'debug' : p.app } ); - p.clear_patron_bills = function () { p.current_payments = []; p.list_box.clear_rows(); }; + p.clear_patron_bills = function () { + p.current_payments = []; + p.control_box.bill_total_owed.value = 'Calculating...'; + p.control_box.bill_payment_amount.value = ''; + p.control_box.bill_payment_applied.value = '0.00'; + p.control_box.bill_change_amount.value = '0.00'; + p.control_box.bill_credit_amount.value = '0.00'; + p.control_box.bill_new_balance.value = 'Calculating...'; + p.list_box.clear_rows(); + }; p.add_patron_bills = function (bills) { sdump('D_PATRON_BILLS','p.add_patron_bills(' + bills + ')\n'); return patron_bills_add_patron_bills(p,bills); @@ -172,7 +185,9 @@ function patron_bills_add_patron_bills(p, bills) { sdump('D_PATRON_BILLS',arg_dump(arguments,{1:true})); p.control_box.bill_total_owed.setAttribute('value',get_bills_total( bills )); + p.control_box.bill_total_owed.value = get_bills_total( bills ); p.control_box.bill_new_balance.setAttribute('value',get_bills_total( bills )); + p.control_box.bill_new_balance.value = get_bills_total( bills ); function xact_dates_box( mbts ) { var grid = p.w.document.createElement('grid'); diff --git a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display_overlay.xul index 99a57a7107..844fec0eeb 100755 --- a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display_overlay.xul +++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display_overlay.xul @@ -134,7 +134,7 @@