[open-ils-commits] r7536 - branches/rel_1_2/Open-ILS/xul/staff_client/server/patron

[svn at svn.open-ils.org]

Author: phasefx
Date: 2007-07-09 23:43:28 -0400 (Mon, 09 Jul 2007)
New Revision: 7536

Modified:
   branches/rel_1_2/Open-ILS/xul/staff_client/server/patron/bills.js
Log:
fixes a regression for check/credit card payments

Modified: branches/rel_1_2/Open-ILS/xul/staff_client/server/patron/bills.js
===================================================================
--- branches/rel_1_2/Open-ILS/xul/staff_client/server/patron/bills.js	2007-07-09 17:51:09 UTC (rev 7535)
+++ branches/rel_1_2/Open-ILS/xul/staff_client/server/patron/bills.js	2007-07-10 03:43:28 UTC (rev 7536)
@@ -455,29 +455,31 @@
 				var win = new util.window();
 				switch(obj.controller.view.payment_type.value) {
 					case 'credit_card_payment' :
-						//obj.OpenILS.data.temp = '';
-						//obj.OpenILS.data.stash('temp');
+						obj.OpenILS.data.temp = '';
+						obj.OpenILS.data.stash('temp');
 						var my_xulG = win.open(
 							urls.XUL_PATRON_BILL_CC_INFO,
 							'billccinfo',
 							'chrome,resizable,modal'
 						);
-						//obj.OpenILS.data.stash_retrieve();
-						payment_blob = my_xulG.payment_blob; //JSON2js( obj.OpenILS.data.temp );
+						obj.OpenILS.data.stash_retrieve();
+						//payment_blob = my_xulG.payment_blob; //JSON2js( obj.OpenILS.data.temp );
+						payment_blob = JSON2js( obj.OpenILS.data.temp );
 					break;
 					case 'check_payment' :
-						//obj.OpenILS.data.temp = '';
-						//obj.OpenILS.data.stash('temp');
+						obj.OpenILS.data.temp = '';
+						obj.OpenILS.data.stash('temp');
 						var my_xulG = win.open(
 							urls.XUL_PATRON_BILL_CHECK_INFO,
 							'billcheckinfo',
 							'chrome,resizable,modal'
 						);
-						//obj.OpenILS.data.stash_retrieve();
-						payment_blob = my_xulG.payment_blob; //JSON2js( obj.OpenILS.data.temp );
+						obj.OpenILS.data.stash_retrieve();
+						//payment_blob = my_xulG.payment_blob; //JSON2js( obj.OpenILS.data.temp );
+						payment_blob = JSON2js( obj.OpenILS.data.temp );
 					break;
 				}
-				if (payment_blob=='' || payment_blob.cancelled=='true') { alert('cancelled'); return; }
+				if ((typeof payment_blob == 'undefined') || payment_blob=='' || payment_blob.cancelled=='true') { alert('cancelled'); return; }
 				payment_blob.userid = obj.patron_id;
 				payment_blob.note = payment_blob.note || '';
 				//payment_blob.cash_drawer = 1; // FIXME: get new Config() to work