[open-ils-commits] r7738 - branches/rel_1_2/Open-ILS/xul/staff_client/server/circ

[svn at svn.open-ils.org]

Author: phasefx
Date: 2007-08-29 12:09:09 -0400 (Wed, 29 Aug 2007)
New Revision: 7738

Modified:
   branches/rel_1_2/Open-ILS/xul/staff_client/server/circ/checkout.js
Log:
fix for the bug in the prevent-redundant-barcode-scan feature during checkout, where a failed attempt at a checkout will not allow a re-attempt

Modified: branches/rel_1_2/Open-ILS/xul/staff_client/server/circ/checkout.js
===================================================================
--- branches/rel_1_2/Open-ILS/xul/staff_client/server/circ/checkout.js	2007-08-29 16:02:40 UTC (rev 7737)
+++ branches/rel_1_2/Open-ILS/xul/staff_client/server/circ/checkout.js	2007-08-29 16:09:09 UTC (rev 7738)
@@ -352,9 +352,7 @@
 			function _checkout_callback(req,x) {
 				try {
 
-					if (params.barcode) {
-						delete obj._checkout_pending_hash[ params.barcode ];	
-					}
+					if (params.barcode) { delete obj._checkout_pending_hash[ params.barcode ];	}
 
 					var checkout = req.getResultObject();
 
@@ -592,6 +590,8 @@
 			/* Item not cataloged or barcode mis-scan.  Prompt for pre-cat option */
 			} else {
 			
+				if (params.barcode) { delete obj._checkout_pending_hash[ params.barcode ];	}
+
 				var found_handled = false; var found_not_handled = false; var msg = '';	
 
 				if (test_event(permit,1202 /* ITEM_NOT_CATALOGED */)) {
@@ -776,6 +776,7 @@
 			}
 
 		} catch(E) {
+			if (params.barcode) { delete obj._checkout_pending_hash[ params.barcode ];	}
 			if (typeof E.ilsevent != 'undefined' && E.ilsevent == -1) {
 				obj.error.standard_network_error_alert('Check Out Failed.  If you wish to use the offline interface, in the top menubar select Circulation -> Offline Interface');
 			} else {