From 8dec3cdd14ee0d32eff29e56b3bc9953f839f33e Mon Sep 17 00:00:00 2001 From: Annika Wolff Date: Fri, 24 Jul 2020 15:04:20 +0200 Subject: [PATCH] show filtered channels, locales and customer groups by name --- package.json | 2 +- .../Admin/src/DataGrids/CartRuleDataGrid.php | 6 ++ .../Admin/src/DataGrids/ProductDataGrid.php | 14 ++-- .../Admin/src/DataGrids/SliderDataGrid.php | 6 ++ .../views/catalog/products/index.blade.php | 33 -------- .../promotions/cart-rules/index.blade.php | 32 ------- .../views/settings/sliders/index.blade.php | 35 -------- packages/Webkul/Ui/src/DataGrid/DataGrid.php | 31 +++++-- .../Resources/views/datagrid/table.blade.php | 84 +++++++++++++++++-- 9 files changed, 122 insertions(+), 121 deletions(-) diff --git a/package.json b/package.json index cf99f33f7..ea372d68a 100755 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "cross-env": "^5.1", "jquery": "^3.2", "laravel-mix": "^5.0.1", - "lodash": "^4.17.4", + "lodash": "^4.17.19", "popper.js": "^1.12", "resolve-url-loader": "^3.1.0", "sass": "^1.24.5", diff --git a/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php index 830591f6b..a2a7cc12d 100644 --- a/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php @@ -15,6 +15,12 @@ class CartRuleDataGrid extends DataGrid protected $channel = 'all'; + /** @var string[] contains the keys for which extra filters to show */ + protected $extraFilters = [ + 'channels', + 'customer_groups', + ]; + public function __construct() { parent::__construct(); diff --git a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php index 434020623..57c65fc4d 100644 --- a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php @@ -17,6 +17,12 @@ class ProductDataGrid extends DataGrid protected $channel = 'all'; + /** @var string[] contains the keys for which extra filters to render */ + protected $extraFilters = [ + 'channels', + 'locales', + ]; + public function __construct() { parent::__construct(); @@ -44,15 +50,11 @@ class ProductDataGrid extends DataGrid ); if ($this->locale !== 'all') { - $queryBuilder->where('locale', $this->locale); + $queryBuilder->where('product_flat.locale', $this->locale); } if ($this->channel !== 'all') { - $queryBuilder->where('channel', $this->channel); - } - - if ($currentLocale = app()->getLocale()) { - $queryBuilder->where('product_flat.locale', $currentLocale); + $queryBuilder->where('product_flat.channel', $this->channel); } $queryBuilder->groupBy('product_flat.product_id'); diff --git a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php index 6d5b6009a..6e47b373e 100755 --- a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php @@ -15,6 +15,12 @@ class SliderDataGrid extends DataGrid protected $channel = 'all'; + /** @var string[] contains the keys for which extra filters to render */ + protected $extraFilters = [ + 'channels', + 'locales', + ]; + public function __construct() { parent::__construct(); diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/index.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/index.blade.php index 7832be207..86730c73b 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/index.blade.php @@ -11,39 +11,6 @@

{{ __('admin::app.catalog.products.title') }}

- -
- -
- -
- -
diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/index.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/index.blade.php index 556a605bf..00e5944c6 100644 --- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/index.blade.php @@ -14,38 +14,6 @@
-
- -
- -
- -
- {{ __('admin::app.promotions.cart-rules.add-title') }} diff --git a/packages/Webkul/Admin/src/Resources/views/settings/sliders/index.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/sliders/index.blade.php index 05b1fed18..15a4ab9e3 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/sliders/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/sliders/index.blade.php @@ -14,41 +14,6 @@

{{ __('admin::app.settings.sliders.title') }}

- -
- -
- -
- -
-
diff --git a/packages/Webkul/Ui/src/DataGrid/DataGrid.php b/packages/Webkul/Ui/src/DataGrid/DataGrid.php index 6fa7cd8c0..6e2bc6350 100644 --- a/packages/Webkul/Ui/src/DataGrid/DataGrid.php +++ b/packages/Webkul/Ui/src/DataGrid/DataGrid.php @@ -11,7 +11,7 @@ abstract class DataGrid * * @var int */ - protected $index = null; + protected $index; /** * Default sort order of datagrid @@ -164,6 +164,9 @@ abstract class DataGrid 10 => "lock", ]; + /** @var string[] contains the keys for which extra filters to show */ + protected $extraFilters = []; + abstract public function prepareQueryBuilder(); abstract public function addColumns(); @@ -230,7 +233,7 @@ abstract class DataGrid { $this->fireEvent('add.column.before.' . $column['index']); - array_push($this->columns, $column); + $this->columns[] = $column; $this->setCompleteColumnDetails($column); @@ -244,7 +247,7 @@ abstract class DataGrid */ public function setCompleteColumnDetails($column) { - array_push($this->completeColumnDetails, $column); + $this->completeColumnDetails[] = $column; } /** @@ -298,7 +301,7 @@ abstract class DataGrid $this->fireEvent('mass.action.before.' . $eventName); - array_push($this->massActions, $massAction); + $this->massActions[] = $massAction; $this->enableMassAction = true; @@ -313,7 +316,7 @@ abstract class DataGrid $parsedUrl = $this->parseUrl(); foreach ($parsedUrl as $key => $value) { - if ($key == 'locale') { + if ($key === 'locale') { if (! is_array($value)) { unset($parsedUrl[$key]); } @@ -376,7 +379,7 @@ abstract class DataGrid $columnType = $this->findColumnType($key)[0] ?? null; $columnName = $this->findColumnType($key)[1] ?? null; - if ($key == "sort") { + if ($key === "sort") { $count_keys = count(array_keys($info)); if ($count_keys > 1) { @@ -389,7 +392,7 @@ abstract class DataGrid $columnName[1], array_values($info)[0] ); - } elseif ($key == "search") { + } elseif ($key === "search") { $count_keys = count(array_keys($info)); if ($count_keys > 1) { @@ -544,6 +547,17 @@ abstract class DataGrid $this->prepareQueryBuilder(); + $necessaryExtraFilters = []; + if (in_array('channels', $this->extraFilters)) { + $necessaryExtraFilters['channels'] = core()->getAllChannels(); + } + if (in_array('locales', $this->extraFilters)) { + $necessaryExtraFilters['locales'] = core()->getAllLocales(); + } + if (in_array('customer_groups', $this->extraFilters)) { + $necessaryExtraFilters['customer_groups'] = core()->getAllCustomerGroups(); + } + return view('ui::datagrid.table')->with('results', [ 'records' => $this->getCollection(), 'columns' => $this->completeColumnDetails, @@ -553,7 +567,8 @@ abstract class DataGrid 'enableMassActions' => $this->enableMassAction, 'enableActions' => $this->enableAction, 'paginated' => $this->paginate, - 'norecords' => trans('ui::app.datagrid.no-records'), + 'norecords' => __('ui::app.datagrid.no-records'), + 'extraFilters' => $necessaryExtraFilters ]); } 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 2ccda39d6..9abe87ce4 100644 --- a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php +++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php @@ -24,6 +24,65 @@
+ @if (isset($results['extraFilters']['channels'])) +
+
+ +
+
+ @endif + + @if (isset($results['extraFilters']['locales'])) +
+
+ +
+
+ @endif + + @if (isset($results['extraFilters']['customer_groups'])) +
+
+ +
+
+ @endif +