From 5b7bbb07ca6ffced43d0ec23ef102057a501494e Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Wed, 9 Jun 2021 12:02:10 +0530 Subject: [PATCH] Method Name Change For Understanding --- .../src/Resources/views/catalog/products/edit.blade.php | 2 +- .../Admin/src/Resources/views/configuration/index.blade.php | 2 +- packages/Webkul/Core/src/Core.php | 5 +++-- packages/Webkul/Product/src/Models/Product.php | 2 +- .../src/Http/Controllers/Admin/ConfigurationController.php | 4 ++-- .../src/Resources/views/admin/meta-info/meta-data.blade.php | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) 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 ccc2f3e28..43e31a9c3 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,7 +7,7 @@ @section('content')
@php - $locale = core()->checkRequestedLocaleInChannel(); + $locale = core()->checkRequestedLocaleCodeInRequestedChannel(); $channel = core()->getRequestedChannelCode(); $channelLocales = core()->getAllLocalesByRequestedChannelCode()['locales']; @endphp 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 c2641fe70..5d888fb8b 100755 --- a/packages/Webkul/Admin/src/Resources/views/configuration/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/configuration/index.blade.php @@ -7,7 +7,7 @@ @section('content')
@php - $locale = core()->checkRequestedLocaleInChannel(); + $locale = core()->checkRequestedLocaleCodeInRequestedChannel(); $channel = core()->getRequestedChannelCode(); $channelLocales = core()->getAllLocalesByRequestedChannelCode()['locales']; @endphp diff --git a/packages/Webkul/Core/src/Core.php b/packages/Webkul/Core/src/Core.php index bb2e1a04c..1cd219edb 100755 --- a/packages/Webkul/Core/src/Core.php +++ b/packages/Webkul/Core/src/Core.php @@ -324,11 +324,12 @@ class Core } /** - * Check requested locale in channel. If not found then set channel default locale. + * Check requested locale code in requested channel. If not found, + * then set channel default locale code. * * @return string */ - public function checkRequestedLocaleInChannel() + public function checkRequestedLocaleCodeInRequestedChannel() { $localeCode = $this->getRequestedLocaleCode(); diff --git a/packages/Webkul/Product/src/Models/Product.php b/packages/Webkul/Product/src/Models/Product.php index 9141deb60..84cd3b1d1 100755 --- a/packages/Webkul/Product/src/Models/Product.php +++ b/packages/Webkul/Product/src/Models/Product.php @@ -391,7 +391,7 @@ class Product extends Model implements ProductContract return; } - $locale = core()->checkRequestedLocaleInChannel(); + $locale = core()->checkRequestedLocaleCodeInRequestedChannel(); $channel = core()->getRequestedChannelCode(); if ($attribute->value_per_channel) { diff --git a/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php b/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php index 3b00e75ff..89f8bad7d 100644 --- a/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php +++ b/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php @@ -51,7 +51,7 @@ class ConfigurationController extends Controller */ public function renderMetaData() { - $locale = core()->checkRequestedLocaleInChannel(); + $locale = core()->checkRequestedLocaleCodeInRequestedChannel(); $channel = core()->getRequestedChannelCode(); @@ -78,7 +78,7 @@ class ConfigurationController extends Controller */ public function storeMetaData($id) { - $locale = core()->checkRequestedLocaleInChannel(); + $locale = core()->checkRequestedLocaleCodeInRequestedChannel(); /* check if radio button value */ if (request()->get('slides') == "on") { 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 0330fb0e7..62a540bac 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 @@ -5,7 +5,7 @@ @stop @php - $locale = core()->checkRequestedLocaleInChannel(); + $locale = core()->checkRequestedLocaleCodeInRequestedChannel(); $channel = core()->getRequestedChannelCode(); $channelLocales = core()->getAllLocalesByRequestedChannelCode()['locales']; @endphp