From d66438289a29a74a8b2e2b4ca3c5d62040b5b447 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Fri, 12 Feb 2021 20:08:35 +0530 Subject: [PATCH] Core Config Check Added --- packages/Webkul/Core/src/Core.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/Webkul/Core/src/Core.php b/packages/Webkul/Core/src/Core.php index 16c174c1d..bb2a03f3e 100755 --- a/packages/Webkul/Core/src/Core.php +++ b/packages/Webkul/Core/src/Core.php @@ -709,6 +709,12 @@ class Core if (null === $locale) { $locale = request()->get('locale') ?: app()->getLocale(); + + $channelLocales = $this->channelRepository->findOneByField('code', $channel)->locales; + + if (! $channelLocales->contains('code', $locale)) { + $locale = config('app.fallback_locale'); + } } $fields = $this->getConfigField($field);