Merge pull request #3796 from shubhwebkul/patch-1

velocity meta content channel issue resolved
This commit is contained in:
Jitendra Singh 2020-08-19 17:07:58 +05:30 committed by GitHub
commit 0c1b9232fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions

View File

@ -19,8 +19,9 @@ class VelocityMetaDataSeeder extends Seeder
'id' => 1,
'locale' => 'en',
'home_page_content' => "<p>@include('shop::home.advertisements.advertisement-four')@include('shop::home.featured-products') @include('shop::home.product-policy') @include('shop::home.advertisements.advertisement-three') @include('shop::home.new-products') @include('shop::home.advertisements.advertisement-two')</p>",
'header_content_count' => "5",
'channel' => "default",
'home_page_content' => "<p>@include('shop::home.advertisements.advertisement-four')@include('shop::home.featured-products') @include('shop::home.product-policy') @include('shop::home.advertisements.advertisement-three') @include('shop::home.new-products') @include('shop::home.advertisements.advertisement-two')</p>",
'footer_left_content' => __('velocity::app.admin.meta-data.footer-left-raw-content'),
'footer_middle_content' => '<div class="col-lg-6 col-md-12 col-sm-12 no-padding"><ul type="none"><li><a href="https://webkul.com/about-us/company-profile/">About Us</a></li><li><a href="https://webkul.com/about-us/company-profile/">Customer Service</a></li><li><a href="https://webkul.com/about-us/company-profile/">What&rsquo;s New</a></li><li><a href="https://webkul.com/about-us/company-profile/">Contact Us </a></li></ul></div><div class="col-lg-6 col-md-12 col-sm-12 no-padding"><ul type="none"><li><a href="https://webkul.com/about-us/company-profile/"> Order and Returns </a></li><li><a href="https://webkul.com/about-us/company-profile/"> Payment Policy </a></li><li><a href="https://webkul.com/about-us/company-profile/"> Shipping Policy</a></li><li><a href="https://webkul.com/about-us/company-profile/"> Privacy and Cookies Policy </a></li></ul></div>',

View File

@ -130,7 +130,7 @@ class ContentRepository extends Repository
$query = $this->model::orderBy('position', 'ASC');
$velocityMetaData = app('Webkul\Velocity\Helpers\Helper')->getVelocityMetaData();
$headerContentCount = $velocityMetaData->header_content_count;
$headerContentCount = $velocityMetaData->header_content_count ?? '';
$headerContentCount = $headerContentCount != '' ? $headerContentCount : 5;