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/Admin/src/Resources/views/catalog/products/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php index 82850d4d7..df4959da4 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php @@ -38,7 +38,7 @@
- + @foreach (core()->getAllChannels() as $channelModel) - @endforeach @@ -45,10 +46,11 @@
- + @foreach (app('Webkul\Core\Repositories\ChannelRepository')->findOneByField('code', $channel)->locales as $localeModel) - @@ -105,9 +107,9 @@ value="{{ $metaData ? $metaData->header_content_count : '5' }}" />
- - + +
+ @if (count($product->getTypeInstance()->getCustomerGroupPricingOffers()) > 0) +
+ @foreach ($product->getTypeInstance()->getCustomerGroupPricingOffers() as $offers) + {{ $offers }}
+ @endforeach +
+ @endif +
@if (core()->getConfigData('catalog.products.storefront.buy_now_button_display')) @include ('shop::products.buy-now', [