merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3226 from shubhwebkul/patch-1 

velocity meta data locale support updates
This commit is contained in:
Jitendra Singh 2020-06-12 14:17:39 +05:30 committed by GitHub
parent 1aec1b0f2c ab2f3193d3
commit 7d350178ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/Webkul/Velocity/src/Helpers/Helper.php
View File

@ -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'
]);

2
packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php
View File

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

4
packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php
View File

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

12
packages/Webkul/Velocity/src/Resources/views/shop/layouts/master.blade.php
View File

@ -1,3 +1,10 @@
@php
$velocityHelper = app('Webkul\Velocity\Helpers\Helper');
$velocityMetaData = $velocityHelper->getVelocityMetaData();
view()->share('velocityMetaData', $velocityMetaData);
@endphp
<!DOCTYPE html>
<html lang="{{ app()->getLocale() }}">
@ -76,11 +83,6 @@
<div class="main-content-wrapper col-12 no-padding">
@php
$velocityContent = app('Webkul\Velocity\Repositories\ContentRepository')->getAllContents();
$velocityHelper = app('Webkul\Velocity\Helpers\Helper');
$velocityMetaData = $velocityHelper->getVelocityMetaData();
view()->share('velocityMetaData', $velocityMetaData);
@endphp
<content-header