From e0dad565ab372d567bad77da8ddc5de624081975 Mon Sep 17 00:00:00 2001
From: Steven Callender <stevecallender@esilibrary.com>
Date: Thu, 1 Mar 2012 19:05:57 +0000
Subject: [PATCH] Configue credit card processing to default to the recording
 setting.

Signed-off-by: Steven Callender <stevecallender@esilibrary.com>
---
 Open-ILS/web/opac/common/js/opac_utils.js                | 2 +-
 Open-ILS/xul/staff_client/server/patron/bill_cc_info.xul | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Open-ILS/web/opac/common/js/opac_utils.js b/Open-ILS/web/opac/common/js/opac_utils.js
index b699f46fc1..702ea0c02d 100644
--- a/Open-ILS/web/opac/common/js/opac_utils.js
+++ b/Open-ILS/web/opac/common/js/opac_utils.js
@@ -730,7 +730,7 @@ function doLogin(suppressEvents) {
 		org		: getOrigLocation()
 	};
 
-    r = fetchOrgSettingDefault(globalOrgTree.id(), 'opac.barcode_regex');
+    r = fetchOrgSettingDefault(getLocation(), 'opac.barcode_regex');
     if(r) REGEX_BARCODE = new RegExp(r);
     
     if( uname.match(REGEX_BARCODE) ) args.barcode = uname;
diff --git a/Open-ILS/xul/staff_client/server/patron/bill_cc_info.xul b/Open-ILS/xul/staff_client/server/patron/bill_cc_info.xul
index ec8aa4a761..ab18dbd30d 100644
--- a/Open-ILS/xul/staff_client/server/patron/bill_cc_info.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bill_cc_info.xul
@@ -173,7 +173,7 @@
                     <menulist id="where_process" oncommand="refresh_fields();">
                         <menupopup>
                             <menuitem label="&staff.patron.bill_cc_info.process_int.label;" value="1"/>
-                            <menuitem label="&staff.patron.bill_cc_info.process_ext.label;" value="2"/>
+                            <menuitem label="&staff.patron.bill_cc_info.process_ext.label;" value="2" selected="true"/>
                         </menupopup>
                     </menulist>
                 </row>
-- 
2.11.0