diff --git a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php index b206ca1c1..bc36ab5c5 100755 --- a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php @@ -30,10 +30,17 @@ class SliderDataGrid extends DataGrid { parent::__construct(); - $this->locale = request()->get('locale') ?? 'all'; - $this->channel = request()->get('channel') - ? Channel::find(request()->get('channel'))->code - : 'all'; + /* locale */ + $this->locale = request()->get('locale') ?? app()->getLocale(); + + /* channel */ + $this->channel = request()->get('channel') ?? (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode()); + + /* finding channel code */ + if ($this->channel !== 'all') { + $this->channel = Channel::query()->find($this->channel); + $this->channel = $this->channel ? $this->channel->code : 'all'; + } } public function prepareQueryBuilder() 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 7b5cce24d..02ad124cc 100644 --- a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php +++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php @@ -2,6 +2,12 @@ $locale = request()->get('locale') ?: app()->getLocale(); $channel = request()->get('channel') ?: (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode()); $customer_group = request()->get('customer_group'); + + if ($channel == 'all') { + $locales = core()->getAllLocales(); + } else { + $locales = app('Webkul\Core\Repositories\ChannelRepository')->findOneByField('code', $channel)->locales; + } @endphp
@@ -27,8 +33,8 @@ @foreach ($results['extraFilters']['channels'] as $channelModel) @endforeach @@ -45,7 +51,7 @@ - @foreach ($results['extraFilters']['locales'] as $localeModel) + @foreach ($locales as $localeModel)