From 3bea1b7e0e76c3a443c9e3f69cadffba7094eb05 Mon Sep 17 00:00:00 2001
From: "shubhammehrotra.symfony@webkul.com"
 <shubhammehrotra.symfony@webkul.com>
Date: Fri, 27 Dec 2019 17:39:19 +0530
Subject: [PATCH] Misc. updates

---
 .../publishable/assets/css/velocity.css       |   5 -
 .../publishable/assets/js/velocity.js         |  15 +-
 .../Webkul/Velocity/src/Helpers/Helper.php    |  90 +++----
 .../Controllers/Shop/SearchController.php     |   4 +-
 .../assets/js/UI/components/carousel.vue      |   4 -
 .../js/UI/components/content-header.vue       |   9 +-
 .../Resources/assets/sass/components/app.scss |   4 +-
 .../Velocity/src/Resources/lang/en/app.php    |   1 +
 .../content/content-type/product.blade.php    |  35 ++-
 .../views/checkout/onepage.blade.php          |  42 ++--
 .../onepage/customer-new-form.blade.php       | 102 ++++----
 .../views/checkout/onepage/review.blade.php   |   4 +-
 .../src/Resources/views/errors/404.blade.php  |   2 +-
 .../src/Resources/views/home/index.blade.php  |   4 +
 .../views/layouts/footer/index.blade.php      |   4 +-
 .../views/layouts/footer/top-brands.blade.php |  62 ++---
 .../views/layouts/header/index.blade.php      |  10 -
 .../Resources/views/layouts/master.blade.php  |  35 +--
 .../views/layouts/top-nav/index.blade.php     |   2 +-
 .../layouts/top-nav/login-section.blade.php   | 220 +++++++++---------
 .../products/view/related-products.blade.php  |   2 +-
 21 files changed, 333 insertions(+), 323 deletions(-)

diff --git a/packages/Webkul/Velocity/publishable/assets/css/velocity.css b/packages/Webkul/Velocity/publishable/assets/css/velocity.css
index 640d0bf2f..42db69056 100644
--- a/packages/Webkul/Velocity/publishable/assets/css/velocity.css
+++ b/packages/Webkul/Velocity/publishable/assets/css/velocity.css
@@ -1708,11 +1708,6 @@
           justify-content: center;
 }
 
-.slides-container {
-  top: -70px;
-  position: relative;
-}
-
 #address-section .form-header h3 {
   margin-bottom: 20px;
 }
diff --git a/packages/Webkul/Velocity/publishable/assets/js/velocity.js b/packages/Webkul/Velocity/publishable/assets/js/velocity.js
index d9d2d9d5a..0645b79e1 100644
--- a/packages/Webkul/Velocity/publishable/assets/js/velocity.js
+++ b/packages/Webkul/Velocity/publishable/assets/js/velocity.js
@@ -35325,11 +35325,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 //
 
 /* harmony default export */ __webpack_exports__["default"] = ({
-    props: ['slidesCount', 'slidesPerPage', 'navigationEnabled', 'paginationEnabled', 'addClass'],
-
-    data: function data() {
-        return {};
-    }
+    props: ['slidesCount', 'slidesPerPage', 'navigationEnabled', 'paginationEnabled', 'addClass']
 });
 
 /***/ }),
@@ -36708,6 +36704,9 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 //
 //
 //
