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

JSON parsing in cart rule update form fixes

This commit is contained in:
Prashant Singh 2019-09-06 16:58:35 +05:30
parent b1f0416ca0
commit 57f3cbb8af
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php
View File

@ -582,10 +582,10 @@
this.match_criteria = this.conditions_list.pop().criteria;
}
if (JSON.parse(JSON.parse(data.actions).attribute_conditions)) {
this.category_values = JSON.parse(JSON.parse(data.actions).attribute_conditions).categories;
if (JSON.parse(data.actions).attribute_conditions) {
this.category_values = JSON.parse(data.actions).attribute_conditions.categories;
this.attribute_values = JSON.parse(JSON.parse(data.actions).attribute_conditions).attributes;
this.attribute_values = JSON.parse(data.actions).attribute_conditions.attributes;
if (this.category_values == null) {
this.category_values = [];
@ -595,8 +595,6 @@
this.attribute_values = [];
}
console.log(this.category_values);
// creating options and has option param on the frontend
for (i in this.attribute_values) {
for (j in this.attribute_input) {

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) || $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'] = [
@ -192,7 +192,7 @@ class CartRuleController extends Controller
'action_type' => $data['action_type'],
'disc_amount' => $data['disc_amount'],
'disc_quantity' => $data['disc_quantity'],
'attribute_conditions' => $attribute_conditions
'attribute_conditions' => json_encode($attribute_conditions)
];
}