merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1409 from prashant-webkul/development 

Fixes in checking json data of attribute conditions on server side
This commit is contained in:
Jitendra Singh 2019-09-06 18:50:47 +05:30 committed by GitHub
parent 449f50ebfc 557a5b0143
commit bb602ba9b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php
View File

@ -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'] = [