From 3288ec69b60346cfe00bf9bc15ee0016432c0d63 Mon Sep 17 00:00:00 2001 From: phasefx Date: Tue, 10 Jul 2007 03:43:28 +0000 Subject: [PATCH] fixes a regression for check/credit card payments git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_2@7536 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/xul/staff_client/server/patron/bills.js | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/Open-ILS/xul/staff_client/server/patron/bills.js b/Open-ILS/xul/staff_client/server/patron/bills.js index 8b8ef0d0c4..3e65411c05 100644 --- a/Open-ILS/xul/staff_client/server/patron/bills.js +++ b/Open-ILS/xul/staff_client/server/patron/bills.js @@ -455,29 +455,31 @@ patron.bills.prototype = { 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 -- 2.11.0