From 3c9ae5b35d9cd1193d97a1ef9ca9ec95404583af Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Wed, 21 Aug 2019 12:19:53 +0530 Subject: [PATCH] Fixed issue with category or attribute field left empty --- packages/Webkul/Admin/src/DataGrids/CMSPageDataGrid.php | 2 +- .../src/Resources/views/promotions/cart-rule/create.blade.php | 4 ++-- .../src/Resources/views/promotions/cart-rule/edit.blade.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/Webkul/Admin/src/DataGrids/CMSPageDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CMSPageDataGrid.php index 3212e05e5..ebafd957f 100644 --- a/packages/Webkul/Admin/src/DataGrids/CMSPageDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CMSPageDataGrid.php @@ -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, diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php index bd5951eec..7eb736314 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php @@ -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; } diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php index c49279b14..613aa47f8 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php @@ -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; }