Updated front JS

piatkowski · Jul 24, 2022 · f8117ba · f8117ba
1 parent 6a8084c
commit f8117ba
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/assets/js/wckalkulator.js b/assets/js/wckalkulator.js
@@ -9,7 +9,7 @@
 
         if (wck_ajax_object.hasOwnProperty("_wck_visibility_rules") && wck_ajax_object._wck_visibility_rules !== null) {
             $.each(wck_ajax_object._wck_visibility_rules, function (fieldName, options) {
-                $("[name*='wck[" + fieldName + "]']").hide().closest('tr').hide();
+                $("[name*='wck[" + fieldName + "]']").prop("disabled", true).hide().closest('tr').hide();
                 CV[fieldName] = options;
             });
         }
@@ -64,12 +64,12 @@
                     return state !== false;
                 });
                 if (state === true) {
-                    $("[name*='wck[" + fieldName + "]']").show().closest('tr').show();
+                    $("[name*='wck[" + fieldName + "]']").prop("disabled", false).show().closest('tr').show();
                     return false;
                 }
             });
             if (state !== true) {
-                $("[name*='wck[" + fieldName + "]']").hide().closest('tr').hide();
+                $("[name*='wck[" + fieldName + "]']").prop("disabled", true).hide().closest('tr').hide();
                 return false;
             }
         }

diff --git a/assets/js/wckalkulator.min.js b/assets/js/wckalkulator.min.js
diff --git a/src/Fields/CheckboxgroupField.php b/src/Fields/CheckboxgroupField.php
@@ -63,6 +63,10 @@ public function render_for_product($selected_name = "")
      */
     public function validate($value)
     {
+        if (!$this->is_required() && empty($value)) {
+            return true;
+        }
+
         if (is_array($value)) {
 
             if (((int)$this->data('select_limit') > 0 && count($value) > $this->data('select_limit')) || ($this->is_required() && count($value) === 0)) {

diff --git a/src/FieldsetProduct.php b/src/FieldsetProduct.php
@@ -633,9 +633,9 @@ public function register_extra_input_parameters($field, $input)
                 break;
             case 'checkboxgroup':
                 $input = array_map('floatval', $input);
-                $this->user_input[$name . ':max'] = max($input);
-                $this->user_input[$name . ':min'] = min($input);
-                $this->user_input[$name . ':sum'] = array_sum($input);
+                $this->user_input[$name . ':max'] = count($input) > 0 ? max($input) : 0;
+                $this->user_input[$name . ':min'] = count($input) > 0 ? min($input) : 0;
+                $this->user_input[$name . ':sum'] = count($input) > 0 ? array_sum($input) : 0;
                 break;
             case 'text':
             case 'textarea':