From 557a5b01439a9f9cc74020d0fe9ae3bfd6f36169 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Fri, 6 Sep 2019 18:49:07 +0530 Subject: [PATCH] Fixes in checking json data of attribute conditions on server side --- .../Discount/src/Http/Controllers/CartRuleController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php index ccfc78071..dbb680b12 100644 --- a/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php +++ b/packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php @@ -177,7 +177,7 @@ class CartRuleController extends Controller $attribute_conditions = json_decode($attribute_conditions); - if (! isset($attribute_conditions) || ! (count($attribute_conditions->categories) && count($attribute_conditions->attributes))) { + if (! isset($attribute_conditions) || ! (count($attribute_conditions->categories) || count($attribute_conditions->attributes))) { $data['uses_attribute_conditions'] = 0; $data['actions'] = [ @@ -405,7 +405,7 @@ class CartRuleController extends Controller // prepare actions from data for json action $attribute_conditions = json_decode($attribute_conditions); - if (! isset($attribute_conditions) || $attribute_conditions == "[]" || $attribute_conditions == "" || ! (count($attribute_conditions->categories) && count($attribute_conditions->attributes))) { + if (! isset($attribute_conditions) || ! (count($attribute_conditions->categories) || count($attribute_conditions->attributes))) { $data['uses_attribute_conditions'] = 0; $data['actions'] = [