[open-ils-commits] r10943 - in trunk/Open-ILS/xul/staff_client/server: circ locale/en-US

[svn at svn.open-ils.org]

Author: phasefx
Date: 2008-10-28 17:36:09 -0400 (Tue, 28 Oct 2008)
New Revision: 10943

Modified:
   trunk/Open-ILS/xul/staff_client/server/circ/checkout.js
   trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
Log:
Handle the rental/deposit events during checkout.  This doesn't yet update the patron sidebar or an already loaded billing interface

Modified: trunk/Open-ILS/xul/staff_client/server/circ/checkout.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/checkout.js	2008-10-28 19:41:02 UTC (rev 10942)
+++ trunk/Open-ILS/xul/staff_client/server/circ/checkout.js	2008-10-28 21:36:09 UTC (rev 10943)
@@ -561,6 +561,8 @@
 						1212 /* PATRON_EXCEEDS_OVERDUE_COUNT */,
 						1213 /* PATRON_BARRED */,
 						1215 /* CIRC_EXCEEDS_COPY_RANGE */,
+                        1232 /* ITEM_DEPOSIT_REQUIRED */,
+                        1233 /* ITEM_RENTAL_FEE_REQUIRED */,
 						7002 /* PATRON_EXCEEDS_CHECKOUT_COUNT */,
 						7003 /* COPY_CIRC_NOT_ALLOWED */,
 						7004 /* COPY_NOT_AVAILABLE */, 
@@ -570,11 +572,14 @@
 						7013 /* PATRON_EXCEEDS_FINES */
 					],
 					'text' : {
+                        '1232' : function(r) {
+                            return document.getElementById('circStrings').getString('staff.circ.checkout.override.item_deposit_required.warning');
+                        },
+                        '1233' : function(r) {
+                            return document.getElementById('circStrings').getString('staff.circ.checkout.override.item_rental_fee_required.warning');
+                        },
 						'7004' : function(r) {
-							//return obj.data.hash.ccs[ r.payload ].name();
 							return r.payload.status().name();
-							//return r.payload.name();
-							//return r.payload;
 						},
 						'7010' : function(r) {
 							return r.payload;
@@ -713,6 +718,8 @@
 								document.getElementById('circStrings').getString('staff.circ.confirm.msg')
 							);
 						break;
+						case 1232 /* ITEM_DEPOSIT_REQUIRED */ :
+						case 1233 /* ITEM_RENTAL_FEE_REQUIRED */ :
 						case 7013 /* PATRON_EXCEEDS_FINES */ :
 							found_handled = true;
 						break;

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	2008-10-28 19:41:02 UTC (rev 10942)
+++ trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties	2008-10-28 21:36:09 UTC (rev 10943)
@@ -42,6 +42,8 @@
 staff.circ.checkout.barcode.pending=%1$s checkout pending...
 staff.circ.checkout.barcode.failed.alert=Check Out Failed %1$s
 staff.circ.checkout.override.confirm=Override Checkout Failure?
+staff.circ.checkout.override.item_deposit_required.warning=A billing for an Item Deposit will be added to the patron's account if this action is overrided.
+staff.circ.checkout.override.item_rental_fee_required.warning=A billing for an Item Rental Fee will be added to the patron's account if this action is overrided.
 staff.circ.checkout.not_cataloged.confirm=Mis-scan or non-cataloged item.  Checkout as a pre-cataloged item?
 staff.circ.pre_cataloged=Pre-cataloged
 staff.circ.non_cataloged=Non-cataloged