From be71b01c17935a5d67cb44b4301188f6422dd66b Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Wed, 5 Feb 2020 11:06:06 +0530 Subject: [PATCH 1/5] Issue #2268 --- packages/Webkul/Ui/src/Resources/lang/ar/app.php | 2 ++ packages/Webkul/Ui/src/Resources/lang/en/app.php | 2 ++ packages/Webkul/Ui/src/Resources/lang/fa/app.php | 2 ++ packages/Webkul/Ui/src/Resources/lang/pt_BR/app.php | 2 ++ .../Webkul/Ui/src/Resources/views/datagrid/table.blade.php | 4 ++-- 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/Webkul/Ui/src/Resources/lang/ar/app.php b/packages/Webkul/Ui/src/Resources/lang/ar/app.php index cabdcd2dc..b28bb2410 100644 --- a/packages/Webkul/Ui/src/Resources/lang/ar/app.php +++ b/packages/Webkul/Ui/src/Resources/lang/ar/app.php @@ -15,5 +15,7 @@ return [ 'filter-fields-missing' => 'بعض الحقل المطلوب هو لاغ ، رجاء تفقد عمود ، حالة و قيمة صحيح', 'click_on_action' => 'هل تريد حقا أن تؤدي هذا العمل؟', 'items-per-page' => 'Items Per Page', + 'value-here' => 'Value here', + 'numeric-value-here' => 'Numeric Value here' ] ]; \ No newline at end of file diff --git a/packages/Webkul/Ui/src/Resources/lang/en/app.php b/packages/Webkul/Ui/src/Resources/lang/en/app.php index 4978f92fe..6e7acb756 100755 --- a/packages/Webkul/Ui/src/Resources/lang/en/app.php +++ b/packages/Webkul/Ui/src/Resources/lang/en/app.php @@ -37,5 +37,7 @@ return [ 'between' => 'Is between', 'apply' => 'Apply', 'items-per-page' => 'Items Per Page', + 'value-here' => 'Value here', + 'numeric-value-here' => 'Numeric Value here' ] ]; \ No newline at end of file diff --git a/packages/Webkul/Ui/src/Resources/lang/fa/app.php b/packages/Webkul/Ui/src/Resources/lang/fa/app.php index c57e87487..01228547e 100644 --- a/packages/Webkul/Ui/src/Resources/lang/fa/app.php +++ b/packages/Webkul/Ui/src/Resources/lang/fa/app.php @@ -33,5 +33,7 @@ return [ 'between' => 'ما بین', 'apply' => 'درخواست', 'items-per-page' => 'Items Per Page', + 'value-here' => 'Value here', + 'numeric-value-here' => 'Numeric Value here' ] ]; diff --git a/packages/Webkul/Ui/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Ui/src/Resources/lang/pt_BR/app.php index 46d1f3517..e5a2a456a 100755 --- a/packages/Webkul/Ui/src/Resources/lang/pt_BR/app.php +++ b/packages/Webkul/Ui/src/Resources/lang/pt_BR/app.php @@ -33,5 +33,7 @@ return [ 'between' => 'Está entre', 'apply' => 'Aplicar', 'items-per-page' => 'Items Per Page', + 'value-here' => 'Value here', + 'numeric-value-here' => 'Numeric Value here' ] ]; \ No newline at end of file diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php index cfec25965..fc44c1860 100644 --- a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php +++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php @@ -58,7 +58,7 @@ {{-- Response fields based on the type of columns to be filtered --}}
  • - +
    • @@ -79,7 +79,7 @@
  • - +
    • From 832e66025eacbbc7a177bda0b45ce3e249bcdd3a Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Wed, 5 Feb 2020 11:14:45 +0530 Subject: [PATCH 2/5] Issue #2270 --- .../Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php index 4f3698690..77ae624de 100755 --- a/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php @@ -28,7 +28,7 @@ class CustomerGroupDataGrid extends DataGrid { $this->addColumn([ 'index' => 'id', - 'label' => 'ID', + 'label' => trans('admin::app.datagrid.id'), 'type' => 'number', 'searchable' => false, 'sortable' => true, @@ -37,7 +37,7 @@ class CustomerGroupDataGrid extends DataGrid $this->addColumn([ 'index' => 'code', - 'label' => 'Code', + 'label' => trans('admin::app.datagrid.code'), 'type' => 'string', 'searchable' => false, 'sortable' => true, @@ -46,7 +46,7 @@ class CustomerGroupDataGrid extends DataGrid $this->addColumn([ 'index' => 'name', - 'label' => 'Name', + 'label' => trans('admin::app.datagrid.name'), 'type' => 'string', 'searchable' => true, 'sortable' => true, From 1b5b47fc8037149ba2e1d6809166413c8b9a8694 Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Wed, 5 Feb 2020 11:29:57 +0530 Subject: [PATCH 3/5] Issue #2269 --- packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php | 2 +- packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php | 2 +- packages/Webkul/Admin/src/DataGrids/CMSPageDataGrid.php | 2 +- packages/Webkul/Admin/src/DataGrids/CouponsDataGrid.php | 2 +- packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php | 4 ++-- .../Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php | 4 ++-- packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php | 4 ++-- packages/Webkul/Admin/src/Resources/lang/ar/app.php | 1 + packages/Webkul/Admin/src/Resources/lang/en/app.php | 1 + packages/Webkul/Admin/src/Resources/lang/fa/app.php | 1 + packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php | 1 + packages/Webkul/Velocity/src/DataGrids/CategoryDataGrid.php | 4 ++-- packages/Webkul/Velocity/src/DataGrids/ContentDataGrid.php | 2 +- 13 files changed, 17 insertions(+), 13 deletions(-) diff --git a/packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php index f397ee46e..3d3e6132e 100644 --- a/packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php @@ -170,7 +170,7 @@ class AddressDataGrid extends DataGrid public function prepareMassActions() { $this->addMassAction([ - 'type' => 'delete', + 'type' => trans('admin::app.datagrid.delete'), 'label' => trans('admin::app.customers.addresses.delete'), 'action' => route('admin.customer.addresses.massdelete', request('id')), 'method' => 'DELETE' diff --git a/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php index 1ab36e2a4..05ff46cc3 100755 --- a/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php @@ -146,7 +146,7 @@ class AttributeDataGrid extends DataGrid $this->addMassAction([ 'type' => 'delete', 'action' => route('admin.catalog.attributes.massdelete'), - 'label' => 'Delete', + 'label' => trans('admin::app.datagrid.delete'), 'index' => 'admin_name', 'method' => 'DELETE' ]); diff --git a/packages/Webkul/Admin/src/DataGrids/CMSPageDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CMSPageDataGrid.php index 735ccf22e..e2f6f61f1 100644 --- a/packages/Webkul/Admin/src/DataGrids/CMSPageDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CMSPageDataGrid.php @@ -81,7 +81,7 @@ class CMSPageDataGrid extends DataGrid { $this->addMassAction([ 'type' => 'delete', - 'label' => 'Delete', + 'label' => trans('admin::app.datagrid.delete'), 'action' => route('admin.cms.mass-delete'), 'method' => 'DELETE' ]); diff --git a/packages/Webkul/Admin/src/DataGrids/CouponsDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CouponsDataGrid.php index 464e1090a..ea6c4b026 100644 --- a/packages/Webkul/Admin/src/DataGrids/CouponsDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CouponsDataGrid.php @@ -89,7 +89,7 @@ class CartRuleCouponsDataGrid extends DataGrid // $this->addMassAction([ // 'type' => 'delete', // 'action' => route('admin.catalog.attributes.massdelete'), - // 'label' => 'Delete', + // 'label' => trans('admin::app.datagrid.delete'), // 'method' => 'DELETE' // ]); } diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php index a8b501d27..44873e557 100755 --- a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php @@ -161,14 +161,14 @@ class CustomerDataGrid extends DataGrid { $this->addMassAction([ 'type' => 'delete', - 'label' => 'Delete', + 'label' => trans('admin::app.datagrid.delete'), 'action' => route('admin.customer.mass-delete'), 'method' => 'PUT', ]); $this->addMassAction([ 'type' => 'update', - 'label' => 'Update Status', + 'label' => trans('admin::app.datagrid.update-status'), 'action' => route('admin.customer.mass-update'), 'method' => 'PUT', 'options' => [ diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php index 6fe1cc2f5..c5d71b4a1 100755 --- a/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php @@ -109,14 +109,14 @@ class CustomerReviewDataGrid extends DataGrid public function prepareMassActions() { $this->addMassAction([ 'type' => 'delete', - 'label' => 'Delete', + 'label' => trans('admin::app.datagrid.delete'), 'action' => route('admin.customer.review.massdelete'), 'method' => 'DELETE' ]); $this->addMassAction([ 'type' => 'update', - 'label' => 'Update Status', + 'label' => trans('admin::app.datagrid.update-status'), 'action' => route('admin.customer.review.massupdate'), 'method' => 'PUT', 'options' => [ diff --git a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php index 04d81be0f..b4bcf4413 100644 --- a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php @@ -180,14 +180,14 @@ class ProductDataGrid extends DataGrid public function prepareMassActions() { $this->addMassAction([ 'type' => 'delete', - 'label' => 'Delete', + 'label' => trans('admin::app.datagrid.delete'), 'action' => route('admin.catalog.products.massdelete'), 'method' => 'DELETE' ]); $this->addMassAction([ 'type' => 'update', - 'label' => 'Update Status', + 'label' => trans('admin::app.datagrid.update-status'), 'action' => route('admin.catalog.products.massupdate'), 'method' => 'PUT', 'options' => [ diff --git a/packages/Webkul/Admin/src/Resources/lang/ar/app.php b/packages/Webkul/Admin/src/Resources/lang/ar/app.php index f08c39d6e..43d916fae 100644 --- a/packages/Webkul/Admin/src/Resources/lang/ar/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/ar/app.php @@ -153,6 +153,7 @@ return [ 'refunded' => 'Refunded', 'rtl' => 'RTL', 'ltr' => 'LTR', + 'update-status' => 'Update Status' ], 'account' => [ diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index e745bfc5c..5ec8b1dbf 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -216,6 +216,7 @@ return [ 'delete' => 'Delete', 'rtl' => 'RTL', 'ltr' => 'LTR', + 'update-status' => 'Update Status' ], 'account' => [ diff --git a/packages/Webkul/Admin/src/Resources/lang/fa/app.php b/packages/Webkul/Admin/src/Resources/lang/fa/app.php index db6b8c70a..0e24d3a3b 100644 --- a/packages/Webkul/Admin/src/Resources/lang/fa/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/fa/app.php @@ -170,6 +170,7 @@ return [ 'refunded' => 'Refunded', 'rtl' => 'RTL', 'ltr' => 'LTR', + 'update-status' => 'Update Status' ], 'account' => [ diff --git a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php index d1d98d358..8a2703ebb 100755 --- a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php @@ -158,6 +158,7 @@ return [ 'refunded' => 'Refunded', 'rtl' => 'RTL', 'ltr' => 'LTR', + 'update-status' => 'Update Status' ], 'account' => [ 'title' => 'Minha Conta', diff --git a/packages/Webkul/Velocity/src/DataGrids/CategoryDataGrid.php b/packages/Webkul/Velocity/src/DataGrids/CategoryDataGrid.php index 09a48ed6d..c7f990133 100644 --- a/packages/Webkul/Velocity/src/DataGrids/CategoryDataGrid.php +++ b/packages/Webkul/Velocity/src/DataGrids/CategoryDataGrid.php @@ -20,7 +20,7 @@ class CategoryDataGrid extends DataGrid public function prepareQueryBuilder() { $defaultChannel = core()->getCurrentChannel(); - + $queryBuilder = DB::table('velocity_category as v_cat') ->select('v_cat.id as category_menu_id', 'v_cat.category_id', 'ct.name', 'v_cat.icon', 'v_cat.tooltip', 'v_cat.status') ->leftJoin('categories as c', 'c.id', '=', 'v_cat.category_id') @@ -109,7 +109,7 @@ class CategoryDataGrid extends DataGrid $this->addMassAction([ 'type' => 'delete', 'action' => route('velocity.admin.category.mass-delete'), - 'label' => 'Delete', + 'label' => trans('admin::app.datagrid.delete'), 'method' => 'DELETE' ]); } diff --git a/packages/Webkul/Velocity/src/DataGrids/ContentDataGrid.php b/packages/Webkul/Velocity/src/DataGrids/ContentDataGrid.php index 5ddfb8be9..66fe0ef38 100644 --- a/packages/Webkul/Velocity/src/DataGrids/ContentDataGrid.php +++ b/packages/Webkul/Velocity/src/DataGrids/ContentDataGrid.php @@ -116,7 +116,7 @@ class ContentDataGrid extends DataGrid $this->addMassAction([ 'type' => 'delete', 'action' => route('velocity.admin.content.mass-delete'), - 'label' => 'Delete', + 'label' => trans('admin::app.datagrid.delete'), 'method' => 'DELETE' ]); } From a2d642f35d57f22a74d14e123f54bb7863dac459 Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Wed, 5 Feb 2020 11:32:29 +0530 Subject: [PATCH 4/5] revert tpye --- packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php index 3d3e6132e..f397ee46e 100644 --- a/packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/AddressDataGrid.php @@ -170,7 +170,7 @@ class AddressDataGrid extends DataGrid public function prepareMassActions() { $this->addMassAction([ - 'type' => trans('admin::app.datagrid.delete'), + 'type' => 'delete', 'label' => trans('admin::app.customers.addresses.delete'), 'action' => route('admin.customer.addresses.massdelete', request('id')), 'method' => 'DELETE' From ff37467e7051874097d60c4eb9607e666f80306b Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Wed, 5 Feb 2020 12:06:16 +0530 Subject: [PATCH 5/5] Issue #2239 --- .../src/Resources/views/settings/channels/create.blade.php | 6 ++++-- .../src/Resources/views/settings/channels/edit.blade.php | 6 ++++-- .../Webkul/Core/src/Http/Controllers/ChannelController.php | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php index 98c2017f7..8a5ec16ec 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php @@ -74,9 +74,11 @@ @{{ errors.first('root_category_id') }} -
    +
    - + + + @{{ errors.first('hostname') }}
    diff --git a/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php index fa396d596..f567a6660 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php @@ -78,9 +78,11 @@ @{{ errors.first('root_category_id') }} -
    +
    - + + + @{{ errors.first('hostname') }}
    diff --git a/packages/Webkul/Core/src/Http/Controllers/ChannelController.php b/packages/Webkul/Core/src/Http/Controllers/ChannelController.php index 2c313a072..49299e30c 100755 --- a/packages/Webkul/Core/src/Http/Controllers/ChannelController.php +++ b/packages/Webkul/Core/src/Http/Controllers/ChannelController.php @@ -79,7 +79,8 @@ class ChannelController extends Controller 'favicon.*' => 'mimes:jpeg,jpg,bmp,png', 'seo_title' => 'required|string', 'seo_description' => 'required|string', - 'seo_keywords' => 'required|string' + 'seo_keywords' => 'required|string', + 'hostname' => 'unique:channels,hostname', ]); $data = request()->all(); @@ -138,7 +139,8 @@ class ChannelController extends Controller 'base_currency_id' => 'required', 'root_category_id' => 'required', 'logo.*' => 'mimes:jpeg,jpg,bmp,png', - 'favicon.*' => 'mimes:jpeg,jpg,bmp,png' + 'favicon.*' => 'mimes:jpeg,jpg,bmp,png', + 'hostname' => 'unique:channels,hostname,' . $id, ]); $data = request()->all();