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

Merge pull request #1330 from prashant-webkul/development 

Fixed issue with category or attribute field left empty
This commit is contained in:
Jitendra Singh 2019-08-21 12:22:03 +05:30 committed by GitHub
parent 91b54d36f5 3c9ae5b35d
commit 0ce9b8497e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/src/DataGrids/CMSPageDataGrid.php
View File

@ -60,7 +60,7 @@ class CMSPageDataGrid extends DataGrid
$this->addColumn([
'index' => 'locale_id',
'label' => trans('admin::app.cms.pages.locale'),
'type' => 'string',
'type' => 'number',
'searchable' => false,
'sortable' => true,
'filterable' => true,

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

@ -598,12 +598,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/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php
View File

@ -684,7 +684,7 @@
},
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;
}