diff --git a/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php index b9208aefd..a49f35471 100644 --- a/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php +++ b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php @@ -175,7 +175,9 @@ class CartRuleController extends Controller // unset labels unset($data['label']); - $attribute_conditions = json_decode($attribute_conditions); + while (gettype($attribute_conditions) == 'string') { + $attribute_conditions = json_decode($attribute_conditions); + } if (! isset($attribute_conditions) || ! (count($attribute_conditions->categories) || count($attribute_conditions->attributes))) { $data['uses_attribute_conditions'] = 0; @@ -405,6 +407,10 @@ class CartRuleController extends Controller // prepare actions from data for json action $attribute_conditions = json_decode($attribute_conditions); + while (gettype($attribute_conditions) == 'string') { + $attribute_conditions = json_decode($attribute_conditions); + } + if (! isset($attribute_conditions) || ! (count($attribute_conditions->categories) || count($attribute_conditions->attributes))) { $data['uses_attribute_conditions'] = 0; diff --git a/packages/Webkul/Shop/src/Resources/assets/js/app.js b/packages/Webkul/Shop/src/Resources/assets/js/app.js index 6f47555f0..a66ae2286 100755 --- a/packages/Webkul/Shop/src/Resources/assets/js/app.js +++ b/packages/Webkul/Shop/src/Resources/assets/js/app.js @@ -14,7 +14,6 @@ Vue.component("image-slider", require("./components/image-slider.vue")); Vue.component("vue-slider", require("vue-slider-component")); $(document).ready(function () { - const app = new Vue({ el: "#app",