From c083775fa135919d2aea025289b50cff7df60c5b Mon Sep 17 00:00:00 2001
From: Shubham Mehrotra <shubh0896m@gmail.com>
Date: Wed, 19 Aug 2020 16:59:37 +0530
Subject: [PATCH] velocity meta content channel issue resolved

---
 .../Velocity/src/Database/Seeders/VelocityMetaDataSeeder.php   | 3 ++-
 .../Webkul/Velocity/src/Repositories/ContentRepository.php     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/Velocity/src/Database/Seeders/VelocityMetaDataSeeder.php b/packages/Webkul/Velocity/src/Database/Seeders/VelocityMetaDataSeeder.php
index 82db2ca38..fd06b8be2 100644
--- a/packages/Webkul/Velocity/src/Database/Seeders/VelocityMetaDataSeeder.php
+++ b/packages/Webkul/Velocity/src/Database/Seeders/VelocityMetaDataSeeder.php
@@ -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>',
diff --git a/packages/Webkul/Velocity/src/Repositories/ContentRepository.php b/packages/Webkul/Velocity/src/Repositories/ContentRepository.php
index c979384c1..1686dc2eb 100644
--- a/packages/Webkul/Velocity/src/Repositories/ContentRepository.php
+++ b/packages/Webkul/Velocity/src/Repositories/ContentRepository.php
@@ -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;