All Locales Request Are Not Centralized In Core Method

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;
     }

packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php

@@ -30,7 +30,7 @@ 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());

packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php

@@ -31,7 +31,7 @@ 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());

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">
 

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">
 

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">

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">

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">

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
-      <?php $channel = request()->get('channel') ?: null; ?>
+            $locale = core()->getRequestedLocaleCode();
+            $channel = request()->get('channel') ?: null;
+        @endphp
 
         <div class="page-header">
             <div class="page-title">

packages/Webkul/CMS/src/Http/Controllers/Admin/PageController.php

@@ -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) {

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) {

packages/Webkul/Category/src/Repositories/CategoryRepository.php

@@ -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());
 

packages/Webkul/Core/src/Core.php

@@ -796,7 +796,7 @@ class Core
             }
 
             if (null === $locale) {
-                $locale = request()->get('locale') ?: app()->getLocale();
+                $locale = $this->getRequestedLocaleCode();
             }
 
             $loadedConfigs[$field] = $coreConfigValue = $this->getCoreConfigValue($field, $channel, $locale);

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 */

packages/Webkul/Core/src/Http/Controllers/SliderController.php

@@ -55,9 +55,7 @@ class SliderController extends Controller
      */
     public function create()
     {
-        $channels = core()->getAllChannels();
+        $locale = core()->getRequestedLocaleCode();
-
-        $locale = request()->get('locale') ?: core()->getCurrentLocale();
 
         return view($this->_config['view'])->with("locale", $locale);
     }

packages/Webkul/Core/src/Http/helpers.php

@@ -1,48 +1,51 @@
 <?php
-    use Webkul\Core\Core;
 
-    if (! function_exists('core')) {
+if (! function_exists('core')) {
-        function core()
+    /**
-        {
+     * Core helper.
-            return app()->make(Core::class);
+     *
-        }
+     * @return \Webkul\Core\Core
+     */
+    function core()
+    {
+        return app()->make(\Webkul\Core\Core::class);
     }
+}
 
-    if (! function_exists('array_permutation')) {
+if (! function_exists('array_permutation')) {
-        function array_permutation($input)
+    function array_permutation($input)
-        {
+    {
-            $results = [];
+        $results = [];
 
-            foreach ($input as $key => $values) {
+        foreach ($input as $key => $values) {
-                if (empty($values)) {
+            if (empty($values)) {
-                    continue;
+                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);
-                }
             }
 
-            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;
     }
-?>
+}

packages/Webkul/Product/src/Helpers/AbstractProduct.php

@@ -27,7 +27,7 @@ abstract class AbstractProduct
     {
         $channel = request()->get('channel') ?: (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode());
 
-        $locale = request()->get('locale') ?: app()->getLocale();
+        $locale = core()->getRequestedLocaleCode();
 
         if ($attribute->value_per_channel) {
             if ($attribute->value_per_locale) {

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 : '';
 

packages/Webkul/Product/src/Models/ProductDownloadableSample.php

@@ -52,8 +52,7 @@ class ProductDownloadableSample extends TranslatableModel implements ProductDown
     {
         $array = parent::toArray();
 
-
+        $translation = $this->translate(core()->getRequestedLocaleCode());
-        $translation = $this->translate(request()->get('locale') ?: app()->getLocale());
 
         $array['title'] = $translation ? $translation->title : '';
 

packages/Webkul/Product/src/Repositories/ProductRepository.php

@@ -151,7 +151,7 @@ class ProductRepository extends Repository
         $repository = app(ProductFlatRepository::class)->scopeQuery(function ($query) use ($params, $categoryId) {
             $channel = request()->get('channel') ?: (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode());
 
-            $locale = request()->get('locale') ?: app()->getLocale();
+            $locale = core()->getRequestedLocaleCode();
 
             $qb = $query->distinct()
                 ->select('product_flat.*')
@@ -377,7 +377,7 @@ class ProductRepository extends Repository
         $results = app(ProductFlatRepository::class)->scopeQuery(function ($query) {
             $channel = request()->get('channel') ?: (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode());
 
-            $locale = request()->get('locale') ?: app()->getLocale();
+            $locale = core()->getRequestedLocaleCode();
 
             return $query->distinct()
                 ->addSelect('product_flat.*')
@@ -404,7 +404,7 @@ class ProductRepository extends Repository
         $results = app(ProductFlatRepository::class)->scopeQuery(function ($query) {
             $channel = request()->get('channel') ?: (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode());
 
-            $locale = request()->get('locale') ?: app()->getLocale();
+            $locale = core()->getRequestedLocaleCode();
 
             return $query->distinct()
                 ->addSelect('product_flat.*')
@@ -430,7 +430,7 @@ class ProductRepository extends Repository
     {
         $channel = request()->get('channel') ?: (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode());
 
-        $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) {
@@ -531,7 +531,7 @@ class ProductRepository extends Repository
         return app(ProductFlatRepository::class)->scopeQuery(function ($query) use ($term) {
             $channel = request()->get('channel') ?: (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode());
 
-            $locale = request()->get('locale') ?: app()->getLocale();
+            $locale = core()->getRequestedLocaleCode();
 
             return $query->distinct()
                 ->addSelect('product_flat.*')

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();
 
         if ($locale) {
             if ($this->locale->findOneByField('code', $locale)) {

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

packages/Webkul/Ui/src/DataGrid/Traits/ProvideDataGridPlus.php

@@ -85,7 +85,7 @@ trait ProvideDataGridPlus
         $locales = core()->getAllLocales();
 
         /* request and fallback handling */
-        $locale = request()->get('locale') ?: app()->getLocale();
+        $locale = core()->getRequestedLocaleCode();
         $channel = request()->get('channel') ?: (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode());
         $customer_group = request()->get('customer_group');
 

packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php

@@ -3,7 +3,7 @@
     $locales = core()->getAllLocales();
 
     /* request and fallback handling */
-    $locale = request()->get('locale') ?: app()->getLocale();
+    $locale = core()->getRequestedLocaleCode();
     $channel = request()->get('channel') ?: (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode());
     $customer_group = request()->get('customer_group');
 

packages/Webkul/Velocity/src/Helpers/Helper.php

@@ -187,7 +187,7 @@ class Helper extends Review
         }
 
         if (! $locale) {
-            $locale = request()->get('locale') ?: app()->getLocale();
+            $locale = core()->getRequestedLocaleCode();
         }
 
         if (! $channel) {

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);
 

packages/Webkul/Velocity/src/Repositories/Product/ProductRepository.php

@@ -58,7 +58,7 @@ class ProductRepository extends Repository
         $results = app(ProductFlatRepository::class)->scopeQuery(function($query) {
             $channel = request()->get('channel') ?: (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode());
 
-            $locale = request()->get('locale') ?: app()->getLocale();
+            $locale = core()->getRequestedLocaleCode();
 
             return $query->distinct()
                          ->addSelect('product_flat.*')
@@ -84,7 +84,7 @@ class ProductRepository extends Repository
         $results = app(ProductFlatRepository::class)->scopeQuery(function($query) {
             $channel = request()->get('channel') ?: (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode());
 
-            $locale = request()->get('locale') ?: app()->getLocale();
+            $locale = core()->getRequestedLocaleCode();
 
             return $query->distinct()
                          ->addSelect('product_flat.*')
@@ -114,7 +114,7 @@ class ProductRepository extends Repository
         $results = app(ProductFlatRepository::class)->scopeQuery(function($query) use($term, $categoryId, $params) {
             $channel = request()->get('channel') ?: (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode());
 
-            $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);

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">
 

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
 

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