diff --git a/packages/Webkul/Velocity/src/Helpers/Helper.php b/packages/Webkul/Velocity/src/Helpers/Helper.php index c10c2ad50..92d5b86ff 100644 --- a/packages/Webkul/Velocity/src/Helpers/Helper.php +++ b/packages/Webkul/Velocity/src/Helpers/Helper.php @@ -214,7 +214,7 @@ class Helper extends Review * * @return array */ - public function getVelocityMetaData($locale = null) + public function getVelocityMetaData($locale = null, $default = true) { if (! $locale) { $locale = request()->get('locale') ?: app()->getLocale(); @@ -225,7 +225,7 @@ class Helper extends Review 'locale' => $locale ]); - if (! $metaData) { + if (! $metaData && $default) { $metaData = $this->velocityMetadataRepository->findOneWhere([ 'locale' => 'en' ]); diff --git a/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php b/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php index a5350a195..fb85bf2db 100644 --- a/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php +++ b/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php @@ -39,7 +39,7 @@ class ConfigurationController extends Controller */ public function renderMetaData() { - $velocityMetaData = $this->velocityHelper->getVelocityMetaData($this->locale); + $velocityMetaData = $this->velocityHelper->getVelocityMetaData($this->locale, false); if (! $velocityMetaData) { $this->createMetaData($this->locale); diff --git a/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php b/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php index c92cf6935..5ffc50aa4 100644 --- a/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php +++ b/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php @@ -96,7 +96,11 @@ class VelocityServiceProvider extends ServiceProvider */ private function loadGloableVariables() { + $velocityHelper = app('Webkul\Velocity\Helpers\Helper'); + $velocityMetaData = $velocityHelper->getVelocityMetaData(); + view()->share('showRecentlyViewed', true); + view()->share('velocityMetaData', $velocityMetaData); return true; } diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/layouts/master.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/layouts/master.blade.php index 9e790579f..26c119d3f 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/layouts/master.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/layouts/master.blade.php @@ -1,3 +1,10 @@ +@php + $velocityHelper = app('Webkul\Velocity\Helpers\Helper'); + $velocityMetaData = $velocityHelper->getVelocityMetaData(); + + view()->share('velocityMetaData', $velocityMetaData); +@endphp + @@ -76,11 +83,6 @@
@php $velocityContent = app('Webkul\Velocity\Repositories\ContentRepository')->getAllContents(); - - $velocityHelper = app('Webkul\Velocity\Helpers\Helper'); - $velocityMetaData = $velocityHelper->getVelocityMetaData(); - - view()->share('velocityMetaData', $velocityMetaData); @endphp