Configue credit card processing to default to the recording setting.

Signed-off-by: Steven Callender <stevecallender@esilibrary.com>

diff --git a/Open-ILS/web/opac/common/js/opac_utils.js b/Open-ILS/web/opac/common/js/opac_utils.js
index b699f46..702ea0c 100644 (file)
--- 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 ec8aa4a..ab18dbd 100644 (file)
--- 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>