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

Merge pull request #1429 from prashant-webkul/development 

Development
This commit is contained in:
Jitendra Singh 2019-09-10 12:45:16 +05:30 committed by GitHub
parent 565452954b 6c03f824ec
commit a33a47753d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php
View File

@ -20,7 +20,7 @@
<div class="page-action">
<button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.catalog.categories.-btn-title') }}
{{ __('admin::app.catalog.categories-btn-title') }}
</button>
</div>
</div>

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

@ -377,13 +377,14 @@
this.all_attributes.categories = this.category_values;
}
this.all_attributes.attributes = this.attribute_values;
if (this.attribute_values.length > 0) {
this.all_attributes.attributes = this.attribute_values;
}
this.all_conditions = JSON.stringify(this.all_attributes);
} else {
this.all_conditions = null;
}
this.all_conditions = JSON.stringify(this.all_attributes);
// this.all_conditions = JSON.stringify(this.conditions_list);
// if (this.conditions_list.length != 0) {

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

@ -235,8 +235,8 @@
all_conditions: [],
all_attributes: {
'categories' : null,
'attributes' : null
'categories' : [],
'attributes' : []
},
criteria: 'cart',
@ -365,12 +365,12 @@
},
onSubmit: function (e) {
if (this.attribute_values != null || this.category_values != null) {
if (this.attribute_values.length > 0 || this.category_values.length > 0) {
for (i in this.attribute_values) {
delete this.attribute_values[i].options;
}
if (this.category_values != null) {
if (this.category_values.length > 0) {
this.all_attributes.categories = this.category_values;
}