strict barcode toggle

git-svn-id: svn://svn.open-ils.org/ILS/trunk@6525 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/xul/staff_client/server/circ/checkin.js b/Open-ILS/xul/staff_client/server/circ/checkin.js
index 3482f03..1c07a94 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/checkin.js
+++ b/Open-ILS/xul/staff_client/server/circ/checkin.js
@@ -280,6 +280,8 @@ circ.checkin.prototype = {
 
        'test_barcode' : function(bc) {
                var obj = this;
+               var x = document.getElementById('strict_barcode');
+               if (x && x.checked != true) return true;
                var good = util.barcode.check(bc);
                if (good) {
                        return true;

diff --git a/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul b/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul
index ea6eb91..65c0212 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/circ/checkin_overlay.xul
@@ -106,6 +106,7 @@
                command="cmd_checkin_export"
                accesskey=""/>
        <checkbox id="trim_list" label="Trim List (20 rows)" checked="true" persist="checked"/> 
+       <checkbox id="strict_barcode" label="Strict Barcode" checked="false" persist="checked"/> 
        <checkbox id="do_not_alert_on_precat" label="Don't Alert on Pre-Cat" persist="checked"/> 
        <spacer id="pcii3s" flex="1"/>
        <checkbox id="checkin_auto" label="Auto-Print for Hold/Transit Slips" accesskey="P" persist="checked"/> 

diff --git a/Open-ILS/xul/staff_client/server/circ/checkout.js b/Open-ILS/xul/staff_client/server/circ/checkout.js
index b022a44..3aa1b79 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/checkout.js
+++ b/Open-ILS/xul/staff_client/server/circ/checkout.js
@@ -448,6 +448,8 @@ circ.checkout.prototype = {
 
        'test_barcode' : function(bc) {
                var obj = this;
+               var x = document.getElementById('strict_barcode');
+               if (x && x.checked != true) return true;
                var good = util.barcode.check(bc);
                if (good) {
                        return true;

diff --git a/Open-ILS/xul/staff_client/server/circ/checkout_overlay.xul b/Open-ILS/xul/staff_client/server/circ/checkout_overlay.xul
index 46406b2..aa2e79d 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/checkout_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/circ/checkout_overlay.xul
@@ -63,6 +63,7 @@
                accesskey=""/>
        <button id="clip_button" disabled="true" command="sel_clip" label="Copy to Clipboard" />
        <button id="save_col_btn" command="save_columns" label="Save Columns" />
+       <checkbox id="strict_barcode" label="Strict Barcode" checked="false" persist="checked"/> 
        <spacer id="pcii3s" flex="1"/>
        <checkbox id="checkout_auto" persist="checked"
                label="&staff.patron_display.checkout.auto_print_label;" 

diff --git a/Open-ILS/xul/staff_client/server/circ/copy_status.js b/Open-ILS/xul/staff_client/server/circ/copy_status.js
index be642f9..269eaf7 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/copy_status.js
+++ b/Open-ILS/xul/staff_client/server/circ/copy_status.js
@@ -340,6 +340,8 @@ circ.copy_status.prototype = {
        'test_barcode' : function(bc) {
                var obj = this;
                var good = util.barcode.check(bc);
+               var x = document.getElementById('strict_barcode');
+               if (x && x.checked != true) return true;
                if (good) {
                        return true;
                } else {

diff --git a/Open-ILS/xul/staff_client/server/circ/copy_status_overlay.xul b/Open-ILS/xul/staff_client/server/circ/copy_status_overlay.xul
index 5a8b186..133f662 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/copy_status_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/circ/copy_status_overlay.xul
@@ -108,6 +108,7 @@
                command="cmd_copy_status_export"
                accesskey=""/>
        <checkbox id="trim_list" label="Trim List (20 rows)" checked="true" persist="checked"/> 
+       <checkbox id="strict_barcode" label="Strict Barcode" checked="false" persist="checked"/> 
        <spacer flex="1"/>
 </hbox>
 

diff --git a/Open-ILS/xul/staff_client/server/circ/in_house_use.js b/Open-ILS/xul/staff_client/server/circ/in_house_use.js
index 435ab23..763888b 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/in_house_use.js
+++ b/Open-ILS/xul/staff_client/server/circ/in_house_use.js
@@ -217,6 +217,8 @@ circ.in_house_use.prototype = {
        'test_barcode' : function(bc) {
                var obj = this;
                var good = util.barcode.check(bc);
+               var x = document.getElementById('strict_barcode');
+               if (x && x.checked != true) return true;
                if (good) {
                        return true;
                } else {

diff --git a/Open-ILS/xul/staff_client/server/circ/in_house_use.xul b/Open-ILS/xul/staff_client/server/circ/in_house_use.xul
index 710eeee..b6907dc 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/in_house_use.xul
+++ b/Open-ILS/xul/staff_client/server/circ/in_house_use.xul
@@ -109,6 +109,7 @@
                        command="cmd_in_house_use_export"
                        accesskey=""/>
                <checkbox id="trim_list" label="Trim List (20 rows)" checked="true" persist="checked"/> 
+               <checkbox id="strict_barcode" label="Strict Barcode" checked="false" persist="checked"/> 
                <spacer id="pcii3s" flex="1"/>
                <button id="clip_button" disabled="true" command="sel_clip" label="Copy to Clipboard" />
                <button id="save_cols_btn" command="save_columns" label="Save Columns" />