fixing syntax error in token form shipping calculation $.inArray function

diff --git a/js/app.js b/js/app.js
index 1d27329..20804b2 100644 (file)
--- a/js/app.js
+++ b/js/app.js
@@ -67,11 +67,11 @@ $(document).ready(function () {
         $("#ginput_quantity_4_39").val( additional_shipping );
 
     });
-   
+    var field_array = [38,39,42,48,49,50,37];
     $(document).on("change, keyup", ".ginput_quantity", function(){
         var qty_total = 0;
         for(var i = 12; i < 36; i++){
-            if( ! $.inArray(38,39,42,48,49,50,37) ){
+            if( !$.inArray(i, field_array ) ){
                 if( $('#ginput_quantity_4_' + i).val() !== undefined && $('#ginput_quantity_4_' + i).val() !== '' ){
                     console.log($('#ginput_quantity_4_' + i).val());
                     qty_total += parseInt($('#ginput_quantity_4_' + i).val(), 10);
@@ -79,22 +79,21 @@ $(document).ready(function () {
             }
         }
         if( qty_total < 5 && qty_total > 0  ){
-            $("#ginput_quantity_4_48").val( 1 );
-            $("#ginput_quantity_4_49").val( 0 );
-            $("#ginput_quantity_4_50").val( 0 );
+            $("#ginput_quantity_4_48").val(1);
+            $("#ginput_quantity_4_49").val(0);
+            $("#ginput_quantity_4_50").val(0);
         } else if( qty_total < 11 && qty_total > 4 ){
-            $("#ginput_quantity_4_48").val( 0 );
-            $("#ginput_quantity_4_49").val( 1 );
-            $("#ginput_quantity_4_50").val( 0 );
+            $("#ginput_quantity_4_48").val(0);
+            $("#ginput_quantity_4_49").val(1);
+            $("#ginput_quantity_4_50").val(0);
         } else if( qty_total < 31 && qty_total > 10  ){
-            $("#ginput_quantity_4_48").val( 0 );
-            $("#ginput_quantity_4_49").val( 0 );
-            $("#ginput_quantity_4_50").val( 1);
+            $("#ginput_quantity_4_48").val(0);
+            $("#ginput_quantity_4_49").val(0);
+            $("#ginput_quantity_4_50").val(1);
         }
         
     });
-     
-    console.log("test");
+
     $(document).on("change, keyup", "#ginput_quantity_4_37", function(){
         $("#ginput_quantity_4_42").val( $(this).val() );
     });

diff --git a/js/custom/pageSetup.js b/js/custom/pageSetup.js
index 7ddc6cc..1a75c88 100644 (file)
--- a/js/custom/pageSetup.js
+++ b/js/custom/pageSetup.js
@@ -58,11 +58,11 @@ $(document).ready(function () {
         $("#ginput_quantity_4_39").val( additional_shipping );
 
     });
-   
+    var field_array = [38,39,42,48,49,50,37];
     $(document).on("change, keyup", ".ginput_quantity", function(){
         var qty_total = 0;
         for(var i = 12; i < 36; i++){
-            if( ! $.inArray(38,39,42,48,49,50,37) ){
+            if( !$.inArray(i, field_array ) ){
                 if( $('#ginput_quantity_4_' + i).val() !== undefined && $('#ginput_quantity_4_' + i).val() !== '' ){
                     console.log($('#ginput_quantity_4_' + i).val());
                     qty_total += parseInt($('#ginput_quantity_4_' + i).val(), 10);
@@ -70,22 +70,21 @@ $(document).ready(function () {
             }
         }
         if( qty_total < 5 && qty_total > 0  ){
-            $("#ginput_quantity_4_48").val( 1 );
-            $("#ginput_quantity_4_49").val( 0 );
-            $("#ginput_quantity_4_50").val( 0 );
+            $("#ginput_quantity_4_48").val(1);
+            $("#ginput_quantity_4_49").val(0);
+            $("#ginput_quantity_4_50").val(0);
         } else if( qty_total < 11 && qty_total > 4 ){
-            $("#ginput_quantity_4_48").val( 0 );
-            $("#ginput_quantity_4_49").val( 1 );
-            $("#ginput_quantity_4_50").val( 0 );
+            $("#ginput_quantity_4_48").val(0);
+            $("#ginput_quantity_4_49").val(1);
+            $("#ginput_quantity_4_50").val(0);
         } else if( qty_total < 31 && qty_total > 10  ){
-            $("#ginput_quantity_4_48").val( 0 );
-            $("#ginput_quantity_4_49").val( 0 );
-            $("#ginput_quantity_4_50").val( 1);
+            $("#ginput_quantity_4_48").val(0);
+            $("#ginput_quantity_4_49").val(0);
+            $("#ginput_quantity_4_50").val(1);
         }
         
     });
-     
-    console.log("test");
+
     $(document).on("change, keyup", "#ginput_quantity_4_37", function(){
         $("#ginput_quantity_4_42").val( $(this).val() );
     });