diff --git a/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php
index 59d52ed48..4b9635edd 100644
--- a/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php
@@ -25,9 +25,9 @@ class CartRuleDataGrid extends DataGrid
     {
         parent::__construct();
 
-        $this->customer_group = request()->get('customer_group') ?? 'all';
+        $this->customer_group = core()->getRequestedCustomerGroupCode() ?? 'all';
 
-        $this->channel = request()->get('channel') ?? 'all';
+        $this->channel = core()->getRequestedChannelCode(false) ?? 'all';
     }
 
     public function prepareQueryBuilder()
diff --git a/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php
index f9ec6da21..2540b3081 100755
--- a/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php
@@ -41,7 +41,7 @@ class ChannelDataGrid extends DataGrid
     {
         parent::__construct();
 
-        $this->locale = request()->get('locale') ?? app()->getLocale();
+        $this->locale = core()->getRequestedLocaleCode();
 
         $this->channelRepository = $channelRepository;
     }
diff --git a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php
index 26ac28741..a9668469c 100644
--- a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php
@@ -30,10 +30,10 @@ class ProductDataGrid extends DataGrid
         parent::__construct();
 
         /* locale */
-        $this->locale = request()->get('locale') ?? app()->getLocale();
+        $this->locale = core()->getRequestedLocaleCode();
 
         /* channel */
