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

Fixed issue #1288

This commit is contained in:
Prashant Singh 2019-09-12 15:23:29 +05:30
parent d5bbc0230d
commit 2c928ea25c
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;

1
packages/Webkul/Shop/src/Resources/assets/js/app.js vendored
View File

@ -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",