From ee4c50add4c6afbd80d7ec956029f892c3749aed Mon Sep 17 00:00:00 2001
From: Devansh <devansh.bawari419@webkul.com>
Date: Sat, 15 Aug 2020 11:16:19 +0530
Subject: [PATCH 1/4] Channel Wise Issue Fixed

---
 .../views/admin/meta-info/meta-data.blade.php         | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php
index 75522d3b7..4d45e85f0 100644
--- a/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php
@@ -5,7 +5,7 @@
 @stop
 
 @php
-    $locale = request()->get('locale') ?: app()->getLocale();
+    $locale = request()->get('locale') ?: 'en';
 @endphp
 
 @section('content')
@@ -62,7 +62,7 @@
                                 class="control"
                                 data-vv-as="&quot;slides&quot;"
                                 {{ $metaData && $metaData->slider ? 'checked' : ''}} />
-                                
+
                             <span class="slider round"></span>
                         </label>
                     </div>
@@ -123,7 +123,7 @@
                     </div>
 
                     <div class="control-group">
-                        <label style="width:100%;">{{ __('velocity::app.admin.meta-data.product-policy') }} <span class="locale">[{{ $metaData ? $metaData->locale : 'en' }}]</span></label>                        
+                        <label style="width:100%;">{{ __('velocity::app.admin.meta-data.product-policy') }} <span class="locale">[{{ $metaData ? $metaData->locale : 'en' }}]</span></label>
 
                         <textarea
                             class="control"
@@ -149,10 +149,9 @@
                             ];
 
                             $index = 0;
-                            $currentLocale = request()->get('locale') ?: core()->getCurrentLocale();
-                            
+
                             foreach ($metaData->get('locale')->all() as $key => $value) {
-                                if ($value->locale == $currentLocale) {
+                                if ($value->locale == $locale) {
                                     $index = $key;
                                 }
                             }

From 75e3df73dfaf7d8d2eff46ed6ebb67225d6c0830 Mon Sep 17 00:00:00 2001
From: Devansh <devansh.bawari419@webkul.com>
Date: Mon, 17 Aug 2020 11:28:12 +0530
Subject: [PATCH 2/4] Channel Wise Data Done

---
 ...dd_channel_to_velocity_meta_data_table.php | 32 +++++++++++++++
 .../Webkul/Velocity/src/Helpers/Helper.php    | 16 +++++---
 .../Admin/ConfigurationController.php         | 39 ++++++++++++-------
 .../views/admin/meta-info/meta-data.blade.php | 16 +++++++-
 4 files changed, 82 insertions(+), 21 deletions(-)
 create mode 100644 packages/Webkul/Velocity/src/Database/Migrations/2020_08_17_104228_add_channel_to_velocity_meta_data_table.php

diff --git a/packages/Webkul/Velocity/src/Database/Migrations/2020_08_17_104228_add_channel_to_velocity_meta_data_table.php b/packages/Webkul/Velocity/src/Database/Migrations/2020_08_17_104228_add_channel_to_velocity_meta_data_table.php
new file mode 100644
index 000000000..ae064713a
--- /dev/null
+++ b/packages/Webkul/Velocity/src/Database/Migrations/2020_08_17_104228_add_channel_to_velocity_meta_data_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddChannelToVelocityMetaDataTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('velocity_meta_data', function (Blueprint $table) {
+            $table->text('channel')->after('locale');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('velocity_meta_data', function (Blueprint $table) {
+            //
+        });
+    }
+}
diff --git a/packages/Webkul/Velocity/src/Helpers/Helper.php b/packages/Webkul/Velocity/src/Helpers/Helper.php
index 0a93ecb19..a93073959 100644
--- a/packages/Webkul/Velocity/src/Helpers/Helper.php
+++ b/packages/Webkul/Velocity/src/Helpers/Helper.php
@@ -214,20 +214,26 @@ class Helper extends Review
      *
      * @return array
      */
-    public function getVelocityMetaData($locale = null, $default = true)
+    public function getVelocityMetaData($locale = null, $channel = null, $default = true)
     {
         if (! $locale) {
             $locale = request()->get('locale') ?: app()->getLocale();
         }
 
+        if (! $channel) {
+            $channel = request()->get('channel') ?: 'default';
+        }
+
         try {
             $metaData = $this->velocityMetadataRepository->findOneWhere([
-                'locale' => $locale
+                'locale' => $locale,
+                'channel' => $channel
             ]);
 
             if (! $metaData && $default) {
                 $metaData = $this->velocityMetadataRepository->findOneWhere([
-                    'locale' => 'en'
+                    'locale' => 'en',
+                    'channel' => 'default'
                 ]);
             }
 
@@ -295,7 +301,7 @@ class Helper extends Review
      * @param  \Webkul\Product\Contracts\Product  $product
      * @param  bool                               $list
      * @param  array                              $metaInformation
-     * 
+     *
      * @return array
      */
     public function formatProduct($product, $list = false, $metaInformation = [])
@@ -398,7 +404,7 @@ class Helper extends Review
                 }
             }
         }