-        $this->channel = request()->get('channel') ?? (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode());
+        $this->channel = core()->getRequestedChannelCode();
 
         /* finding channel code */
         if ($this->channel !== 'all') {
diff --git a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php
index 511b0d4d2..6e97d66a5 100755
--- a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php
@@ -31,10 +31,10 @@ class SliderDataGrid extends DataGrid
         parent::__construct();
 
         /* locale */
-        $this->locale = request()->get('locale') ?? app()->getLocale();
+        $this->locale = core()->getRequestedLocaleCode();
 
         /* channel */
-        $this->channel = request()->get('channel') ?? (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode());
+        $this->channel = core()->getRequestedChannelCode();
 
         /* finding channel code */
         if ($this->channel !== 'all') {
diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php
index 7c30bc150..f9c2dd118 100755
--- a/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php
@@ -6,7 +6,9 @@
 
 @section('content')
     <div class="content">
-        <?php $locale = request()->get('locale') ?: app()->getLocale(); ?>
+        @php
+            $locale = core()->getRequestedLocaleCode();
+        @endphp
 
         <form method="POST" action="" @submit.prevent="onSubmit" enctype="multipart/form-data">
 
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 fce0c238c..3cbb911ba 100644
--- a/packages/Webkul/Admin/src/Resources/views/cms/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/cms/edit.blade.php
@@ -6,7 +6,9 @@
 
 @section('content')
     <div class="content">
-        <?php $locale = request()->get('locale') ?: app()->getLocale(); ?>
+        @php
+            $locale = core()->getRequestedLocaleCode();
+        @endphp
 
         <form method="POST" id="page-form" action="" @submit.prevent="onSubmit">
 
diff --git a/packages/Webkul/Admin/src/Resources/views/export/export.blade.php b/packages/Webkul/Admin/src/Resources/views/export/export.blade.php
index 85208b62e..ccad8029a 100644
--- a/packages/Webkul/Admin/src/Resources/views/export/export.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/export/export.blade.php
@@ -1,5 +1,5 @@
 <script type="text/x-template" id="export-form-template">
-    <form method="POST" action="{{ route('admin.datagrid.export', ['locale' => request()->get('locale')]) }}" @submit.prevent="onSubmit">
+    <form method="POST" action="{{ route('admin.datagrid.export', ['locale' => core()->getRequestedLocaleCode()]) }}" @submit.prevent="onSubmit">
 
         <div class="page-content">
             <div class="form-container">
@@ -36,8 +36,8 @@
                 var this_this = this;
                 e.target.submit();
 
-                setTimeout(function() { 
-                    this_this.$root.$set(this_this.$root.modalIds, 'downloadDataGrid', false); 
+                setTimeout(function() {
+                    this_this.$root.$set(this_this.$root.modalIds, 'downloadDataGrid', false);
                 }, 0);
             }
         }
diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/index.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/index.blade.php
index 00e5944c6..01a94bfdf 100644
--- a/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/marketing/promotions/cart-rules/index.blade.php
@@ -6,8 +6,11 @@
 
 @section('content')
     <div class="content">
-        <?php $customer_group = request()->get('customer_group') ?: null; ?>
-        <?php $channel = request()->get('channel') ?: null; ?>
+        @php
+            $customer_group = core()->getRequestedCustomerGroupCode();
+            $channel = core()->getRequestedChannelCode(false);
+        @endphp
+
         <div class="page-header">
             <div class="page-title">
                 <h1>{{ __('admin::app.promotions.cart-rules.title') }}</h1>
@@ -26,6 +29,7 @@
         </div>
     </div>
 @endsection
+
 @push('scripts')
     <script>
         function reloadPage(getVar, getVal) {
@@ -34,6 +38,5 @@
 
             window.location.href = url.href;
         }
-
     </script>
 @endpush
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php
index bfc22db99..243f3e91c 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php
@@ -6,7 +6,7 @@
 
 @section('content')
     <div class="content">
-        @php $locale = request()->get('locale') ?: app()->getLocale(); @endphp
+        @php $locale = core()->getRequestedLocaleCode(); @endphp
 
         <form method="POST" action="{{ route('admin.channels.update', ['id' => $channel->id, 'locale' => $locale]) }}" @submit.prevent="onSubmit" enctype="multipart/form-data">
             <div class="page-header">
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php
index d8e77a67d..641c78845 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php
@@ -6,7 +6,7 @@
 
 @section('content')
     <div class="content">
-        <?php $locale = request()->get('locale') ?: app()->getLocale(); ?>
+        @php $locale = core()->getRequestedLocaleCode(); @endphp
 
         <form method="POST" action="{{ route('admin.sliders.update', $slider->id) }}" @submit.prevent="onSubmit" enctype="multipart/form-data">
             <div class="page-header">
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/sliders/index.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/sliders/index.blade.php
index 15a4ab9e3..c46d3d506 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/sliders/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/sliders/index.blade.php
@@ -8,8 +8,10 @@
 
     <div class="content">
 
-      <?php $locale = request()->get('locale') ?: null; ?>
-      <?php $channel = request()->get('channel') ?: null; ?>
+        @php
+            $locale = core()->getRequestedLocaleCode('locale', false);
+            $channel = core()->getRequestedChannelCode(false);
+        @endphp
 
         <div class="page-header">
             <div class="page-title">
diff --git a/packages/Webkul/CMS/src/Http/Controllers/Admin/PageController.php b/packages/Webkul/CMS/src/Http/Controllers/Admin/PageController.php
index ff4484db9..ea2686f1a 100644
--- a/packages/Webkul/CMS/src/Http/Controllers/Admin/PageController.php
+++ b/packages/Webkul/CMS/src/Http/Controllers/Admin/PageController.php
@@ -9,14 +9,14 @@ use Webkul\CMS\Repositories\CmsRepository;
 {
     /**
      * To hold the request variables from route file
-     * 
+     *
      * @var array
      */
     protected $_config;
 
     /**
      * To hold the CMSRepository instance
-     * 
+     *
      * @var \Webkul\CMS\Repositories\CmsRepository
      */
     protected $cmsRepository;
@@ -38,7 +38,7 @@ use Webkul\CMS\Repositories\CmsRepository;
 
     /**
      * Loads the index page showing the static pages resources
-     * 
+     *
      * @return \Illuminate\View\View
      */
     public function index()
@@ -71,7 +71,7 @@ use Webkul\CMS\Repositories\CmsRepository;
             'channels'     => 'required',
             'html_content' => 'required',
         ]);
-        
+
         $page = $this->cmsRepository->create(request()->all());
 
         session()->flash('success', trans('admin::app.response.create-success', ['name' => 'page']));
@@ -100,7 +100,7 @@ use Webkul\CMS\Repositories\CmsRepository;
      */
     public function update($id)
     {
-        $locale = request()->get('locale') ?: app()->getLocale();
+        $locale = core()->getRequestedLocaleCode();
 
         $this->validate(request(), [
             $locale . '.url_key'      => ['required', new \Webkul\Core\Contracts\Validations\Slug, function ($attribute, $value, $fail) use ($id) {
diff --git a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php
index 806c76aa7..b81363726 100755
--- a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php
+++ b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php
@@ -119,7 +119,7 @@ class CategoryController extends Controller
      */
     public function update($id)
     {
-        $locale = request()->get('locale') ?: app()->getLocale();
+        $locale = core()->getRequestedLocaleCode();
 
         $this->validate(request(), [
             $locale . '.slug' => ['required', function ($attribute, $value, $fail) use ($id) {
diff --git a/packages/Webkul/Category/src/Repositories/CategoryRepository.php b/packages/Webkul/Category/src/Repositories/CategoryRepository.php
index 48f9589e3..30e39d98f 100755
--- a/packages/Webkul/Category/src/Repositories/CategoryRepository.php
+++ b/packages/Webkul/Category/src/Repositories/CategoryRepository.php
@@ -148,7 +148,7 @@ class CategoryRepository extends Repository
             get_class($this->model), $slug
         );
     }
-    
+
     /**
      * Retrive category from slug.
      *
@@ -292,7 +292,7 @@ class CategoryRepository extends Repository
      */
     private function setSameAttributeValueToAllLocale(array $data, ...$attributeNames)
     {
-        $requestedLocale = request()->get('locale') ?: app()->getLocale();
+        $requestedLocale = core()->getRequestedLocaleCode();
 
         $model = app()->make($this->model());
 
diff --git a/packages/Webkul/Core/src/Core.php b/packages/Webkul/Core/src/Core.php
index 7f37f5913..2d17f8816 100755
--- a/packages/Webkul/Core/src/Core.php
+++ b/packages/Webkul/Core/src/Core.php
@@ -235,11 +235,18 @@ class Core
     /**
      * Get channel code from request.
      *
+     * @param  bool  $fallback  optional
      * @return string
      */
-    public function getRequestedChannelCode(): string
+    public function getRequestedChannelCode($fallback = true)
     {
-        return request()->get('channel') ?: ($this->getCurrentChannelCode() ?: $this->getDefaultChannelCode());
+        $channelCode = request()->get('channel');
+
+        if (! $fallback) {
+            return $channelCode;
+        }
+
+        return $channelCode ?: ($this->getCurrentChannelCode() ?: $this->getDefaultChannelCode());
     }
 
     /**
@@ -318,11 +325,18 @@ class Core
      * you can pass it as an argument.
      *
      * @param  string  $localeKey  optional
+     * @param  bool  $fallback  optional
      * @return string
      */
-    public function getRequestedLocaleCode($localeKey = 'locale'): string
+    public function getRequestedLocaleCode($localeKey = 'locale', $fallback = true)
     {
-        return request()->get($localeKey) ?: app()->getLocale();
+        $localeCode = request()->get($localeKey);
+
+        if (! $fallback) {
+            return $localeCode;
+        }
+
+        return $localeCode ?: app()->getLocale();
     }
 
     /**
@@ -358,6 +372,16 @@ class Core
         return $customerGroups = $this->customerGroupRepository->all();
     }
 
+    /**
+     * Get requested customer group code.
+     *
+     * @return null|string
+     */
+    public function getRequestedCustomerGroupCode()
+    {
+        return request()->get('customer_group');
+    }
+
     /**
      * Returns all currencies.
      *
@@ -792,11 +816,11 @@ class Core
             $coreConfigValue = $loadedConfigs[$field];
         } else {
             if (null === $channel) {
-                $channel = request()->get('channel') ?: ($this->getCurrentChannelCode() ?: $this->getDefaultChannelCode());
+                $channel = $this->getRequestedChannelCode();
             }
 
             if (null === $locale) {
-                $locale = request()->get('locale') ?: app()->getLocale();
+                $locale = $this->getRequestedLocaleCode();
             }
 
             $loadedConfigs[$field] = $coreConfigValue = $this->getCoreConfigValue($field, $channel, $locale);
diff --git a/packages/Webkul/Core/src/Http/Controllers/ChannelController.php b/packages/Webkul/Core/src/Http/Controllers/ChannelController.php
index fe5895f85..e29db0974 100755
--- a/packages/Webkul/Core/src/Http/Controllers/ChannelController.php
+++ b/packages/Webkul/Core/src/Http/Controllers/ChannelController.php
@@ -128,7 +128,7 @@ class ChannelController extends Controller
      */
     public function update($id)
     {
-        $locale = request()->get('locale') ?: app()->getLocale();
+        $locale = core()->getRequestedLocaleCode();
 
         $data = $this->validate(request(), [
             /* general */
diff --git a/packages/Webkul/Core/src/Http/Controllers/SliderController.php b/packages/Webkul/Core/src/Http/Controllers/SliderController.php
index 75fa1712e..d57db8a57 100755
--- a/packages/Webkul/Core/src/Http/Controllers/SliderController.php
+++ b/packages/Webkul/Core/src/Http/Controllers/SliderController.php
@@ -55,9 +55,7 @@ class SliderController extends Controller
      */
     public function create()
     {
-        $channels = core()->getAllChannels();
-
-        $locale = request()->get('locale') ?: core()->getCurrentLocale();
+        $locale = core()->getRequestedLocaleCode();
 
         return view($this->_config['view'])->with("locale", $locale);
     }
diff --git a/packages/Webkul/Core/src/Http/helpers.php b/packages/Webkul/Core/src/Http/helpers.php
index 3732ed2d5..0c92807b4 100755
--- a/packages/Webkul/Core/src/Http/helpers.php
+++ b/packages/Webkul/Core/src/Http/helpers.php
@@ -1,48 +1,51 @@
 <?php
-    use Webkul\Core\Core;
 
-    if (! function_exists('core')) {
-        function core()
-        {
-            return app()->make(Core::class);
-        }
+if (! function_exists('core')) {
+    /**
+     * Core helper.
+     *
+     * @return \Webkul\Core\Core
+     */
+    function core()
+    {
+        return app()->make(\Webkul\Core\Core::class);
     }
+}
 
-    if (! function_exists('array_permutation')) {
-        function array_permutation($input)
-        {
-            $results = [];
+if (! function_exists('array_permutation')) {
+    function array_permutation($input)
+    {
+        $results = [];
 
-            foreach ($input as $key => $values) {
-                if (empty($values)) {
-                    continue;
-                }
-
-                if (empty($results)) {
-                    foreach ($values as $value) {
-                        $results[] = [$key => $value];
-                    }
-                } else {
-                    $append = [];
-
-                    foreach ($results as &$result) {
-                        $result[$key] = array_shift($values);
-
-                        $copy = $result;
-
-                        foreach ($values as $item) {
-                            $copy[$key] = $item;
-                            $append[] = $copy;
-                        }
-
-                        array_unshift($values, $result[$key]);
-                    }
-
-                    $results = array_merge($results, $append);
-                }
+        foreach ($input as $key => $values) {
+            if (empty($values)) {
+                continue;
             }
 
-            return $results;
+            if (empty($results)) {
+                foreach ($values as $value) {
+                    $results[] = [$key => $value];
+                }
+            } else {
+                $append = [];
+
+                foreach ($results as &$result) {
+                    $result[$key] = array_shift($values);
+
+                    $copy = $result;
+
+                    foreach ($values as $item) {
+                        $copy[$key] = $item;
+                        $append[] = $copy;
+                    }
+
+                    array_unshift($values, $result[$key]);
+                }
+
+                $results = array_merge($results, $append);
+            }
         }
+
+        return $results;
     }
-?>
\ No newline at end of file
+}
diff --git a/packages/Webkul/Product/src/Helpers/AbstractProduct.php b/packages/Webkul/Product/src/Helpers/AbstractProduct.php
index d016bfcec..b777b3632 100755
--- a/packages/Webkul/Product/src/Helpers/AbstractProduct.php
+++ b/packages/Webkul/Product/src/Helpers/AbstractProduct.php
@@ -25,9 +25,9 @@ abstract class AbstractProduct
      */
     public function applyChannelLocaleFilter($attribute, $qb, $alias = 'product_attribute_values')
     {
-        $channel = request()->get('channel') ?: (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode());
+        $channel = core()->getRequestedChannelCode();
 
-        $locale = request()->get('locale') ?: app()->getLocale();
+        $locale = core()->getRequestedLocaleCode();
 
         if ($attribute->value_per_channel) {
             if ($attribute->value_per_locale) {
diff --git a/packages/Webkul/Product/src/Models/ProductDownloadableLink.php b/packages/Webkul/Product/src/Models/ProductDownloadableLink.php
index 2105ab0fe..88bf361c5 100644
--- a/packages/Webkul/Product/src/Models/ProductDownloadableLink.php
+++ b/packages/Webkul/Product/src/Models/ProductDownloadableLink.php
@@ -75,7 +75,7 @@ class ProductDownloadableLink extends TranslatableModel implements ProductDownlo
     {
         $array = parent::toArray();
 
-        $translation = $this->translate(request()->get('locale') ?: app()->getLocale());
+        $translation = $this->translate(core()->getRequestedLocaleCode());
 
         $array['title'] = $translation ? $translation->title : '';
 
diff --git a/packages/Webkul/Product/src/Models/ProductDownloadableSample.php b/packages/Webkul/Product/src/Models/ProductDownloadableSample.php
index 9a373635d..d7ebd2c3e 100644
--- a/packages/Webkul/Product/src/Models/ProductDownloadableSample.php
+++ b/packages/Webkul/Product/src/Models/ProductDownloadableSample.php
@@ -52,8 +52,7 @@ class ProductDownloadableSample extends TranslatableModel implements ProductDown
     {
         $array = parent::toArray();
 
-
-        $translation = $this->translate(request()->get('locale') ?: app()->getLocale());
+        $translation = $this->translate(core()->getRequestedLocaleCode());
 
         $array['title'] = $translation ? $translation->title : '';
 
diff --git a/packages/Webkul/Product/src/Repositories/ProductRepository.php b/packages/Webkul/Product/src/Repositories/ProductRepository.php
index 3e0a6b62d..29f3dd81b 100755
--- a/packages/Webkul/Product/src/Repositories/ProductRepository.php
+++ b/packages/Webkul/Product/src/Repositories/ProductRepository.php
@@ -149,9 +149,9 @@ class ProductRepository extends Repository
         $page = Paginator::resolveCurrentPage('page');
 
         $repository = app(ProductFlatRepository::class)->scopeQuery(function ($query) use ($params, $categoryId) {
-            $channel = request()->get('channel') ?: (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode());
+            $channel = core()->getRequestedChannelCode();
 
-            $locale = request()->get('locale') ?: app()->getLocale();
+            $locale = core()->getRequestedLocaleCode();
 
             $qb = $query->distinct()
                 ->select('product_flat.*')
@@ -375,9 +375,9 @@ class ProductRepository extends Repository
         $count = core()->getConfigData('catalog.products.homepage.no_of_new_product_homepage');
 
         $results = app(ProductFlatRepository::class)->scopeQuery(function ($query) {
-            $channel = request()->get('channel') ?: (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode());
+            $channel = core()->getRequestedChannelCode();
 
-            $locale = request()->get('locale') ?: app()->getLocale();
+            $locale = core()->getRequestedLocaleCode();
 
             return $query->distinct()
                 ->addSelect('product_flat.*')
@@ -402,9 +402,9 @@ class ProductRepository extends Repository
         $count = core()->getConfigData('catalog.products.homepage.no_of_featured_product_homepage');
 
         $results = app(ProductFlatRepository::class)->scopeQuery(function ($query) {
-            $channel = request()->get('channel') ?: (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode());
+            $channel = core()->getRequestedChannelCode();
 
-            $locale = request()->get('locale') ?: app()->getLocale();
+            $locale = core()->getRequestedLocaleCode();
 
             return $query->distinct()
                 ->addSelect('product_flat.*')
@@ -428,9 +428,9 @@ class ProductRepository extends Repository
      */
     public function searchProductByAttribute($term)
     {
-        $channel = request()->get('channel') ?: (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode());
+        $channel = core()->getRequestedChannelCode();
 
-        $locale = request()->get('locale') ?: app()->getLocale();
+        $locale = core()->getRequestedLocaleCode();
 
         if (config('scout.driver') == 'algolia') {
             $results = app(ProductFlatRepository::class)->getModel()::search('query', function ($searchDriver, string $query, array $options) use ($term, $channel, $locale) {
@@ -529,9 +529,9 @@ class ProductRepository extends Repository
     public function searchSimpleProducts($term)
     {
         return app(ProductFlatRepository::class)->scopeQuery(function ($query) use ($term) {
-            $channel = request()->get('channel') ?: (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode());
+            $channel = core()->getRequestedChannelCode();
 
-            $locale = request()->get('locale') ?: app()->getLocale();
+            $locale = core()->getRequestedLocaleCode();
 
             return $query->distinct()
                 ->addSelect('product_flat.*')
diff --git a/packages/Webkul/Shop/src/Http/Middleware/Locale.php b/packages/Webkul/Shop/src/Http/Middleware/Locale.php
index 4da88e99d..444af2e53 100755
--- a/packages/Webkul/Shop/src/Http/Middleware/Locale.php
+++ b/packages/Webkul/Shop/src/Http/Middleware/Locale.php
@@ -29,7 +29,7 @@ class Locale
     */
     public function handle($request, Closure $next)
     {
-        $locale = request()->get('locale');
+        $locale = core()->getRequestedLocaleCode('locale', false);
 
         if ($locale) {
             if ($this->locale->findOneByField('code', $locale)) {
diff --git a/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php b/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php
index 8bcfacca9..f3bfe154f 100644
--- a/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php
@@ -2,7 +2,7 @@
     $attributeRepository = app('\Webkul\Attribute\Repositories\AttributeFamilyRepository');
     $comparableAttributes = $attributeRepository->getComparableAttributesBelongsToFamily();
 
-    $locale = request()->get('locale') ?: app()->getLocale();
+    $locale = core()->getRequestedLocaleCode();
 
     $attributeOptionTranslations = DB::table('attribute_option_translations')->where('locale', $locale)->get()->toJson();
 @endphp
diff --git a/packages/Webkul/Ui/src/DataGrid/Traits/ProvideDataGridPlus.php b/packages/Webkul/Ui/src/DataGrid/Traits/ProvideDataGridPlus.php
index d5bb126b8..fadcb395a 100644
--- a/packages/Webkul/Ui/src/DataGrid/Traits/ProvideDataGridPlus.php
+++ b/packages/Webkul/Ui/src/DataGrid/Traits/ProvideDataGridPlus.php
@@ -85,9 +85,9 @@ trait ProvideDataGridPlus
         $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');
+        $locale = core()->getRequestedLocaleCode();
+        $channel = core()->getRequestedChannelCode();
+        $customer_group = core()->getRequestedCustomerGroupCode();
 
         /* handling cases for new locale if not present in current channel */
         if ($channel !== 'all') {
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 cafec64ef..cffd90e04 100644
--- a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php
+++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php
@@ -3,9 +3,9 @@
     $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');
+    $locale = core()->getRequestedLocaleCode();
+    $channel = core()->getRequestedChannelCode();
+    $customer_group = core()->getRequestedCustomerGroupCode();
 
     /* handling cases for new locale if not present in current channel */
     if ($channel !== 'all') {
diff --git a/packages/Webkul/Velocity/src/Helpers/Helper.php b/packages/Webkul/Velocity/src/Helpers/Helper.php
index e968d4427..0f31f452c 100644
--- a/packages/Webkul/Velocity/src/Helpers/Helper.php
+++ b/packages/Webkul/Velocity/src/Helpers/Helper.php
@@ -205,11 +205,11 @@ class Helper extends Review
         }
 
         if (! $locale) {
-            $locale = request()->get('locale') ?: app()->getLocale();
+            $locale = core()->getRequestedLocaleCode();
         }
 
         if (! $channel) {
-            $channel = request()->get('channel') ?: core()->getCurrentChannelCode() ?: 'default';
+            $channel = core()->getRequestedChannelCode();
         }
 
         try {
diff --git a/packages/Webkul/Velocity/src/Repositories/ContentRepository.php b/packages/Webkul/Velocity/src/Repositories/ContentRepository.php
index 818804be1..3d807af71 100644
--- a/packages/Webkul/Velocity/src/Repositories/ContentRepository.php
+++ b/packages/Webkul/Velocity/src/Repositories/ContentRepository.php
@@ -98,7 +98,7 @@ class ContentRepository extends Repository
     {
         $results = [];
 
-        $locale = request()->get('locale') ?: app()->getLocale();
+        $locale = core()->getRequestedLocaleCode();
 
         $content = $this->model->find($id);
 
diff --git a/packages/Webkul/Velocity/src/Repositories/Product/ProductRepository.php b/packages/Webkul/Velocity/src/Repositories/Product/ProductRepository.php
index f1ba15725..e9b766c48 100644
--- a/packages/Webkul/Velocity/src/Repositories/Product/ProductRepository.php
+++ b/packages/Webkul/Velocity/src/Repositories/Product/ProductRepository.php
@@ -56,9 +56,9 @@ class ProductRepository extends Repository
     public function getFeaturedProducts($count)
     {
         $results = app(ProductFlatRepository::class)->scopeQuery(function($query) {
-            $channel = request()->get('channel') ?: (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode());
+            $channel = core()->getRequestedChannelCode();
 
-            $locale = request()->get('locale') ?: app()->getLocale();
+            $locale = core()->getRequestedLocaleCode();
 
             return $query->distinct()
                          ->addSelect('product_flat.*')
@@ -82,9 +82,9 @@ class ProductRepository extends Repository
     public function getNewProducts($count)
     {
         $results = app(ProductFlatRepository::class)->scopeQuery(function($query) {
-            $channel = request()->get('channel') ?: (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode());
+            $channel = core()->getRequestedChannelCode();
 
-            $locale = request()->get('locale') ?: app()->getLocale();
+            $locale = core()->getRequestedLocaleCode();
 
             return $query->distinct()
                          ->addSelect('product_flat.*')
@@ -112,9 +112,9 @@ class ProductRepository extends Repository
         $categoryId = $params['category'] ?? '';
 
         $results = app(ProductFlatRepository::class)->scopeQuery(function($query) use($term, $categoryId, $params) {
-            $channel = request()->get('channel') ?: (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode());
+            $channel = core()->getRequestedChannelCode();
 
-            $locale = request()->get('locale') ?: app()->getLocale();
+            $locale = core()->getRequestedLocaleCode();
 
             if (! core()->getConfigData('catalog.products.homepage.out_of_stock_items')) {
                 $query = app('Webkul\Product\Repositories\ProductRepository')->checkOutOfStockItem($query);
diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/content/create.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/content/create.blade.php
index 0f19462bd..2569e3db1 100644
--- a/packages/Webkul/Velocity/src/Resources/views/admin/content/create.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/admin/content/create.blade.php
@@ -7,7 +7,7 @@
 @section('content')
     <div class="content">
 
-        <?php $locale = request()->get('locale') ?: app()->getLocale(); ?>
+        @php $locale = core()->getRequestedLocaleCode(); @endphp
 
         <form method="POST" action="" @submit.prevent="onSubmit" enctype="multipart/form-data">
 
diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/content/edit.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/content/edit.blade.php
index 330b545d2..5df3ce7c0 100644
--- a/packages/Webkul/Velocity/src/Resources/views/admin/content/edit.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/admin/content/edit.blade.php
@@ -7,7 +7,7 @@
 @section('content')
     <div class="content">
         @php
-            $locale = request()->get('locale') ?: app()->getLocale();
+            $locale = core()->getRequestedLocaleCode();
             $translation = $content->translations->where('locale', $locale)->first();
         @endphp
 
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/coupon.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/coupon.blade.php
index 6d4ad411d..7820dafaf 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/coupon.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/coupon.blade.php
@@ -42,7 +42,7 @@
                     error_message: '',
                     applied_coupon: "{{ $cart->coupon_code }}",
                     route_name: "{{ request()->route()->getName() }}",
-                    disable_button: ("{{ $cart->coupon_code }}" == "" ? false : true),
+                    disable_button: false,
                 }
             },
 
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/guest/compare/compare-products.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/guest/compare/compare-products.blade.php
index 296dae42f..42934c125 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/guest/compare/compare-products.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/guest/compare/compare-products.blade.php
@@ -2,7 +2,7 @@
     $attributeRepository = app('\Webkul\Attribute\Repositories\AttributeFamilyRepository');
     $comparableAttributes = $attributeRepository->getComparableAttributesBelongsToFamily();
 
-    $locale = request()->get('locale') ?: app()->getLocale();
+    $locale = core()->getRequestedLocaleCode();
 
     $attributeOptionTranslations = app('\Webkul\Attribute\Repositories\AttributeOptionTranslationRepository')->where('locale', $locale)->get()->toJson();
 @endphp