From 0ee4cfec08ea362e0f04770b25e59241c3aaba89 Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Wed, 10 Feb 2021 18:57:50 +0530
Subject: [PATCH] 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)
 
                                 <option value="{{ $channelModel->code }}" {{ ($channelModel->code) == $channel ? 'selected' : '' }}>
-                                    {{ $channelModel->name }}
+                                    {{ $channelModel->name ?? $channelModel->translate($locale)->name ?? $channelModel->translate('en')->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 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 @@
                                 <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->name ?? $channel->translate(app()->getLocale())->name ?? $channel->translate('en')->name }}
                                         </option>
                                     @endforeach
                                 </select>
@@ -114,7 +114,7 @@
 
                         </div>
                     </accordian>
-                            
+
                     {!! view_render_event('bagisto.admin.marketing.templates.create.after') !!}
 
                 </div>
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 @@
                                 <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->name ?? $channel->translate(app()->getLocale())->name ?? $channel->translate('en')->name }}
                                         </option>
                                     @endforeach
                                 </select>
@@ -119,7 +119,7 @@
 
                         </div>
                     </accordian>
-                            
+
                     {!! view_render_event('bagisto.admin.marketing.templates.create.after') !!}
 
                 </div>
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 @@
                                         <option
                                             value="{{ $channelModel->code }}"
                                             {{ (isset($channel) && ($channelModel->code) == $channel) ? 'selected' : '' }}>
-
-                                            {{-- if translation not found then first will check from the default locale and if still not then last hard code value --}}
                                             {{ $channelModel->name ?? $channelModel->translate($locale)->name ?? $channelModel->translate('en')->name }}
                                         </option>
                                     @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 @@
 
                             <option
                                 value="{{ $channelModel->code }}" {{ ($channelModel->code) == $channel ? 'selected' : '' }}>
-                                {{ $channelModel->name }}
+                                {{ $channelModel->name ?? $channelModel->translate($locale)->name ?? $channelModel->translate('en')->name }}
                             </option>
 
                         @endforeach