From f4ef06af6e922b37dca0add9227a47c6f4318bcc Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Thu, 11 Feb 2021 16:43:47 +0530
Subject: [PATCH] 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 @@
             <select class="control" name="channels[]" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.catalog.products.channel') }}&quot;" multiple>
                 @foreach (app('Webkul\Core\Repositories\ChannelRepository')->all() as $channel)
                     <option value="{{ $channel->id }}" {{ in_array($channel->code, $productChannels) ? 'selected' : ''}}>
-                        {{ $channel->name ?? $channel->translate(app()->getLocale())->name ?? $channel->translate('en')->name }}
+                        {{ $channel->name ?? $channel->translate(app()->getLocale())->name ?? $channel->translate(config('app.fallback_locale'))->name }}
                     </option>
                 @endforeach
             </select>
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')
     <div class="content">
-        <?php $locale = request()->get('locale') ?: app()->getLocale(); ?>
-        <?php $channel = request()->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 @@
 
                                 <option
                                     value="{{ $channelModel->code }}" {{ ($channelModel->code) == $channel ? 'selected' : '' }}>
-                                    {{ $channelModel->name }}
+                                    {{ $channelModel->name ?? $channelModel->translate($locale)->name ?? $channelModel->translate(config('app.fallback_locale'))->name }}
                                 </option>
 
                             @endforeach
@@ -38,7 +46,7 @@
 
                     <div class="control-group">
                         <select class="control" id="locale-switcher" name="locale">
-                            @foreach (app('Webkul\Core\Repositories\ChannelRepository')->findOneByField('code', $channel)->locales as $localeModel)
+                            @foreach ($channelLocales as $localeModel)
 
                                 <option
                                     value="{{ $localeModel->code }}" {{ ($localeModel->code) == $locale ? 'selected' : '' }}>
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 46836b111..4ebda7b0b 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 @@
 
                                 <select type="text" class="control" name="channels[]" v-validate="'required'" value="{{ old('channel[]') }}" data-vv-as="&quot;{{ __('admin::app.cms.pages.channel') }}&quot;" multiple="multiple">
                                     @foreach($channels->all() as $channel)
-                                        <option value="{{ $channel->id }}">{{ $channel->name ?? $channel->translate(app()->getLocale())->name ?? $channel->translate('en')->name }}</option>
+                                        <option value="{{ $channel->id }}">{{ $channel->name ?? $channel->translate(app()->getLocale())->name ?? $channel->translate(config('app.fallback_locale'))->name }}</option>
                                     @endforeach
                                 </select>
 
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 @@
                                 <select type="text" class="control" name="channels[]" v-validate="'required'" value="{{ old('channel[]') }}" data-vv-as="&quot;{{ __('admin::app.cms.pages.channel') }}&quot;" multiple="multiple">
                                     @foreach(app('Webkul\Core\Repositories\ChannelRepository')->all() as $channel)
                                         <option value="{{ $channel->id }}" {{ in_array($channel->id, $selectedOptionIds) ? 'selected' : '' }}>
-                                            {{ $channel->name ?? $channel->translate(app()->getLocale())->name ?? $channel->translate('en')->name }}
+                                            {{ $channel->name ?? $channel->translate(app()->getLocale())->name ?? $channel->translate(config('app.fallback_locale'))->name }}
                                         </option>
                                     @endforeach
                                 </select>
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)
 
                                 <option value="{{ $channelModel->code }}" {{ ($channelModel->code) == $channel ? 'selected' : '' }}>
-                                    {{ $channelModel->name ?? $channelModel->translate($locale)->name ?? $channelModel->translate('en')->name }}
+                                    {{ $channelModel->name ?? $channelModel->translate($locale)->name ?? $channelModel->translate(config('app.fallback_locale'))->name }}
                                 </option>
 
                             @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 @@
                                 <select v-validate="'required'" class="control" id="channel_id" name="channel_id" data-vv-as="&quot;{{ __('admin::app.marketing.campaigns.channel') }}&quot;">
                                     @foreach (app('Webkul\Core\Repositories\ChannelRepository')->all() as $channel)
                                         <option value="{{ $channel->id }}" {{ old('channel_id') == $channel->id ? 'selected' : '' }}>
-                                            {{ $channel->name ?? $channel->translate(app()->getLocale())->name ?? $channel->translate('en')->name }}
+                                            {{ $channel->name ?? $channel->translate(app()->getLocale())->name ?? $channel->translate(config('app.fallback_locale'))->name }}
                                         </option>
                                     @endforeach
                                 </select>
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 @@
                                 <select v-validate="'required'" class="control" id="channel_id" name="channel_id" data-vv-as="&quot;{{ __('admin::app.marketing.campaigns.channel') }}&quot;">
                                     @foreach (app('Webkul\Core\Repositories\ChannelRepository')->all() as $channel)
                                         <option value="{{ $channel->id }}" {{ $selectedOption == $channel->id ? 'selected' : '' }}>
-                                            {{ $channel->name ?? $channel->translate(app()->getLocale())->name ?? $channel->translate('en')->name }}
+                                            {{ $channel->name ?? $channel->translate(app()->getLocale())->name ?? $channel->translate(config('app.fallback_locale'))->name }}
                                         </option>
                                     @endforeach
                                 </select>
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)
                                             <option value="{{ $channel->id }}" {{ old('channels') && in_array($channel->id, old('channels')) ? 'selected' : '' }}>