-    
+
         return $productCollection;
     }
 }
diff --git a/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php b/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php
index e2fc51f8e..f2eff00ac 100644
--- a/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php
+++ b/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php
@@ -15,8 +15,16 @@ class ConfigurationController extends Controller
      */
     protected $velocityMetaDataRepository;
 
+    /**
+     * Locale
+     */
     protected $locale;
 
+    /**
+     * Channel
+     */
+    protected $channel;
+
     /**
      * Create a new controller instance.
      *
@@ -28,10 +36,10 @@ class ConfigurationController extends Controller
         $this->_config = request('_config');
 
         $this->velocityHelper = app('Webkul\Velocity\Helpers\Helper');
-
         $this->velocityMetaDataRepository = $velocityMetadataRepository;
 
         $this->locale = request()->get('locale') ?: app()->getLocale();
+        $this->channel = request()->get('channel') ?: 'default';
     }
 
     /**
@@ -39,12 +47,12 @@ class ConfigurationController extends Controller
      */
     public function renderMetaData()
     {
-        $velocityMetaData = $this->velocityHelper->getVelocityMetaData($this->locale, false);
+        $velocityMetaData = $this->velocityHelper->getVelocityMetaData($this->locale, $this->channel, false);
 
         if (! $velocityMetaData) {
-            $this->createMetaData($this->locale);
+            $this->createMetaData($this->locale, $this->channel);
 
-            $velocityMetaData = $this->velocityHelper->getVelocityMetaData($this->locale);
+            $velocityMetaData = $this->velocityHelper->getVelocityMetaData($this->locale, $this->channel);
         }
 
         $velocityMetaData->advertisement = $this->manageAddImages(json_decode($velocityMetaData->advertisement, true) ?: []);
@@ -112,7 +120,7 @@ class ConfigurationController extends Controller
         unset($params['slides']);
 
         $params['locale'] = $this->locale;
-        
+
         // update row
         $product = $this->velocityMetaDataRepository->update($params, $id);
 
@@ -125,7 +133,7 @@ class ConfigurationController extends Controller
      * @param  array    $data
      * @param  int      $index
      * @param  array    $advertisement
-     * 
+     *
      * @return array
      */
     public function uploadAdvertisementImages($data, $index, $advertisement)
@@ -138,13 +146,13 @@ class ConfigurationController extends Controller
             if ($image != "") {
                 $file = 'images.' . $index . '.' . $imageId;
                 $dir = 'velocity/images';
-    
+
                 if (Str::contains($imageId, 'image_')) {
                     if (request()->hasFile($file) && $image) {
                         $filter_index = substr($imageId, 6, 1);
                         if ( isset($data[$filter_index]) ) {
                             $size = array_key_last($saveData[$index]);
-                            
+
                             $saveImage[$size + 1] = request()->file($file)->store($dir);
                         } else {
                             $saveImage[substr($imageId, 6, 1)] = request()->file($file)->store($dir);
@@ -153,13 +161,13 @@ class ConfigurationController extends Controller
                 } else {
                     if ( isset($advertisement[$index][$imageId]) && $advertisement[$index][$imageId] && !request()->hasFile($file)) {
                         $saveImage[$imageId] = $advertisement[$index][$imageId];
-    
+
                         unset($advertisement[$index][$imageId]);
                     }
-    
+
                     if (request()->hasFile($file) && isset($advertisement[$index][$imageId])) {
                         Storage::delete($advertisement[$index][$imageId]);
-    
+
                         $saveImage[$imageId] = request()->file($file)->store($dir);
                     }
                 }
@@ -192,7 +200,7 @@ class ConfigurationController extends Controller
     /**
      * @param  array    $data
      * @param  int      $index
-     * 
+     *
      * @return mixed
      */
     public function uploadImage($data, $index)
@@ -215,7 +223,7 @@ class ConfigurationController extends Controller
 
     /**
      * @param  array  $addImages
-     * 
+     *
      * @return array
      */
     public function manageAddImages($addImages)
@@ -236,14 +244,15 @@ class ConfigurationController extends Controller
                 ];
             }
         }
-        
+
         return $imagePaths;
     }
 
