[open-ils-commits] r13920 - in trunk/Open-ILS/xul/staff_client/server: circ locale/en-US (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2009-08-23 23:04:23 -0400 (Sun, 23 Aug 2009)
New Revision: 13920

Modified:
   trunk/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul
   trunk/Open-ILS/xul/staff_client/server/circ/util.js
   trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
Log:
in checkin interface, keep a running tally of fines/bills encountered

Modified: trunk/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul	2009-08-21 19:53:35 UTC (rev 13919)
+++ trunk/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul	2009-08-24 03:04:23 UTC (rev 13920)
@@ -97,6 +97,7 @@
 			</menu>
 			</menubar>
 		</hbox>
+        <label id="fine_tally" value="" amount="0.00" style="color: red" hidden="true" />
 	</vbox>
 
 </hbox>

Modified: trunk/Open-ILS/xul/staff_client/server/circ/util.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/util.js	2009-08-21 19:53:35 UTC (rev 13919)
+++ trunk/Open-ILS/xul/staff_client/server/circ/util.js	2009-08-24 03:04:23 UTC (rev 13920)
@@ -2079,9 +2079,21 @@
 				if (Number(bill.balance_owed()) == 0) { return; }
 				if (document.getElementById('no_change_label')) {
 					var m = document.getElementById('no_change_label').getAttribute('value');
-					document.getElementById('no_change_label').setAttribute('value', m + document.getElementById('circStrings').getFormattedString('staff.circ.utils.billable.amount', [params.barcode, util.money.sanitize(bill.balance_owed())]) + '  ');
+					document.getElementById('no_change_label').setAttribute(
+                        'value', 
+                        m + document.getElementById('circStrings').getFormattedString('staff.circ.utils.billable.amount', [params.barcode, util.money.sanitize(bill.balance_owed())]) + '  '
+                    );
 					document.getElementById('no_change_label').setAttribute('hidden','false');
 				}
+				if (document.getElementById('fine_tally')) {
+					var amount = Number( document.getElementById('fine_tally').getAttribute('amount') ) + Number( bill.balance_owed() );
+                    document.getElementById('fine_tally').setAttribute('amount',amount);
+                    document.getElementById('fine_tally').setAttribute(
+                        'value',
+                        document.getElementById('circStrings').getFormattedString('staff.circ.utils.fine_tally_text', [ util.money.sanitize( amount ) ])
+                    );
+					document.getElementById('fine_tally').setAttribute('hidden','false');
+                }
 			});
 		}
 

Modified: trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties	2009-08-21 19:53:35 UTC (rev 13919)
+++ trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties	2009-08-24 03:04:23 UTC (rev 13920)
@@ -283,6 +283,7 @@
 staff.circ.utils.checkin.override=Override Checkin Failure?
 staff.circ.utils.checkin.override.item_deposit_paid.warning=A paid deposit will be owed to this patron if this action is overrided.
 staff.circ.utils.billable.amount=Transaction for %1$s billable $%2$s
+staff.circ.utils.fine_tally_text=Fine Tally: $%1$s
 staff.circ.utils.transit_hold_cancelled=Original hold for transit cancelled.
 staff.circ.utils.item_checked_in=%1$s was already checked in.
 staff.circ.utils.item_not_cataloged=ITEM_NOT_CATALOGED event but copy status is %1$s