-                                                {{ $channel->name ?? $channel->translate(app()->getLocale())->name ?? $channel->translate('en')->name }}
+                                                {{ $channel->name ?? $channel->translate(app()->getLocale())->name ?? $channel->translate(config('app.fallback_locale'))->name }}
                                             </option>
                                         @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)
                                             <option value="{{ $channel->id }}" {{ in_array($channel->id, $selectedOptionIds) ? 'selected' : '' }}>
-                                                {{ $channel->name ?? $channel->translate(app()->getLocale())->name ?? $channel->translate('en')->name }}
+                                                {{ $channel->name ?? $channel->translate(app()->getLocale())->name ?? $channel->translate(config('app.fallback_locale'))->name }}
                                             </option>
                                         @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)
                                             <option value="{{ $channel->id }}" {{ old('channels') && in_array($channel->id, old('channels')) ? 'selected' : '' }}>
-                                                {{ $channel->name ?? $channel->translate(app()->getLocale())->name ?? $channel->translate('en')->name }}
+                                                {{ $channel->name ?? $channel->translate(app()->getLocale())->name ?? $channel->translate(config('app.fallback_locale'))->name }}
                                             </option>
                                         @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)
                                             <option value="{{ $channel->id }}" {{ in_array($channel->id, $selectedOptionIds) ? 'selected' : '' }}>
-                                                {{ $channel->name ?? $channel->translate(app()->getLocale())->name ?? $channel->translate('en')->name }}
+                                                {{ $channel->name ?? $channel->translate(app()->getLocale())->name ?? $channel->translate(config('app.fallback_locale'))->name }}
                                             </option>
                                         @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 @@
                                         <option
                                             value="{{ $channelModel->code }}"
                                             {{ (isset($channel) && ($channelModel->code) == $channel) ? 'selected' : '' }}>
-                                            {{ $channelModel->name ?? $channelModel->translate($locale)->name ?? $channelModel->translate('en')->name }}
+                                            {{ $channelModel->name ?? $channelModel->translate($locale)->name ?? $channelModel->translate(config('app.fallback_locale'))->name }}
                                         </option>
                                     @endforeach
                                 </select>
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 @@
 
                             <option
                                 value="{{ $channelModel->code }}" {{ ($channelModel->code) == $channel ? 'selected' : '' }}>
-                                {{ $channelModel->name ?? $channelModel->translate($locale)->name ?? $channelModel->translate('en')->name }}
+                                {{ $channelModel->name ?? $channelModel->translate($locale)->name ?? $channelModel->translate(config('app.fallback_locale'))->name }}
                             </option>
 
                         @endforeach
@@ -47,7 +53,7 @@
 
                 <div class="control-group">
                     <select class="control" id="locale-switcher" name="locale">
-                        @foreach (app('Webkul\Core\Repositories\ChannelRepository')->findOneByField('code', $channel)->locales as $localeModel)
+                        @foreach ($channelLocales as $localeModel)
 
                             <option
                                 value="{{ $localeModel->code }}" {{ ($localeModel->code) == $locale ? 'selected' : '' }}>
@@ -113,7 +119,7 @@
                     <div class="control-group">
                         <label style="width:100%;">
                             {{ __('velocity::app.admin.meta-data.home-page-content') }}
-                            <span class="locale">[{{ $metaData ? $metaData->channel : $channel }} - {{ $metaData ? $metaData->locale : $locale }}]</span>
+                            <span class="locale">[{{ $channel }} - {{ $locale }}]</span>
                         </label>
 
                         <textarea
@@ -127,7 +133,7 @@
                     <div class="control-group">
                         <label style="width:100%;">
                             {{ __('velocity::app.admin.meta-data.product-policy') }}
-                            <span class="locale">[{{ $metaData ? $metaData->channel : $channel }} - {{ $metaData ? $metaData->locale : $locale }}]</span>
+                            <span class="locale">[{{ $channel }} - {{ $locale }}]</span>
                         </label>
 
                         <textarea
@@ -295,7 +301,7 @@
                     <div class="control-group">
                         <label style="width:100%;">
                             {{ __('velocity::app.admin.meta-data.subscription-content') }}
-                            <span class="locale">[{{ $metaData ? $metaData->channel : $channel }} - {{ $metaData ? $metaData->locale : $locale }}]</span>
+                            <span class="locale">[{{ $channel }} - {{ $locale }}]</span>
                         </label>
 
                         <textarea
@@ -309,7 +315,7 @@
                     <div class="control-group">
                         <label style="width:100%;">
                             {{ __('velocity::app.admin.meta-data.footer-left-content') }}
-                            <span class="locale">[{{ $metaData ? $metaData->channel : $channel }} - {{ $metaData ? $metaData->locale : $locale }}]</span>
+                            <span class="locale">[{{ $channel }} - {{ $locale }}]</span>
                         </label>
 
                         <textarea
@@ -323,7 +329,7 @@
                     <div class="control-group">
                         <label style="width:100%;">
                             {{ __('velocity::app.admin.meta-data.footer-middle-content') }}
-                            <span class="locale">[{{ $metaData ? $metaData->channel : $channel }} - {{ $metaData ? $metaData->locale : $locale }}]</span>
+                            <span class="locale">[{{ $channel }} - {{ $locale }}]</span>
                         </label>
 
                         <textarea
@@ -358,7 +364,7 @@
                 $('#channel-switcher').val()
 
                 if (event.target.id == 'channel-switcher') {
-                    let locale = "{{ app('Webkul\Core\Repositories\ChannelRepository')->findOneByField('code', $channel)->locales->first()->code }}";
+                    let locale = "{{ $channelLocales->first()->code }}";
 
                     $('#locale-switcher').val(locale);
                 }