From 701d99e51c16365127060ffc98925b0bb0dd66a6 Mon Sep 17 00:00:00 2001
From: devansh bawari <devansh.bawari419@webkul.com>
Date: Tue, 8 Jun 2021 18:45:44 +0530
Subject: [PATCH] Velocity Meta Data Issue Fixed

---
 .../Webkul/Velocity/src/Helpers/Helper.php    |  2 +-
 .../Admin/ConfigurationController.php         | 49 ++++++++++---------
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/packages/Webkul/Velocity/src/Helpers/Helper.php b/packages/Webkul/Velocity/src/Helpers/Helper.php
index 51129aa4c..1dbc13e3e 100644
--- a/packages/Webkul/Velocity/src/Helpers/Helper.php
+++ b/packages/Webkul/Velocity/src/Helpers/Helper.php
@@ -176,7 +176,7 @@ class Helper extends Review
     /**
      * Returns the count rating of the product.
      *
-     * @return array
+     * @return \Webkul\Velocity\Repositories\VelocityMetadataRepository
      */
     public function getVelocityMetaData($locale = null, $channel = null, $default = true)
     {
diff --git a/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php b/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php
index 00b00015a..3b00e75ff 100644
--- a/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php
+++ b/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php
@@ -4,6 +4,7 @@ namespace Webkul\Velocity\Http\Controllers\Admin;
 
 use Illuminate\Support\Str;
 use Webkul\Core\Traits\Sanitizer;
+use Webkul\Velocity\Helpers\Helper;
 use Illuminate\Support\Facades\Storage;
 use Webkul\Velocity\Repositories\VelocityMetadataRepository;
 
@@ -12,17 +13,14 @@ class ConfigurationController extends Controller
     use Sanitizer;
 
     /**
-     * Locale
+     * Velocity helper instance.
+     *
+     * @var \Webkul\Velocity\Helpers\Helper
      */
-    protected $locale;
+    protected $velocityHelper;
 
     /**
-     * Channel
-     */
-    protected $channel;
-
-    /**
-     * VelocityMetadataRepository $velocityMetaDataRepository
+     * Velocity meta data repository intance.
      *
      * @var \Webkul\Velocity\Repositories\VelocityMetadataRepository
      */
@@ -34,15 +32,16 @@ class ConfigurationController extends Controller
      * @param  \Webkul\Velocity\Repositories\MetadataRepository  $velocityMetaDataRepository
      * @return void
      */
-    public function __construct (VelocityMetadataRepository $velocityMetadataRepository)
+    public function __construct (
+        Helper $velocityHelper,
+        VelocityMetadataRepository $velocityMetadataRepository
+    )
     {
         $this->_config = request('_config');
 
-        $this->velocityHelper = app('Webkul\Velocity\Helpers\Helper');
-        $this->velocityMetaDataRepository = $velocityMetadataRepository;
+        $this->velocityHelper = $velocityHelper;
 
-        $this->locale = core()->checkRequestedLocaleInChannel();
-        $this->channel = core()->getRequestedChannelCode();
+        $this->velocityMetaDataRepository = $velocityMetadataRepository;
     }
 
     /**
@@ -52,12 +51,16 @@ class ConfigurationController extends Controller
      */
     public function renderMetaData()
     {
-        $velocityMetaData = $this->velocityHelper->getVelocityMetaData($this->locale, $this->channel, false);
+        $locale = core()->checkRequestedLocaleInChannel();
+
+        $channel = core()->getRequestedChannelCode();
+
+        $velocityMetaData = $this->velocityHelper->getVelocityMetaData($locale, $channel, false);
 
         if (! $velocityMetaData) {
-            $this->createMetaData($this->locale, $this->channel);
+            $this->createMetaData($locale, $channel);
 
-            $velocityMetaData = $this->velocityHelper->getVelocityMetaData($this->locale, $this->channel);
+            $velocityMetaData = $this->velocityHelper->getVelocityMetaData($locale, $channel);
         }
 
         $velocityMetaData->advertisement = $this->manageAddImages(json_decode($velocityMetaData->advertisement, true) ?: []);
@@ -75,7 +78,9 @@ class ConfigurationController extends Controller
      */
     public function storeMetaData($id)
     {
-        // check if radio button value
+        $locale = core()->checkRequestedLocaleInChannel();
+
+        /* check if radio button value */
         if (request()->get('slides') == "on") {
             $params = request()->all() + [
                 'slider' => 1,
@@ -116,14 +121,14 @@ class ConfigurationController extends Controller
         unset($params['images']);
         unset($params['slides']);
 
-        $params['locale'] = $this->locale;
+        $params['locale'] = $locale;
 
-        // update row
-        $product = $this->velocityMetaDataRepository->update($params, $id);
+        /* update row */
+        $this->velocityMetaDataRepository->update($params, $id);
 
         session()->flash('success', trans('admin::app.response.update-success', ['name' => trans('velocity::app.admin.meta-data.title')]));
 
-        return redirect()->route($this->_config['redirect'], ['locale' => $this->locale]);
+        return redirect()->route($this->_config['redirect'], ['locale' => $locale]);
     }
 
     /**
@@ -201,7 +206,6 @@ class ConfigurationController extends Controller
      * Manage add images.
      *
      * @param  array  $addImages
-     *
      * @return array
      */
     public function manageAddImages($addImages)
@@ -231,7 +235,6 @@ class ConfigurationController extends Controller
      *
      * @param  string  $locale
      * @param  string  $channel
-     *
      * @return array
      */
     private function createMetaData($locale, $channel)