+//
+//
+//
 
 /* harmony default export */ __webpack_exports__["default"] = ({
     props: ['heading', 'headerContent', 'isEnabled']
@@ -36731,7 +36730,11 @@ var render = function() {
             "rango-view-list " +
             (_vm.isEnabled == "0" ? "" : "cursor-pointer") +
             " align-vertical-top",
-          on: { click: _vm.toggleSidebar }
+          on: {
+            click: function($event) {
+              _vm.isEnabled == "0" ? "" : _vm.toggleSidebar()
+            }
+          }
         }),
         _vm._v(" "),
         _c("span", {
diff --git a/packages/Webkul/Velocity/src/Helpers/Helper.php b/packages/Webkul/Velocity/src/Helpers/Helper.php
index 2fa57df63..871bf8a6e 100644
--- a/packages/Webkul/Velocity/src/Helpers/Helper.php
+++ b/packages/Webkul/Velocity/src/Helpers/Helper.php
@@ -8,6 +8,13 @@ use Webkul\Velocity\Repositories\OrderBrandsRepository;
 use Webkul\Attribute\Repositories\AttributeOptionRepository;
 use Webkul\Product\Repositories\ProductRepository as ProductRepository;
 
+/**
+ * Search controller
+ *
+ * @author  Shubham Mehrotra <shubhammehrotra.symfony@webkul.com> @shubhwebkul
+ * @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+
 class Helper extends Review
 {
 
@@ -37,29 +44,28 @@ class Helper extends Review
      *
      * @var object
      */
-    protected $AttributeOption;
+    protected $attributeOption;
 
     public function __construct(
-        OrderBrandsRepository $OrderBrandsRepository,
+        OrderBrandsRepository $orderBrandsRepository,
         ProductRepository $productRepository,
         ProductModel $productModel,
-        AttributeOptionRepository $AttributeOption
+        AttributeOptionRepository $attributeOption
     ) {
-        $this->OrderBrandsRepository = $OrderBrandsRepository;
-
-        $this->productRepository = $productRepository;
-
         $this->productModel =  $productModel;
-
-        $this->AttributeOption =  $AttributeOption;
+        $this->attributeOption =  $attributeOption;
+        $this->productRepository = $productRepository;
+        $this->orderBrandsRepository = $orderBrandsRepository;
     }
 
     public function topBrand($order)
     {
         $orderItems = $order->items;
+
         foreach ($orderItems as $key => $orderItem) {
-                $products[]= $orderItem->product;
-                $this->OrderBrandsRepository->create([
+            $products[] = $orderItem->product;
+
+            $this->orderBrandsRepository->create([
                 'order_id' => $orderItem->order_id,
                 'order_item_id' => $orderItem->id,
                 'product_id' => $orderItem->product_id,
@@ -72,52 +78,52 @@ class Helper extends Review
     public function getBrandsWithCategories()
     {
         try {
-            $orderBrand = $this->OrderBrandsRepository->get()->toArray();
-            // $orderBrand = $this->arrangeWithMaxBrandOrder($orderBrandData);
+            $orderBrand = $this->orderBrandsRepository->get()->toArray();
 
-            foreach ($orderBrand as $product) {
-                $product_id[] = $product['product_id'];
+            if (isset($orderBrand) && ! empty($orderBrand)) {
+                foreach ($orderBrand as $product) {
+                    $product_id[] = $product['product_id'];
 
-                $product_categories = $this->productRepository->with('categories')->findWhereIn('id', $product_id)->toArray();
-            }
+                    $product_categories = $this->productRepository->with('categories')->findWhereIn('id', $product_id)->toArray();
+                }
 
-            foreach($product_categories as $totalData) {
-                $brand = $this->AttributeOption->findOneWhere(['id' => $totalData['brand']]);
+                $categoryName = $brandName = $brandImplode = [];
+                foreach($product_categories as $totalData) {
+                    $brand = $this->attributeOption->findOneWhere(['id' => $totalData['brand']]);
 
-                foreach ($totalData['categories'] as $categories) {
-                    foreach($categories['translations'] as $catName) {
-                        $brandData[$brand->admin_name][] = $catName['name'];
-                        $categoryName[] = $catName['name'];
+                    foreach ($totalData['categories'] as $categories) {
+                        foreach($categories['translations'] as $catName) {
+                            $brandData[$brand->admin_name][] = $catName['name'];
+                            $categoryName[] = $catName['name'];
+                        }
                     }
                 }
-            }
 
-            $uniqueCategoryName = array_unique($categoryName);
+                $uniqueCategoryName = array_unique($categoryName);
 
-            foreach($uniqueCategoryName as $key => $categoryNameValue) {
-                foreach($brandData as $brandDataKey => $brandDataValue) {
-                    if(in_array($categoryNameValue,$brandDataValue)) {
-                        $brandName[$categoryNameValue][] = $brandDataKey;
+                foreach($uniqueCategoryName as $key => $categoryNameValue) {
+                    foreach($brandData as $brandDataKey => $brandDataValue) {
+                        if(in_array($categoryNameValue,$brandDataValue)) {
+                            $brandName[$categoryNameValue][] = $brandDataKey;
+                        }
                     }
                 }
-            }
 
-            foreach($brandName as $brandKey => $brandvalue) {
-                $brandImplode[$brandKey][] = implode(' | ',array_map("ucfirst", $brandvalue));
-            }
+                foreach($brandName as $brandKey => $brandvalue) {
+                    $brandImplode[$brandKey][] = implode(' | ',array_map("ucfirst", $brandvalue));
+                }
 
-            return $brandImplode;
-        } catch (Exception $e){
-            throw $e;
+                return $brandImplode;
+            }
+        } catch (Exception $exception){
+            throw $exception;
         }
     }
 
-
     public function arrangeWithMaxBrandOrder($orderBrandData)
     {
     }
 
-
     /**
      * Returns the count rating of the product
      *
@@ -127,10 +133,10 @@ class Helper extends Review
     public function getCountRating($product)
     {
         $reviews = $product->reviews()->where('status', 'approved')
-                    ->select('rating', \DB::raw('count(*) as total'))
-                    ->groupBy('rating')
-                    ->orderBy('rating','desc')
-                    ->get();
+            ->select('rating', \DB::raw('count(*) as total'))
+            ->groupBy('rating')
+            ->orderBy('rating','desc')
+            ->get();
 
         $totalReviews = $this->getTotalReviews($product);
 
diff --git a/packages/Webkul/Velocity/src/Http/Controllers/Shop/SearchController.php b/packages/Webkul/Velocity/src/Http/Controllers/Shop/SearchController.php
index 54eb96646..046ccf4b9 100644
--- a/packages/Webkul/Velocity/src/Http/Controllers/Shop/SearchController.php
+++ b/packages/Webkul/Velocity/src/Http/Controllers/Shop/SearchController.php
@@ -8,8 +8,8 @@ use Webkul\Velocity\Http\Shop\Controllers;
 /**
  * Search controller
  *
- * @author  Prashant Singh <prashant.singh852@webkul.com> @prashant-webkul
- * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ * @author  Shubham Mehrotra <shubhammehrotra.symfony@webkul.com> @shubhwebkul
+ * @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com)
  */
  class SearchController extends Controller
 {
diff --git a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/carousel.vue b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/carousel.vue
index 2130382ff..ff5977013 100644
--- a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/carousel.vue
+++ b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/carousel.vue
@@ -26,9 +26,5 @@
             'paginationEnabled',
             'addClass'
         ],
-
-        data: function () {
-            return {}
-        }
     }
 </script>
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/content-header.vue b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/content-header.vue
index 0622704df..39f1fca47 100644
--- a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/content-header.vue
+++ b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/content-header.vue
@@ -2,7 +2,10 @@
     <div :class="`row ${isEnabled == '0' ? 'disabled' : ''}`">
         <div
             class="main-category fs20 pt10 col-2 pl30">
-            <i :class="`rango-view-list ${isEnabled == '0' ? '' : 'cursor-pointer'} align-vertical-top`" @click="toggleSidebar"></i>
+            <i
+                :class="`rango-view-list ${isEnabled == '0' ? '' : 'cursor-pointer'} align-vertical-top`"
+                @click="(isEnabled == '0') ? '' : toggleSidebar()">
+            </i>
             <span class="text-up" v-text="heading"></span>
         </div>
 
@@ -13,8 +16,8 @@
                         v-if="(content['content_type'] == 'link')"
                         href="content['page_link']"
                         :target="content['link_target'] ? '_blank' : '_self'"
-                        v-text="content.title"
-                    ></a>
+                        v-text="content.title">
+                    </a>
 
                     <a href="#" v-else v-text="content.title"></a>
                 </li>
diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss
index 455806a40..2b0fdd652 100644
--- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss
+++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss
@@ -997,8 +997,8 @@
 }
 
 .slides-container {
-    top: -70px;
-    position: relative;
+    // top: -70px;
+    // position: relative;
 }
 
 #address-section {
diff --git a/packages/Webkul/Velocity/src/Resources/lang/en/app.php b/packages/Webkul/Velocity/src/Resources/lang/en/app.php
index 1a865ced4..0a0643526 100644
--- a/packages/Webkul/Velocity/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Velocity/src/Resources/lang/en/app.php
@@ -215,6 +215,7 @@ return [
             'enter-current-password' => 'Enter your current password',
             'new-password' => 'New password',
             'confirm-new-password' => 'Confirm new password',
+            'top-brands' => 'Top Brands',
         ],
     ],
 ]
diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/content/content-type/product.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/content/content-type/product.blade.php
index 4c85633be..d59d3cabd 100644
--- a/packages/Webkul/Velocity/src/Resources/views/admin/content/content-type/product.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/admin/content/content-type/product.blade.php
@@ -33,25 +33,6 @@
 
     </script>
 
-    <script>
-        Vue.component('catalog-product', {
-            template: '#catalog-product-template',
-
-            inject: ['$validator'],
-
-            data() {
-                return {
-                    catalog_type: '',
-                }
-            },
-            methods: {
-                loadCatalogType(event) {
-                    this.content_type = event.target.value;
-                }
-            }
-        });
-    </script>
-
     <script type="text/x-template" id="field-autocomplete-template">
         <div>
             <div class="control-group">
@@ -180,5 +161,21 @@
             }
         });
 
+        Vue.component('catalog-product', {
+            template: '#catalog-product-template',
+
+            inject: ['$validator'],
+
+            data() {
+                return {
+                    catalog_type: '',
+                }
+            },
+            methods: {
+                loadCatalogType(event) {
+                    this.content_type = event.target.value;
+                }
+            }
+        });
     </script>
 @endpush
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/views/checkout/onepage.blade.php b/packages/Webkul/Velocity/src/Resources/views/checkout/onepage.blade.php
index 56856d89a..f2153fd99 100644
--- a/packages/Webkul/Velocity/src/Resources/views/checkout/onepage.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/checkout/onepage.blade.php
@@ -76,13 +76,13 @@
 
     <script type="text/javascript">
         (() => {
-            var shippingHtml = '';
-            var paymentHtml = '';
             var reviewHtml = '';
+            var paymentHtml = '';
             var summaryHtml = '';
+            var shippingHtml = '';
+            var paymentMethods = '';
             var customerAddress = '';
             var shippingMethods = '';
-            var paymentMethods = '';
 
             var shippingTemplateRenderFns = [];
             var paymentTemplateRenderFns = [];
@@ -297,6 +297,10 @@
 
                                 paymentMethods = response.data.paymentMethods;
 
+                                if (this.selected_payment_method) {
+                                    this.savePayment();
+                                }
+
                                 this.getOrderSummary();
                             })
                             .catch(error => {
@@ -498,22 +502,21 @@
             })
 
             Vue.component('review-section', {
-                data: function() {
+                data: function () {
                     return {
+                        error_message: '',
                         templateRender: null,
-
-                        error_message: ''
                     }
                 },
 
                 staticRenderFns: reviewTemplateRenderFns,
 
-                render: function(h) {
-                    return h('div', [
-                        (this.templateRender ?
-                            this.templateRender() :
-                            '')
-                        ]);
+                render: function (h) {
+                    return h(
+                        'div', [
+                            this.templateRender ? this.templateRender() : ''
+                        ]
+                    );
                 },
 
                 mounted: function() {
@@ -530,30 +533,25 @@
             Vue.component('summary-section', {
                 inject: ['$validator'],
 
+                staticRenderFns: summaryTemplateRenderFns,
+
                 props: {
                     discount: {
-                        type: [String, Number],
-
                         default: 0,
+                        type: [String, Number],
                     }
                 },
 
                 data: function() {
                     return {
-                        templateRender: null,
-
+                        changeCount: 0,
                         coupon_code: null,
-
                         error_message: null,
-
+                        templateRender: null,
                         couponChanged: false,
-
-                        changeCount: 0
                     }
                 },
 
-                staticRenderFns: summaryTemplateRenderFns,
-
                 mounted: function() {
                     this.templateRender = summaryHtml.render;
 
diff --git a/packages/Webkul/Velocity/src/Resources/views/checkout/onepage/customer-new-form.blade.php b/packages/Webkul/Velocity/src/Resources/views/checkout/onepage/customer-new-form.blade.php
index a4c4680cb..7aa5e97f0 100644
--- a/packages/Webkul/Velocity/src/Resources/views/checkout/onepage/customer-new-form.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/checkout/onepage/customer-new-form.blade.php
@@ -165,13 +165,13 @@
 
         <input
             type="text"
-            v-validate="'required|email'"
             class="control"
             id="billing[email]"
             name="billing[email]"
+            @blur="isCustomerExist"
+            v-validate="'required|email'"
             v-model="address.billing.email"
-            data-vv-as="&quot;{{ __('shop::app.checkout.onepage.email') }}&quot;"
-            @blur="isCustomerExist" />
+            data-vv-as="&quot;{{ __('shop::app.checkout.onepage.email') }}&quot;" />
 
         <span class="control-error" v-if="errors.has('address-form.billing[email]')">
             @{{ errors.first('address-form.billing[email]') }}
@@ -190,8 +190,8 @@
 
         <input
             type="text"
-            v-validate="'required'"
             class="control"
+            v-validate="'required'"
             id="billing[first_name]"
             name="billing[first_name]"
             v-model="address.billing.first_name"
@@ -228,8 +228,8 @@
 
         <input
             type="text"
-            v-validate="'required'"
             class="control"
+            v-validate="'required'"
             id="billing_address_0"
             name="billing[address1][]"
             v-model="address.billing.address1[0]"
@@ -243,7 +243,12 @@
     @if (core()->getConfigData('customer.settings.address.street_lines') && core()->getConfigData('customer.settings.address.street_lines') > 1)
         <div class="row col-12" style="margin-top: -25px;">
             @for ($i = 1; $i < core()->getConfigData('customer.settings.address.street_lines'); $i++)
-                <input type="text" class="control" name="billing[address1][{{ $i }}]" id="billing_address_{{ $i }}" v-model="address.billing.address1[{{$i}}]">
+                <input
+                    type="text"
+                    class="control"
+                    id="billing_address_{{ $i }}"
+                    name="billing[address1][{{ $i }}]"
+                    v-model="address.billing.address1[{{$i}}]" />
             @endfor
         </div>
     @endif
@@ -255,10 +260,10 @@
 
         <input
             type="text"
-            v-validate="'required'"
             class="control"
             id="billing[city]"
             name="billing[city]"
+            v-validate="'required'"
             v-model="address.billing.city"
             data-vv-as="&quot;{{ __('shop::app.checkout.onepage.city') }}&quot;" />
 
@@ -267,6 +272,34 @@
         </span>
     </div>
 
+    <div :class="`row col-12 ${errors.has('address-form.billing[country]') ? 'has-error' : ''}`">
+        <label for="billing[country]" class="required">
+            {{ __('shop::app.checkout.onepage.country') }}
+        </label>
+
+        <select
+            type="text"
+            class="control"
+            id="billing[country]"
+            name="billing[country]"
+            v-validate="'required'"
+            v-model="address.billing.country"
+            data-vv-as="&quot;{{ __('shop::app.checkout.onepage.country') }}&quot;">
+
+            <option value=""></option>
+
+            @foreach (core()->countries() as $country)
+
+                <option value="{{ $country->code }}">{{ $country->name }}</option>
+
+            @endforeach
+        </select>
+
+        <span class="control-error" v-if="errors.has('address-form.billing[country]')">
+            @{{ errors.first('address-form.billing[country]') }}
+        </span>
+    </div>
+
     <div :class="`row col-12 ${errors.has('address-form.billing[state]') ? 'has-error' : ''}`">
         <label for="billing[state]" class="required">
             {{ __('shop::app.checkout.onepage.state') }}
@@ -274,14 +307,22 @@
 
         <input
             type="text"
-            v-validate="'required'"
             class="control"
             id="billing[state]"
             name="billing[state]"
+            v-validate="'required'"
+            v-if="!haveStates('billing')"
             v-model="address.billing.state"
-            v-if="!haveStates('billing')" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.state') }}&quot;" />
+            data-vv-as="&quot;{{ __('shop::app.checkout.onepage.state') }}&quot;" />
 
-        <select v-validate="'required'" class="control" id="billing[state]" name="billing[state]" v-model="address.billing.state" v-if="haveStates('billing')" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.state') }}&quot;">
+        <select
+            class="control"
+            id="billing[state]"
+            name="billing[state]"
+            v-validate="'required'"
+            v-if="haveStates('billing')"
+            v-model="address.billing.state"
+            data-vv-as="&quot;{{ __('shop::app.checkout.onepage.state') }}&quot;">
 
             <option value="">{{ __('shop::app.checkout.onepage.select-state') }}</option>
 
@@ -303,9 +344,9 @@
 
         <input
             type="text"
-            v-validate="'required'"
             class="control"
             id="billing[postcode]"
+            v-validate="'required'"
             name="billing[postcode]"
             v-model="address.billing.postcode"
             data-vv-as="&quot;{{ __('shop::app.checkout.onepage.postcode') }}&quot;" />
@@ -315,34 +356,6 @@
         </span>
     </div>
 
-    <div :class="`row col-12 ${errors.has('address-form.billing[country]') ? 'has-error' : ''}`">
-        <label for="billing[country]" class="required">
-            {{ __('shop::app.checkout.onepage.country') }}
-        </label>
-
-        <select
-            type="text"
-            v-validate="'required'"
-            class="control"
-            id="billing[country]"
-            name="billing[country]"
-            v-model="address.billing.country"
-            data-vv-as="&quot;{{ __('shop::app.checkout.onepage.country') }}&quot;">
-
-            <option value=""></option>
-
-            @foreach (core()->countries() as $country)
-
-                <option value="{{ $country->code }}">{{ $country->name }}</option>
-
-            @endforeach
-        </select>
-
-        <span class="control-error" v-if="errors.has('address-form.billing[country]')">
-            @{{ errors.first('address-form.billing[country]') }}
-        </span>
-    </div>
-
     <div :class="`row col-12 ${errors.has('address-form.billing[phone]') ? 'has-error' : ''}`">
         <label for="billing[phone]" class="required">
             {{ __('shop::app.checkout.onepage.phone') }}
@@ -350,11 +363,12 @@
 
         <input
             type="text"
-            v-validate="'required'"
             class="control"
             id="billing[phone]"
             name="billing[phone]"
+            v-validate="'required'"
             v-model="address.billing.phone"
+            @change="validateForm('address-form')"
             data-vv-as="&quot;{{ __('shop::app.checkout.onepage.phone') }}&quot;" />
 
         <span class="control-error" v-if="errors.has('address-form.billing[phone]')">
@@ -366,8 +380,9 @@
         <div class="mb10">
             <span class="checkbox fs16 display-inbl no-margin">
                 <input
-                    type="checkbox"
                     class="ml0"
+                    type="checkbox"
+                    @change="validateForm('address-form')"
                     id="billing[use_for_shipping]"
                     name="billing[use_for_shipping]"
                     v-model="address.billing.use_for_shipping" />
@@ -383,8 +398,8 @@
         <div class="mb10">
             <span class="checkbox fs16 display-inbl no-margin">
                 <input
-                    type="checkbox"
                     class="ml0"
+                    type="checkbox"
                     id="billing[save_as_address]"
                     name="billing[save_as_address]" v-model="address.billing.save_as_address"/>
 
@@ -396,7 +411,4 @@
         @php
         @endphp
     @endauth
-
-    @guest('customer')
-    @endguest
 @endif
diff --git a/packages/Webkul/Velocity/src/Resources/views/checkout/onepage/review.blade.php b/packages/Webkul/Velocity/src/Resources/views/checkout/onepage/review.blade.php
index 4013f8976..34906bb6e 100755
--- a/packages/Webkul/Velocity/src/Resources/views/checkout/onepage/review.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/checkout/onepage/review.blade.php
@@ -1,3 +1,5 @@
+@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
+
 <div class="form-container review-checkout-conainer">
     <div class="form-header mb-30">
         <h3 class="fw6 display-inbl">
@@ -60,8 +62,6 @@
 
     </div>
 
-    @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
-
     <div class="cart-item-list">
         <h4 class="fw6">{{ __('velocity::app.checkout.items') }}</h4>
 
diff --git a/packages/Webkul/Velocity/src/Resources/views/errors/404.blade.php b/packages/Webkul/Velocity/src/Resources/views/errors/404.blade.php
index 4157de295..456cb893d 100644
--- a/packages/Webkul/Velocity/src/Resources/views/errors/404.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/errors/404.blade.php
@@ -36,7 +36,7 @@
                 @endif
             </div>
 
-            <a class="row" href="{{ route('shop.home.index') }}">
+            <a class="row remove-decoration" href="{{ route('shop.home.index') }}">
                 <div class="col-12">
                     <span class="custom-circle">></span>
                 </div>
diff --git a/packages/Webkul/Velocity/src/Resources/views/home/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/index.blade.php
index 86a720379..e60a200a5 100644
--- a/packages/Webkul/Velocity/src/Resources/views/home/index.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/home/index.blade.php
@@ -39,6 +39,10 @@
     @endif
 @endsection
 
+@section('content-wrapper')
+    @include('shop::home.slider')
+@endsection
+
 @section('full-content-wrapper')
 
     {!! view_render_event('bagisto.shop.home.content.before') !!}
diff --git a/packages/Webkul/Velocity/src/Resources/views/layouts/footer/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/layouts/footer/index.blade.php
index eb7312e91..e4b3e0717 100644
--- a/packages/Webkul/Velocity/src/Resources/views/layouts/footer/index.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/layouts/footer/index.blade.php
@@ -1,11 +1,11 @@
-<?php
+@php
     $categories = [];
 
     foreach (app('Webkul\Category\Repositories\CategoryRepository')->getVisibleCategoryTree(core()->getCurrentChannel()->root_category_id) as $category){
         if ($category->slug)
             array_push($categories, $category);
     }
-?>
+@endphp
 
 <div class="footer">
     <div class="footer-content">
diff --git a/packages/Webkul/Velocity/src/Resources/views/layouts/footer/top-brands.blade.php b/packages/Webkul/Velocity/src/Resources/views/layouts/footer/top-brands.blade.php
index 046697294..85719440a 100644
--- a/packages/Webkul/Velocity/src/Resources/views/layouts/footer/top-brands.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/layouts/footer/top-brands.blade.php
@@ -1,35 +1,37 @@
-<?php
+@php
     $brandname = app('Webkul\Velocity\Helpers\Helper');
     $topBrandsCollection = $brandname->getBrandsWithCategories();
-?>
+@endphp
 
-<div class="top-brands">
-    <div class="top-brands-body">
-            @if ($topBrandsCollection)
-                <div class="top-brands-header">
-                    <h2>Top Brands</h2>
-                </div>
-
-                <ul class="list-group">
-                    <div class="row fs16 pb15">
-                        <span>
-                            @foreach($topBrandsCollection as $categoryName => $brandsCollection)
-                                <div class="row fs16 pb15">
-                                    <label class="mr10">{{$categoryName}} : </label>
-
-                                    <span>
-                                        @foreach ($brandsCollection as $brandIndex => $brand )
-                                            {{$brand}}
-                                            @if ($brandIndex + 1 !== sizeof($brandsCollection))
-                                                |
-                                            @endif
-                                        @endforeach
-                                    </span>
-                                </div>
-                            @endforeach
-                        </span>
+@if (! empty($topBrandsCollection))
+    <div class="top-brands">
+        <div class="top-brands-body">
+                @if ($topBrandsCollection)
+                    <div class="top-brands-header">
+                        <h2>{{ __('velocity::app.shop.general.top-brands') }}</h2>
                     </div>
-                </ul>
-            @endif
+
+                    <ul class="list-group">
+                        <div class="row fs16 pb15">
+                            <span>
+                                @foreach($topBrandsCollection as $categoryName => $brandsCollection)
+                                    <div class="row fs16 pb15">
+                                        <label class="mr10">{{ $categoryName }} : </label>
+
+                                        <span>
+                                            @foreach ($brandsCollection as $brandIndex => $brand )
+                                                {{$brand}}
+                                                @if ($brandIndex + 1 !== sizeof($brandsCollection))
+                                                    |
+                                                @endif
+                                            @endforeach
+                                        </span>
+                                    </div>
+                                @endforeach
+                            </span>
+                        </div>
+                    </ul>
+                @endif
+        </div>
     </div>
-</div>
\ No newline at end of file
+@endif
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/views/layouts/header/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/layouts/header/index.blade.php
index c61045614..8a4db0789 100644
--- a/packages/Webkul/Velocity/src/Resources/views/layouts/header/index.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/layouts/header/index.blade.php
@@ -39,16 +39,6 @@
                             @endforeach
                         </select>
 
-                        {{-- <input
-                            type="search"
-                            name="term"
-                            class="form-control search col-md-7"
-                            placeholder="{{ __('velocity::app.header.search-text') }}"
-                            required />
-
-                        <button class="btn col-md-1" id="header-search-icon">
-                            <i class="material-icons">search</i>
-                        </button> --}}
                         <div class="input-group col-md-8 rows">
                             <input
                                 required
diff --git a/packages/Webkul/Velocity/src/Resources/views/layouts/master.blade.php b/packages/Webkul/Velocity/src/Resources/views/layouts/master.blade.php
index 683275730..5ba81e6cf 100644
--- a/packages/Webkul/Velocity/src/Resources/views/layouts/master.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/layouts/master.blade.php
@@ -78,31 +78,34 @@
                         ></content-header>
 
                         <div class="container">
-                            <sidebar-component
-                                main-sidebar=true
-                                url="{{ url()->to('/') }}"
-                                add-class="col-2 category-list-container pt10"
-                                :categories="{{ json_encode($categories) }}"
-                            ></sidebar-component>
+                            <div class="row col-12">
+                                <sidebar-component
+                                    main-sidebar=true
+                                    url="{{ url()->to('/') }}"
+                                    add-class="col-2 category-list-container pt10"
+                                    :categories="{{ json_encode($categories) }}"
+                                ></sidebar-component>
 
-                            <child-sidebar
-                                url="{{ url()->to('/') }}">
-                            </child-sidebar>
+                                <child-sidebar
+                                    url="{{ url()->to('/') }}">
+                                </child-sidebar>
 
-                            <div class="col-10 no-padding content" id="home-right-bar-container">
-                                <div class="container-right row no-margin col-12 no-padding">
+                                <div
+                                    class="col-10 no-padding content" id="home-right-bar-container">
 
-                                    {!! view_render_event('bagisto.shop.layout.content.before') !!}
+                                    <div class="container-right row no-margin col-12 no-padding">
 
-                                    @yield('content-wrapper')
+                                        {!! view_render_event('bagisto.shop.layout.content.before') !!}
+
+                                        @yield('content-wrapper')
+
+                                        {!! view_render_event('bagisto.shop.layout.content.after') !!}
+                                    </div>
 
-                                    {!! view_render_event('bagisto.shop.layout.content.after') !!}
                                 </div>
-
                             </div>
                         </div>
                     </div>
-
                 @show
 
                 <div class="container">
diff --git a/packages/Webkul/Velocity/src/Resources/views/layouts/top-nav/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/layouts/top-nav/index.blade.php
index 363ff5a78..f55193951 100644
--- a/packages/Webkul/Velocity/src/Resources/views/layouts/top-nav/index.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/layouts/top-nav/index.blade.php
@@ -3,6 +3,6 @@
         @include('velocity::layouts.top-nav.locale-currency')
     </div>
     <div class="col-sm-6">
-        @include('velocity::layouts.top-nav.login-section')
+        {{-- @include('velocity::layouts.top-nav.login-section') --}}
     </div>
 </nav>
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/views/layouts/top-nav/login-section.blade.php b/packages/Webkul/Velocity/src/Resources/views/layouts/top-nav/login-section.blade.php
index 8eb5a6e68..714c02a5d 100644
--- a/packages/Webkul/Velocity/src/Resources/views/layouts/top-nav/login-section.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/layouts/top-nav/login-section.blade.php
@@ -2,124 +2,124 @@
     <login-header></login-header>
 {!! view_render_event('bagisto.shop.layout.header.account-item.after') !!}
 
-<script type="text/x-template" id="login-header-template">
-    <div class="pull-right">
-        <div class="dropdown">
-            <button
-                class="btn btn-link dropdown-icon open-dropdown"
-                type="button"
-                id="account"
-                data-toggle="dropdown"
-                aria-haspopup="true"
-                aria-expanded="false"
-                @click="togglePopup">
 
-                <div class="welcome-content">
-                    <i class="material-icons align-vertical-top">perm_identity</i>
-                    <span class="align-vertical-middle">
+@push('scripts')
+    <script type="text/x-template" id="login-header-template">
+        <div class="pull-right">
+            <div class="dropdown">
+                <button
+                    class="btn btn-link dropdown-icon open-dropdown"
+                    type="button"
+                    id="account"
+                    data-toggle="dropdown"
+                    aria-haspopup="true"
+                    aria-expanded="false"
+                    @click="togglePopup">
+
+                    <div class="welcome-content">
+                        <i class="material-icons align-vertical-top">perm_identity</i>
+                        <span class="align-vertical-middle">
+                            @guest('customer')
+                                {{ __('velocity::app.header.welcome-message', ['customer_name' => 'Guest']) }}
+                            @endguest
+
+                            @auth('customer')
+                                {{ __('velocity::app.header.welcome-message', ['customer_name' => auth()->guard('customer')->user()->first_name]) }}
+                            @endauth
+                        </span>
+                        {{-- <span class="caret"></span> --}}
+                    </div>
+                </button>
+
+                <div class="account-modal hide mt5" role="document">
+                    <!--Content-->
                         @guest('customer')
-                            {{ __('velocity::app.header.welcome-message', ['customer_name' => 'Guest']) }}
+                            <div class="modal-content">
+                                <!--Header-->
+                                <div class="modal-header no-border pb0">
+                                    <label class="fs18 grey">{{ __('shop::app.header.title') }}</label>
+
+                                    <button type="button" class="close disable-box-shadow" data-dismiss="modal" aria-label="Close">
+                                        <span aria-hidden="true" class="white-text fs20" @click="togglePopup">×</span>
+                                    </button>
+                                </div>
+
+                                <!--Body-->
+                                <div class="pl10 fs14">
+                                    <p>{{ __('shop::app.header.dropdown-text') }}</p>
+                                </div>
+
+                                <!--Footer-->
+                                <div class="modal-footer">
+                                    <div class="col-6 text-left">
+                                        <a href="{{ route('customer.session.index') }}">
+                                            <button
+                                                type="button"
+                                                class="theme-btn fs16">
+
+                                                {{ __('velocity::app.header.sign-in') }}
+                                            </button>
+                                        </a>
+                                    </div>
+
+                                    <div class="col-6 text-right">
+                                        <a href="{{ route('customer.register.index') }}">
+                                            <button
+                                                type="button"
+                                                class="theme-btn fs16">
+                                                {{ __('velocity::app.header.sign-up') }}
+                                            </button>
+                                        </a>
+                                    </div>
+                                </div>
+                            </div>
                         @endguest
 
                         @auth('customer')
-                            {{ __('velocity::app.header.welcome-message', ['customer_name' => auth()->guard('customer')->user()->first_name]) }}
+                            <div class="modal-content customer-options">
+                                <div class="customer-session">
+                                    <label class="">
+                                        {{ auth()->guard('customer')->user()->first_name }}
+                                    </label>
+                                </div>
+
+                                <ul type="none">
+                                    <li>
+                                        <a href="{{ route('customer.profile.index') }}" class="unset">{{ __('shop::app.header.profile') }}</a>
+                                    </li>
+
+                                    <li>
+                                        <a href="{{ route('customer.wishlist.index') }}" class="unset">{{ __('shop::app.header.wishlist') }}</a>
+                                    </li>
+
+                                    <li>
+                                        <a href="{{ route('shop.checkout.cart.index') }}" class="unset">{{ __('shop::app.header.cart') }}</a>
+                                    </li>
+
+                                    <li>
+                                        <a href="{{ route('customer.session.destroy') }}" class="unset">{{ __('shop::app.header.logout') }}</a>
+                                    </li>
+                                </ul>
+                            </div>
                         @endauth
-                    </span>
-                    {{-- <span class="caret"></span> --}}
+                    <!--/.Content-->
                 </div>
-            </button>
-
-            <div class="account-modal hide mt5" role="document">
-                <!--Content-->
-                    @guest('customer')
-                        <div class="modal-content">
-                            <!--Header-->
-                            <div class="modal-header no-border pb0">
-                                <label class="fs18 grey">{{ __('shop::app.header.title') }}</label>
-
-                                <button type="button" class="close disable-box-shadow" data-dismiss="modal" aria-label="Close">
-                                    <span aria-hidden="true" class="white-text fs20" @click="togglePopup">×</span>
-                                </button>
-                            </div>
-
-                            <!--Body-->
-                            <div class="pl10 fs14">
-                                <p>{{ __('shop::app.header.dropdown-text') }}</p>
-                            </div>
-
-                            <!--Footer-->
-                            <div class="modal-footer">
-                                <div class="col-6 text-left">
-                                    <a href="{{ route('customer.session.index') }}">
-                                        <button
-                                            type="button"
-                                            class="theme-btn fs16">
-
-                                            {{ __('velocity::app.header.sign-in') }}
-                                        </button>
-                                    </a>
-                                </div>
-
-                                <div class="col-6 text-right">
-                                    <a href="{{ route('customer.register.index') }}">
-                                        <button
-                                            type="button"
-                                            class="theme-btn fs16">
-                                            {{ __('velocity::app.header.sign-up') }}
-                                        </button>
-                                    </a>
-                                </div>
-                            </div>
-                        </div>
-                    @endguest
-
-                    @auth('customer')
-                        <div class="modal-content customer-options">
-                            <div class="customer-session">
-                                <label class="">
-                                    {{ auth()->guard('customer')->user()->first_name }}
-                                </label>
-                            </div>
-
-                            <ul type="none">
-                                <li>
-                                    <a href="{{ route('customer.profile.index') }}" class="unset">{{ __('shop::app.header.profile') }}</a>
-                                </li>
-
-                                <li>
-                                    <a href="{{ route('customer.wishlist.index') }}" class="unset">{{ __('shop::app.header.wishlist') }}</a>
-                                </li>
-
-                                <li>
-                                    <a href="{{ route('shop.checkout.cart.index') }}" class="unset">{{ __('shop::app.header.cart') }}</a>
-                                </li>
-
-                                <li>
-                                    <a href="{{ route('customer.session.destroy') }}" class="unset">{{ __('shop::app.header.logout') }}</a>
-                                </li>
-                            </ul>
-                        </div>
-                    @endauth
-                <!--/.Content-->
             </div>
         </div>
-    </div>
-</script>
-
-@push('scripts')
-    <script type="text/javascript">
-
-        Vue.component('login-header', {
-            template: '#login-header-template',
-
-            methods: {
-                togglePopup: function () {
-                    let accountModal = this.$el.querySelector('.account-modal');
-                    accountModal.classList.toggle('hide');
-                }
-            }
-        })
-
     </script>
-@endpush
 
+    <script>
+        (() => {
+            Vue.component('login-header', {
+                template: '#login-header-template',
+
+                methods: {
+                    togglePopup: function () {
+                        let accountModal = this.$el.querySelector('.account-modal');
+                        accountModal.classList.toggle('hide');
+                    }
+                }
+            })
+        })();
+    </script>
+@endpush
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/views/products/view/related-products.blade.php b/packages/Webkul/Velocity/src/Resources/views/products/view/related-products.blade.php
index 7570fbef6..a7713b4c7 100644
--- a/packages/Webkul/Velocity/src/Resources/views/products/view/related-products.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/products/view/related-products.blade.php
@@ -11,7 +11,7 @@
 
     <carousel-component
         :slides-count="{{ sizeof($relatedProducts) }}"
-        slides-per-page="6"
+        slides-per-page="5"
         id="related-products-carousel"
         navigation-enabled="hide"
         pagination-enabled="hide">