From 363037e72ccd404e62209859d5070460844d47dc Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Wed, 10 Feb 2021 14:09:32 +0530 Subject: [PATCH 01/15] Translations Check Added --- .../Webkul/Ui/src/Resources/views/datagrid/table.blade.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 02ad124cc..5de56462a 100644 --- a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php +++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php @@ -35,7 +35,9 @@ @endforeach From 0ee4cfec08ea362e0f04770b25e59241c3aaba89 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Wed, 10 Feb 2021 18:57:50 +0530 Subject: [PATCH 02/15] Fallback Added --- .../Admin/src/Resources/views/configuration/index.blade.php | 2 +- .../marketing/email-marketing/campaigns/create.blade.php | 4 ++-- .../views/marketing/email-marketing/campaigns/edit.blade.php | 4 ++-- .../Webkul/Ui/src/Resources/views/datagrid/table.blade.php | 2 -- .../src/Resources/views/admin/meta-info/meta-data.blade.php | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/views/configuration/index.blade.php b/packages/Webkul/Admin/src/Resources/views/configuration/index.blade.php index 0e7068d94..debdb5bb9 100755 --- a/packages/Webkul/Admin/src/Resources/views/configuration/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/configuration/index.blade.php @@ -23,7 +23,7 @@ @foreach (core()->getAllChannels() as $channelModel) @endforeach diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/create.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/create.blade.php index 98963a669..e0fdca41f 100755 --- a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/create.blade.php @@ -93,7 +93,7 @@ @@ -114,7 +114,7 @@ - + {!! view_render_event('bagisto.admin.marketing.templates.create.after') !!} diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/edit.blade.php index 662597560..ad1181359 100755 --- a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/edit.blade.php @@ -97,7 +97,7 @@ @@ -119,7 +119,7 @@ - + {!! view_render_event('bagisto.admin.marketing.templates.create.after') !!} 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 5de56462a..a9732fc37 100644 --- a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php +++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php @@ -35,8 +35,6 @@ @endforeach diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php index 63c953a22..057395806 100644 --- a/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php @@ -38,7 +38,7 @@ @endforeach From 7a2e43a2da94d2de27b3032aa484d6cc35b7b476 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Wed, 10 Feb 2021 19:08:10 +0530 Subject: [PATCH 03/15] Case Checked With Request Only Rather Then Fallback --- packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a9732fc37..968d75785 100644 --- a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php +++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php @@ -34,7 +34,7 @@ @foreach ($results['extraFilters']['channels'] as $channelModel) @endforeach From a9b803c7f38c99616b7d23651c528c4538b5a158 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Thu, 11 Feb 2021 14:09:25 +0530 Subject: [PATCH 04/15] Reverted One File --- packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 968d75785..a9732fc37 100644 --- a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php +++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php @@ -34,7 +34,7 @@ @foreach ($results['extraFilters']['channels'] as $channelModel) @endforeach From 8979bad28306ef40db2a9a6210d3b9764b61eeec Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Thu, 11 Feb 2021 14:40:34 +0530 Subject: [PATCH 05/15] Fixed -> When you filter admin locale (add new locale and filter from top right corner) and go to product grid https://prnt.sc/z239b3 --- .../Resources/views/datagrid/table.blade.php | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) 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 a9732fc37..ebe667fd6 100644 --- a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php +++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php @@ -1,12 +1,21 @@ @php + /* all locales */ + $locales = core()->getAllLocales(); + + /* request and fallback handling */ $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; + /* handling cases for new locale if not present in current channel */ + if ($channel !== 'all') { + $channelLocales = app('Webkul\Core\Repositories\ChannelRepository')->findOneByField('code', $channel)->locales; + + if ($channelLocales->contains('code', $locale)) { + $locales = $channelLocales; + } else { + $channel = 'all'; + } } @endphp From 2efb321b1cd42211decd318ab7e5f178e00f10ac Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Thu, 11 Feb 2021 14:47:52 +0530 Subject: [PATCH 06/15] Completed: No filteration should be done in channel grid when admin filter new locale https://prnt.sc/z23l9a --- packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php index d757e24ed..f9ec6da21 100755 --- a/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php @@ -49,9 +49,11 @@ class ChannelDataGrid extends DataGrid public function prepareQueryBuilder() { $queryBuilder = $this->channelRepository->query() - ->leftJoin('channel_translations', 'channel_translations.channel_id', '=', 'channels.id') - ->addSelect('channels.id', 'channels.code', 'channel_translations.locale', 'channel_translations.name as translated_name', 'channels.hostname') - ->where('channel_translations.locale', '=', $this->locale); + ->leftJoin('channel_translations', function($leftJoin) { + $leftJoin->on('channel_translations.channel_id', '=', 'channels.id') + ->where('channel_translations.locale', $this->locale); + }) + ->addSelect('channels.id', 'channels.code', 'channel_translations.locale', 'channel_translations.name as translated_name', 'channels.hostname'); $this->addFilter('id', 'channels.id'); $this->addFilter('code', 'channels.code'); From 68ab2d8779843d7b30b810685d7af9cd4ace1b94 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Thu, 11 Feb 2021 14:55:41 +0530 Subject: [PATCH 07/15] Completed: Channel multiselect option also gets blank https://prnt.sc/z2f9ek --- .../views/catalog/products/accordians/channels.blade.php | 2 +- .../Webkul/Admin/src/Resources/views/cms/create.blade.php | 2 +- packages/Webkul/Admin/src/Resources/views/cms/edit.blade.php | 2 +- .../views/marketing/promotions/cart-rules/create.blade.php | 2 +- .../views/marketing/promotions/cart-rules/edit.blade.php | 4 ++-- .../views/marketing/promotions/catalog-rules/create.blade.php | 2 +- .../views/marketing/promotions/catalog-rules/edit.blade.php | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/channels.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/channels.blade.php index 860997bac..83e3886e1 100644 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/channels.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/channels.blade.php @@ -14,7 +14,7 @@ diff --git a/packages/Webkul/Admin/src/Resources/views/cms/create.blade.php b/packages/Webkul/Admin/src/Resources/views/cms/create.blade.php index e13bdf235..46836b111 100644 --- a/packages/Webkul/Admin/src/Resources/views/cms/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/cms/create.blade.php @@ -48,7 +48,7 @@ diff --git a/packages/Webkul/Admin/src/Resources/views/cms/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/cms/edit.blade.php index b26eaf331..42a933ac4 100644 --- a/packages/Webkul/Admin/src/Resources/views/cms/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/cms/edit.blade.php @@ -66,7 +66,7 @@ diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/create.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/create.blade.php index e3466e33b..794ec0b5b 100644 --- a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/create.blade.php @@ -71,7 +71,7 @@ @foreach(core()->getAllChannels() as $channel) @endforeach diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/edit.blade.php index 39bc4a2b4..1e4336d12 100644 --- a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/edit.blade.php @@ -78,7 +78,7 @@ @foreach(core()->getAllChannels() as $channel) @endforeach @@ -783,7 +783,7 @@ }, showModal(id) { - this.$root.$set(this.$root.modalIds, id, true); + this.$root.$set(this.$root.modalIds, id, true); }, } }); diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/create.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/create.blade.php index 167dec0ab..2dd17dcaf 100644 --- a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/create.blade.php @@ -71,7 +71,7 @@ @foreach(core()->getAllChannels() as $channel) @endforeach diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/edit.blade.php index ceb1ab15c..99878bcb3 100644 --- a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/edit.blade.php @@ -73,7 +73,7 @@ @foreach(core()->getAllChannels() as $channel) @endforeach From f4ef06af6e922b37dca0add9227a47c6f4318bcc Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Thu, 11 Feb 2021 16:43:47 +0530 Subject: [PATCH 08/15] Checked For The Requested Locale In Channel --- .../products/accordians/channels.blade.php | 2 +- .../views/catalog/products/edit.blade.php | 16 +++++++++---- .../src/Resources/views/cms/create.blade.php | 2 +- .../src/Resources/views/cms/edit.blade.php | 2 +- .../views/configuration/index.blade.php | 2 +- .../campaigns/create.blade.php | 2 +- .../email-marketing/campaigns/edit.blade.php | 2 +- .../promotions/cart-rules/create.blade.php | 2 +- .../promotions/cart-rules/edit.blade.php | 2 +- .../promotions/catalog-rules/create.blade.php | 2 +- .../promotions/catalog-rules/edit.blade.php | 2 +- .../Resources/views/datagrid/table.blade.php | 2 +- .../views/admin/meta-info/meta-data.blade.php | 24 ++++++++++++------- 13 files changed, 38 insertions(+), 24 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/channels.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/channels.blade.php index 83e3886e1..a69ca918a 100644 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/channels.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/channels.blade.php @@ -14,7 +14,7 @@ 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 df4959da4..0f83bdec6 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 @@ -6,8 +6,16 @@ @section('content')
- get('locale') ?: app()->getLocale(); ?> - get('channel') ?: core()->getDefaultChannelCode(); ?> + @php + $locale = request()->get('locale') ?: app()->getLocale(); + $channel = request()->get('channel') ?: core()->getDefaultChannelCode(); + + $channelLocales = app('Webkul\Core\Repositories\ChannelRepository')->findOneByField('code', $channel)->locales; + + if (! $channelLocales->contains('code', $locale)) { + $locale = config('app.fallback_locale'); + } + @endphp {!! view_render_event('bagisto.admin.catalog.product.edit.before', ['product' => $product]) !!} @@ -29,7 +37,7 @@ @endforeach @@ -38,7 +46,7 @@
@foreach($channels->all() as $channel) - + @endforeach diff --git a/packages/Webkul/Admin/src/Resources/views/cms/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/cms/edit.blade.php index 42a933ac4..896340b8c 100644 --- a/packages/Webkul/Admin/src/Resources/views/cms/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/cms/edit.blade.php @@ -66,7 +66,7 @@ diff --git a/packages/Webkul/Admin/src/Resources/views/configuration/index.blade.php b/packages/Webkul/Admin/src/Resources/views/configuration/index.blade.php index debdb5bb9..c4d96e6cd 100755 --- a/packages/Webkul/Admin/src/Resources/views/configuration/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/configuration/index.blade.php @@ -23,7 +23,7 @@ @foreach (core()->getAllChannels() as $channelModel) @endforeach diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/create.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/create.blade.php index e0fdca41f..4863b2791 100755 --- a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/create.blade.php @@ -93,7 +93,7 @@ diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/edit.blade.php index ad1181359..535e43c33 100755 --- a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/campaigns/edit.blade.php @@ -97,7 +97,7 @@ diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/create.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/create.blade.php index 794ec0b5b..05a1bedb1 100644 --- a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/create.blade.php @@ -71,7 +71,7 @@ @foreach(core()->getAllChannels() as $channel) @endforeach diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/edit.blade.php index 1e4336d12..2156dea11 100644 --- a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/edit.blade.php @@ -78,7 +78,7 @@ @foreach(core()->getAllChannels() as $channel) @endforeach diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/create.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/create.blade.php index 2dd17dcaf..7b71144cd 100644 --- a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/create.blade.php @@ -71,7 +71,7 @@ @foreach(core()->getAllChannels() as $channel) @endforeach diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/edit.blade.php index 99878bcb3..bbd0ad967 100644 --- a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/edit.blade.php @@ -73,7 +73,7 @@ @foreach(core()->getAllChannels() as $channel) @endforeach 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 ebe667fd6..df5648d03 100644 --- a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php +++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php @@ -44,7 +44,7 @@ @endforeach diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php index 057395806..3bf56a538 100644 --- a/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php @@ -6,7 +6,13 @@ @php $locale = request()->get('locale') ?: app()->getLocale(); - $channel = request()->get('channel') ?: core()->getCurrentChannelCode(); + $channel = request()->get('channel') ?: core()->getDefaultChannelCode(); + + $channelLocales = app('Webkul\Core\Repositories\ChannelRepository')->findOneByField('code', $channel)->locales; + + if (! $channelLocales->contains('code', $locale)) { + $locale = config('app.fallback_locale'); + } @endphp @section('content') @@ -38,7 +44,7 @@ @endforeach @@ -47,7 +53,7 @@