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 617bd736a..ccc2f3e28 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
@@ -7,13 +7,9 @@
@section('content')
@php
- /* getting channel and locales */
- $mainConfigurations = core()->getChannelCodeAndLocaleCode();
-
- /* assigning */
- $locale = $mainConfigurations['localeCode'];
- $channel = $mainConfigurations['channelCode'];
- $channelLocales = $mainConfigurations['channelLocales'];
+ $locale = core()->checkRequestedLocaleInChannel();
+ $channel = core()->getRequestedChannelCode();
+ $channelLocales = core()->getAllLocalesByRequestedChannelCode()['locales'];
@endphp
{!! view_render_event('bagisto.admin.catalog.product.edit.before', ['product' => $product]) !!}
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 375a9ae56..c2641fe70 100755
--- a/packages/Webkul/Admin/src/Resources/views/configuration/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/configuration/index.blade.php
@@ -7,13 +7,9 @@
@section('content')
@php
- /* getting channel and locales */
- $mainConfigurations = core()->getChannelCodeAndLocaleCode();
-
- /* assigning */
- $locale = $mainConfigurations['localeCode'];
- $channel = $mainConfigurations['channelCode'];
- $channelLocales = $mainConfigurations['channelLocales'];
+ $locale = core()->checkRequestedLocaleInChannel();
+ $channel = core()->getRequestedChannelCode();
+ $channelLocales = core()->getAllLocalesByRequestedChannelCode()['locales'];
@endphp