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

Merge pull request #1329 from prashant-webkul/development 

Fixed issue #1324
This commit is contained in:
Jitendra Singh 2019-08-21 11:37:29 +05:30 committed by GitHub
parent 77f36c00dd ec89315b42
commit 91b54d36f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -256,7 +256,6 @@
},
mounted () {
console.log(this.conditions)
channels = @json($catalog_rule[5]->channels);
this.channels = [];
@ -342,8 +341,6 @@
}
this.attribute_values[index].type = this.attribute_input[i].type;
debugger
}
}
},
@ -367,12 +364,12 @@
},
onSubmit: function (e) {
if (this.attribute_values.length > 0 || this.category_values.length > 0) {
if (this.attribute_values != null || this.category_values != null) {
for (i in this.attribute_values) {
delete this.attribute_values[i].options;
}
if (this.category_values.length > 0) {
if (this.category_values != null) {
this.all_attributes.categories = this.category_values;
}

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

@ -116,7 +116,7 @@ class CartRuleController extends Controller
*/
public function store()
{
$validated = $this->validate(request(), [
$this->validate(request(), [
'name' => 'required|string|unique:cart_rules,name',
'description' => 'string',
'customer_groups' => 'required|array',