-    private function createMetaData($locale)
+    private function createMetaData($locale, $channel)
     {
         \DB::table('velocity_meta_data')->insert([
             'locale'                   => $locale,
+            'channel'                  => $channel,
 
             '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'),
diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php
index 4d45e85f0..20ccb15d9 100644
--- a/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php
@@ -6,6 +6,7 @@
 
 @php
     $locale = request()->get('locale') ?: 'en';
+    $channel = request()->get('channel') ?: 'default';
 @endphp
 
 @section('content')
@@ -29,12 +30,13 @@
                 </div>
 
                 <input type="hidden" name="locale" value="{{ $locale }}" />
+                <input type="hidden" name="channel" value="{{ $channel }}" />
 
                 <div class="control-group">
                     <select class="control" id="locale-switcher" onChange="window.location.href = this.value">
                         @foreach (core()->getAllLocales() as $localeModel)
 
-                            <option value="{{ route('velocity.admin.meta-data') . '?locale=' . $localeModel->code }}" {{ ($localeModel->code) == $locale ? 'selected' : '' }}>
+                            <option value="{{ route('velocity.admin.meta-data') . '?locale=' . $localeModel->code . '&channel=' . $channel }}" {{ ($localeModel->code) == $locale ? 'selected' : '' }}>
                                 {{ $localeModel->name }}
                             </option>
 
@@ -42,6 +44,18 @@
                     </select>
                 </div>
 
+                <div class="control-group">
+                    <select class="control" id="channel-switcher" onChange="window.location.href = this.value">
+                        @foreach (core()->getAllChannels() as $ch)
+
+                            <option value="{{ route('velocity.admin.meta-data') . '?channel=' . $ch->code . '&locale=' . $locale }}" {{ ($ch->code) == $channel ? 'selected' : '' }}>
+                                {{ $ch->name }}
+                            </option>
+
+                        @endforeach
+                    </select>
+                </div>
+
                 <div class="page-action">
                     <button type="submit" class="btn btn-lg btn-primary">
                         {{ __('velocity::app.admin.meta-data.update-meta-data') }}

From 46f4c43654829b06c9efd5dfe44d234856f11a1d Mon Sep 17 00:00:00 2001
From: Devansh <devansh.bawari419@webkul.com>
Date: Mon, 17 Aug 2020 12:40:21 +0530
Subject: [PATCH 3/4] Selected Channel Added

---
 .../views/admin/meta-info/meta-data.blade.php | 46 +++++++++++++------
 1 file changed, 33 insertions(+), 13 deletions(-)

diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php
index 20ccb15d9..743813538 100644
--- a/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php
@@ -33,11 +33,11 @@
                 <input type="hidden" name="channel" value="{{ $channel }}" />
 
                 <div class="control-group">
-                    <select class="control" id="locale-switcher" onChange="window.location.href = this.value">
-                        @foreach (core()->getAllLocales() as $localeModel)
+                    <select class="control" id="channel-switcher" onChange="window.location.href = this.value">
+                        @foreach (core()->getAllChannels() as $ch)
 
-                            <option value="{{ route('velocity.admin.meta-data') . '?locale=' . $localeModel->code . '&channel=' . $channel }}" {{ ($localeModel->code) == $locale ? 'selected' : '' }}>
-                                {{ $localeModel->name }}
+                            <option value="{{ route('velocity.admin.meta-data') . '?channel=' . $ch->code . '&locale=' . $locale }}" {{ ($ch->code) == $channel ? 'selected' : '' }}>
+                                {{ $ch->name }}
                             </option>
 
                         @endforeach
@@ -45,11 +45,11 @@
                 </div>
 
                 <div class="control-group">
-                    <select class="control" id="channel-switcher" onChange="window.location.href = this.value">
-                        @foreach (core()->getAllChannels() as $ch)
+                    <select class="control" id="locale-switcher" onChange="window.location.href = this.value">
+                        @foreach (core()->getAllLocales() as $localeModel)
 
-                            <option value="{{ route('velocity.admin.meta-data') . '?channel=' . $ch->code . '&locale=' . $locale }}" {{ ($ch->code) == $channel ? 'selected' : '' }}>
-                                {{ $ch->name }}
+                            <option value="{{ route('velocity.admin.meta-data') . '?locale=' . $localeModel->code . '&channel=' . $channel }}" {{ ($localeModel->code) == $locale ? 'selected' : '' }}>
+                                {{ $localeModel->name }}
                             </option>
 
                         @endforeach
@@ -126,7 +126,11 @@
                     </div>
 
                     <div class="control-group">
-                        <label style="width:100%;">{{ __('velocity::app.admin.meta-data.home-page-content') }} <span class="locale">[{{ $metaData ? $metaData->locale : 'en' }}]</span></label>
+                        <label style="width:100%;">
+                            {{ __('velocity::app.admin.meta-data.home-page-content') }}
+                            <span class="locale">[{{ $metaData ? $metaData->locale : 'en' }}]</span>
+                            <span class="locale">[{{ $metaData ? $metaData->channel : 'defualt' }}]</span>
+                        </label>
 
                         <textarea
                             class="control"
@@ -137,7 +141,11 @@
                     </div>
 
                     <div class="control-group">
-                        <label style="width:100%;">{{ __('velocity::app.admin.meta-data.product-policy') }} <span class="locale">[{{ $metaData ? $metaData->locale : 'en' }}]</span></label>
+                        <label style="width:100%;">
+                            {{ __('velocity::app.admin.meta-data.product-policy') }}
+                            <span class="locale">[{{ $metaData ? $metaData->locale : 'en' }}]</span>
+                            <span class="locale">[{{ $metaData ? $metaData->channel : 'defualt' }}]</span>
+                        </label>
 
                         <textarea
                             class="control"
@@ -253,7 +261,11 @@
             <accordian :title="'{{ __('velocity::app.admin.meta-data.footer') }}'" :active="false">
                 <div slot="body">
                     <div class="control-group">
-                        <label style="width:100%;">{{ __('velocity::app.admin.meta-data.subscription-content') }} <span class="locale">[{{ $metaData ? $metaData->locale : 'en' }}]</span></label>
+                        <label style="width:100%;">
+                            {{ __('velocity::app.admin.meta-data.subscription-content') }}
+                            <span class="locale">[{{ $metaData ? $metaData->locale : 'en' }}]</span>
+                            <span class="locale">[{{ $metaData ? $metaData->channel : 'defualt' }}]</span>
+                        </label>
 
                         <textarea
                             class="control"
@@ -264,7 +276,11 @@
                     </div>
 
                     <div class="control-group">
-                        <label style="width:100%;">{{ __('velocity::app.admin.meta-data.footer-left-content') }} <span class="locale">[{{ $metaData ? $metaData->locale : 'en' }}]</span></label>
+                        <label style="width:100%;">
+                            {{ __('velocity::app.admin.meta-data.footer-left-content') }}
+                            <span class="locale">[{{ $metaData ? $metaData->locale : 'en' }}]</span>
+                            <span class="locale">[{{ $metaData ? $metaData->channel : 'defualt' }}]</span>
+                        </label>
 
                         <textarea
                             class="control"
@@ -275,7 +291,11 @@
                     </div>
 
                     <div class="control-group">
-                        <label style="width:100%;">{{ __('velocity::app.admin.meta-data.footer-middle-content') }} <span class="locale">[{{ $metaData ? $metaData->locale : 'en' }}]</span></label>
+                        <label style="width:100%;">
+                            {{ __('velocity::app.admin.meta-data.footer-middle-content') }}
+                            <span class="locale">[{{ $metaData ? $metaData->locale : 'en' }}]</span>
+                            <span class="locale">[{{ $metaData ? $metaData->channel : 'defualt' }}]</span>
+                        </label>
 
                         <textarea
                             class="control"

From d575e0f30f9a9984f27777d260f32665173c59bc Mon Sep 17 00:00:00 2001
From: Devansh <devansh.bawari419@webkul.com>
Date: Mon, 17 Aug 2020 12:59:47 +0530
Subject: [PATCH 4/4] Minor Change Added

---
 .../views/admin/meta-info/meta-data.blade.php     | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php
index 743813538..95aaaf2a2 100644
--- a/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php
@@ -128,8 +128,7 @@
                     <div class="control-group">
                         <label style="width:100%;">
                             {{ __('velocity::app.admin.meta-data.home-page-content') }}
-                            <span class="locale">[{{ $metaData ? $metaData->locale : 'en' }}]</span>
-                            <span class="locale">[{{ $metaData ? $metaData->channel : 'defualt' }}]</span>
+                            <span class="locale">[{{ $metaData ? $metaData->channel : 'default' }} - {{ $metaData ? $metaData->locale : 'en' }}]</span>
                         </label>
 
                         <textarea
@@ -143,8 +142,7 @@
                     <div class="control-group">
                         <label style="width:100%;">
                             {{ __('velocity::app.admin.meta-data.product-policy') }}
-                            <span class="locale">[{{ $metaData ? $metaData->locale : 'en' }}]</span>
-                            <span class="locale">[{{ $metaData ? $metaData->channel : 'defualt' }}]</span>
+                            <span class="locale">[{{ $metaData ? $metaData->channel : 'default' }} - {{ $metaData ? $metaData->locale : 'en' }}]</span>
                         </label>
 
                         <textarea
@@ -263,8 +261,7 @@
                     <div class="control-group">
                         <label style="width:100%;">
                             {{ __('velocity::app.admin.meta-data.subscription-content') }}
-                            <span class="locale">[{{ $metaData ? $metaData->locale : 'en' }}]</span>
-                            <span class="locale">[{{ $metaData ? $metaData->channel : 'defualt' }}]</span>
+                            <span class="locale">[{{ $metaData ? $metaData->channel : 'default' }} - {{ $metaData ? $metaData->locale : 'en' }}]</span>
                         </label>
 
                         <textarea
@@ -278,8 +275,7 @@
                     <div class="control-group">
                         <label style="width:100%;">
                             {{ __('velocity::app.admin.meta-data.footer-left-content') }}
-                            <span class="locale">[{{ $metaData ? $metaData->locale : 'en' }}]</span>
-                            <span class="locale">[{{ $metaData ? $metaData->channel : 'defualt' }}]</span>
+                            <span class="locale">[{{ $metaData ? $metaData->channel : 'default' }} - {{ $metaData ? $metaData->locale : 'en' }}]</span>
                         </label>
 
                         <textarea
@@ -293,8 +289,7 @@
                     <div class="control-group">
                         <label style="width:100%;">
                             {{ __('velocity::app.admin.meta-data.footer-middle-content') }}
-                            <span class="locale">[{{ $metaData ? $metaData->locale : 'en' }}]</span>
-                            <span class="locale">[{{ $metaData ? $metaData->channel : 'defualt' }}]</span>
+                            <span class="locale">[{{ $metaData ? $metaData->channel : 'default' }} - {{ $metaData ? $metaData->locale : 'en' }}]</span>
                         </label>
 
                         <textarea