@@ -268,7 +268,7 @@
@elseif ($field['type'] == 'file')
getConfigData($name);
+ $result = core()->getConfigData($name, $channel, $locale);
$src = explode("/", $result);
$path = end($src);
?>
@@ -279,7 +279,7 @@
@endif
-
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 ef3e6ed89..375a9ae56 100755
--- a/packages/Webkul/Admin/src/Resources/views/configuration/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/configuration/index.blade.php
@@ -7,14 +7,13 @@
@section('content')
@php
- $locale = request()->get('locale') ?: app()->getLocale();
- $channel = request()->get('channel') ?: core()->getDefaultChannelCode();
+ /* getting channel and locales */
+ $mainConfigurations = core()->getChannelCodeAndLocaleCode();
- $channelLocales = app('Webkul\Core\Repositories\ChannelRepository')->findOneByField('code', $channel)->locales;
-
- if (! $channelLocales->contains('code', $locale)) {
- $locale = config('app.fallback_locale');
- }
+ /* assigning */
+ $locale = $mainConfigurations['localeCode'];
+ $channel = $mainConfigurations['channelCode'];
+ $channelLocales = $mainConfigurations['channelLocales'];
@endphp