From 3e2dd34dddca2b33b14f9f46affa44c8774d0985 Mon Sep 17 00:00:00 2001
From: "shubhammehrotra.symfony@webkul.com"
 <shubhammehrotra.symfony@webkul.com>
Date: Thu, 19 Mar 2020 17:57:52 +0530
Subject: [PATCH] #2592

---
 .../Webkul/Velocity/src/Http/front-routes.php |   6 +
 .../views/shop/UI/particals.blade.php         |  24 +-
 .../customers/account/compare/index.blade.php |  19 ++
 .../account/partials/sidemenu.blade.php       |   2 +-
 .../guest/compare/compare-products.blade.php  | 201 +++++++++++++++++
 .../views/shop/guest/compare/index.blade.php  | 206 +-----------------
 .../layouts/top-nav/login-section.blade.php   |   2 +-
 7 files changed, 253 insertions(+), 207 deletions(-)
 create mode 100644 packages/Webkul/Velocity/src/Resources/views/shop/customers/account/compare/index.blade.php
 create mode 100644 packages/Webkul/Velocity/src/Resources/views/shop/guest/compare/compare-products.blade.php

diff --git a/packages/Webkul/Velocity/src/Http/front-routes.php b/packages/Webkul/Velocity/src/Http/front-routes.php
index 363a38eff..12d9fa4d8 100644
--- a/packages/Webkul/Velocity/src/Http/front-routes.php
+++ b/packages/Webkul/Velocity/src/Http/front-routes.php
@@ -34,6 +34,12 @@ Route::group(['middleware' => ['web', 'locale', 'theme', 'currency']], function
                 'view' => 'shop::guest.compare.index'
             ]);
 
+        Route::get('/customer/account/comparison', 'ComparisonController@getComparisonList')
+            ->name('velocity.customer.product.compare')
+            ->defaults('_config', [
+                'view' => 'shop::customers.account.compare.index'
+            ]);
+
         Route::put('/comparison', 'ComparisonController@addCompareProduct')
             ->name('customer.product.add.compare');
 
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/UI/particals.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/UI/particals.blade.php
index ca50896ba..1078ad5a1 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/UI/particals.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/UI/particals.blade.php
@@ -120,7 +120,17 @@
             {!! view_render_event('bagisto.shop.layout.header.cart-item.after') !!}
 
             {!! view_render_event('bagisto.shop.layout.header.compare.before') !!}
-                <a class="compare-btn unset" href="{{ route('velocity.product.compare') }}">
+                <a
+                    class="compare-btn unset"
+                    @auth('customer')
+                        href="{{ route('velocity.customer.product.compare') }}"
+                    @endauth
+
+                    @guest('customer')
+                        href="{{ route('velocity.product.compare') }}"
+                    @endguest
+                    >
+
                     <i class="material-icons">compare_arrows</i>
                     <div class="badge-container" v-if="compareCount > 0">
                         <span class="badge" v-text="compareCount"></span>
@@ -444,7 +454,17 @@
                 </div>
 
                 <div class="right-vc-header col-6">
-                    <a class="compare-btn unset" href="{{ route('velocity.product.compare') }}">
+                    <a
+                        class="compare-btn unset"
+                        @auth('customer')
+                            href="{{ route('velocity.customer.product.compare') }}"
+                        @endauth
+
+                        @guest('customer')
+                            href="{{ route('velocity.product.compare') }}"
+                        @endguest
+                        >
+
                         <div class="badge-container" v-if="compareCount > 0">
                             <span class="badge" v-text="compareCount"></span>
                         </div>
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/compare/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/compare/index.blade.php
new file mode 100644
index 000000000..8c669d10e
--- /dev/null
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/compare/index.blade.php
@@ -0,0 +1,19 @@
+@extends('shop::customers.account.index')
+
+@include('velocity::guest.compare.compare-products')
+
+@section('page_title')
+    {{ __('velocity::app.customer.compare.compare_similar_items') }}
+@endsection
+
+@push('css')
+    <style>
+        .compare-products .col, .compare-products .col-2 {
+            max-width: 25%;
+        }
+    </style>
+@endpush
+
+@section('page-detail-wrapper')
+    <compare-product></compare-product>
+@endsection
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/partials/sidemenu.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/partials/sidemenu.blade.php
index 406a831df..060bb8925 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/partials/sidemenu.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/partials/sidemenu.blade.php
@@ -20,7 +20,7 @@
                     $subMenuCollection['wishlist'] = $menuItem['children']['wishlist'];
                     $subMenuCollection['compare'] = [
                         'key'   => 'account.compare',
-                        'url'   => route('velocity.product.compare'),
+                        'url'   => route('velocity.customer.product.compare'),
                         'name'  => 'velocity::app.customer.compare.text',
                     ];
                     $subMenuCollection['reviews'] = $menuItem['children']['reviews'];
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/guest/compare/compare-products.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/guest/compare/compare-products.blade.php
new file mode 100644
index 000000000..c47e18fbb
--- /dev/null
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/guest/compare/compare-products.blade.php
@@ -0,0 +1,201 @@
+@php
+    $attributeRepository = app('\Webkul\Attribute\Repositories\AttributeRepository');
+    $comparableAttributes = $attributeRepository->findByField('is_comparable', 1);
+@endphp
+
+@push('scripts')
+    <script type="text/x-template" id="compare-product-template">
+        <section class="cart-details row no-margin col-12">
+            <h1 class="fw6 col-6">
+                {{ __('velocity::app.customer.compare.compare_similar_items') }}
+            </h1>
+
+            <div class="col-6" v-if="products.length > 0">
+                <button
+                    class="theme-btn light pull-right"
+                    @click="removeProductCompare('all')">
+                    {{ __('shop::app.customer.account.wishlist.deleteall') }}
+                </button>
+            </div>
+
+            {!! view_render_event('bagisto.shop.customers.account.compare.view.before') !!}
+
+            <div class="row compare-products col-12 ml0">
+                <shimmer-component v-if="!isProductListLoaded && !isMobile()"></shimmer-component>
+
+                <template v-else-if="isProductListLoaded && products.length > 0">
+                    @php
+                        $comparableAttributes = $comparableAttributes->toArray();
+
+                        array_splice($comparableAttributes, 1, 0, [[
+                            'code' => 'image',
+                            'admin_name' => 'Product Image'
+                        ]]);
+
+                        array_splice($comparableAttributes, 2, 0, [[
+                            'code' => 'addToCartHtml',
+                            'admin_name' => 'Actions'
+                        ]]);
+                    @endphp
+
+                    @foreach ($comparableAttributes as $attribute)
+                        <div class="row col-12 pr-0 mt15">
+                            <div class="col-2">
+                                <span class="fs16">{{ $attribute['admin_name'] }}</span>
+                            </div>
+
+                            <div class="col" :key="`title-${index}`" v-for="(product, index) in products">
+                                @switch ($attribute['code'])
+                                    @case('name')
+                                        <a :href="`${$root.baseUrl}/${product.url_key}`" class="unset remove-decoration active-hover">
+                                            <h1 class="fw6 fs18" v-text="product['{{ $attribute['code'] }}']"></h1>
+                                        </a>
+                                        @break
+
+                                    @case('image')
+                                        <a :href="`${$root.baseUrl}/${product.url_key}`" class="unset">
+                                            <img :src="product['{{ $attribute['code'] }}']" class="image-wrapper"></span>
+                                        </a>
+                                        @break
+
+                                    @case('price')
+                                        <span v-html="product['priceHTML']"></span>
+                                        @break
+
+                                    @case('addToCartHtml')
+                                        <div class="action">
+                                            <vnode-injector :nodes="getDynamicHTML(product.addToCartHtml)"></vnode-injector>
+
+                                            <i
+                                                class="material-icons cross fs16"
+                                                @click="removeProductCompare(product.id)">
+
+                                                close
+                                            </i>
+                                        </div>
+                                        @break
+
+                                    @case('color')
+                                        <span v-html="product.color_label" class="fs16"></span>
+                                        @break
+
+                                    @case('size')
+                                        <span v-html="product.size_label" class="fs16"></span>
+                                        @break
+
+                                    @case('description')
+                                        <span v-html="product.description"></span>
+                                        @break
+
+                                    @default
+                                        <span v-html="product['{{ $attribute['code'] }}']" class="fs16"></span>
+                                        @break
+
+                                @endswitch
+                            </div>
+                        </div>
+                    @endforeach
+                </template>
+
+                <span v-else-if="isProductListLoaded && products.length == 0">
+                    @{{ __('customer.compare.empty-text') }}
+                </span>
+            </div>
+
+            {!! view_render_event('bagisto.shop.customers.account.compare.view.after') !!}
+        </section>
+    </script>
+
+    <script>
+        Vue.component('compare-product', {
+            template: '#compare-product-template',
+
+            data: function () {
+                return {
+                    'products': [],
+                    'isProductListLoaded': false,
+                    'isCustomer': '{{ auth()->guard('customer')->user() ? "true" : "false" }}' == "true",
+                }
+            },
+
+            mounted: function () {
+                this.getComparedProducts();
+            },
+
+            methods: {
+                'getComparedProducts': function () {
+                    let items = '';
+                    let url = `${this.$root.baseUrl}/${this.isCustomer ? 'comparison' : 'detailed-products'}`;
+
+                    let data = {
+                        params: {'data': true}
+                    }
+
+                    if (! this.isCustomer) {
+                        items = this.getStorageValue('compared_product');
+                        items = items ? items.join('&') : '';
+
+                        data = {
+                            params: {
+                                items
+                            }
+                        };
+                    }
+
+                    if (this.isCustomer || (! this.isCustomer && items != "")) {
+                        this.$http.get(url, data)
+                        .then(response => {
+                            this.isProductListLoaded = true;
+                            this.products = response.data.products;
+                        })
+                        .catch(error => {
+                            this.isProductListLoaded = true;
+                            console.log(this.__('error.something_went_wrong'));
+                        });
+                    } else {
+                        this.isProductListLoaded = true;
+                    }
+
+                },
+
+                'removeProductCompare': function (productId) {
+                    if (this.isCustomer) {
+                        this.$http.delete(`${this.$root.baseUrl}/comparison?productId=${productId}`)
+                        .then(response => {
+                            if (productId == 'all') {
+                                this.$set(this, 'products', this.products.filter(product => false));
+                            } else {
+                                this.$set(this, 'products', this.products.filter(product => product.id != productId));
+                            }
+
+                            window.showAlert(`alert-${response.data.status}`, response.data.label, response.data.message);
+                        })
+                        .catch(error => {
+                            console.log(this.__('error.something_went_wrong'));
+                        });
+                    } else {
+                        let existingItems = this.getStorageValue('compared_product');
+
+                        if (productId == "all") {
+                            updatedItems = [];
+                            this.$set(this, 'products', []);
+                        } else {
+                            updatedItems = existingItems.filter(item => item != productId);
+                            this.$set(this, 'products', this.products.filter(product => product.id != productId));
+                        }
+
+                        this.setStorageValue('compared_product', updatedItems);
+
+                        window.showAlert(
+                            `alert-success`,
+                            this.__('shop.general.alert.success'),
+                            `${this.__('customer.compare.removed')}`
+                        );
+                    }
+
+                    this.$root.headerItemsCount++;
+                },
+            }
+        });
+    </script>
+@endpush
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/guest/compare/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/guest/compare/index.blade.php
index 161078f64..78b233fee 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/guest/compare/index.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/guest/compare/index.blade.php
@@ -1,211 +1,11 @@
 @extends('shop::layouts.master')
 
+@include('shop::guest.compare.compare-products')
+
 @section('page_title')
     {{ __('velocity::app.customer.compare.compare_similar_items') }}
 @endsection
 
 @section('content-wrapper')
-    @php
-        $attributeRepository = app('\Webkul\Attribute\Repositories\AttributeRepository');
-        $comparableAttributes = $attributeRepository->findByField('is_comparable', 1);
-    @endphp
-
     <compare-product></compare-product>
-@endsection
-
-@push('scripts')
-    <script type="text/x-template" id="compare-product-template">
-        <section class="cart-details row no-margin col-12">
-            <h1 class="fw6 col-6">
-                {{ __('velocity::app.customer.compare.compare_similar_items') }}
-            </h1>
-
-            <div class="col-6" v-if="products.length > 0">
-                <button
-                    class="theme-btn light pull-right"
-                    @click="removeProductCompare('all')">
-                    {{ __('shop::app.customer.account.wishlist.deleteall') }}
-                </button>
-            </div>
-
-            {!! view_render_event('bagisto.shop.customers.account.compare.view.before') !!}
-
-            <div class="row compare-products col-12 ml0">
-                <shimmer-component v-if="!isProductListLoaded && !isMobile()"></shimmer-component>
-
-                <template v-else-if="isProductListLoaded && products.length > 0">
-                    @php
-                        $comparableAttributes = $comparableAttributes->toArray();
-
-                        array_splice($comparableAttributes, 1, 0, [[
-                            'code' => 'image',
-                            'admin_name' => 'Product Image'
-                        ]]);
-
-                        array_splice($comparableAttributes, 2, 0, [[
-                            'code' => 'addToCartHtml',
-                            'admin_name' => 'Actions'
-                        ]]);
-                    @endphp
-
-                    @foreach ($comparableAttributes as $attribute)
-                        <div class="row col-12 pr-0 mt15">
-                            <div class="col-2">
-                                <span class="fs16">{{ $attribute['admin_name'] }}</span>
-                            </div>
-
-                            <div class="col" :key="`title-${index}`" v-for="(product, index) in products">
-                                @switch ($attribute['code'])
-                                    @case('name')
-                                        <a :href="`${$root.baseUrl}/${product.url_key}`" class="unset remove-decoration active-hover">
-                                            <h1 class="fw6 fs18" v-text="product['{{ $attribute['code'] }}']"></h1>
-                                        </a>
-                                        @break
-
-                                    @case('image')
-                                        <a :href="`${$root.baseUrl}/${product.url_key}`" class="unset">
-                                            <img :src="product['{{ $attribute['code'] }}']" class="image-wrapper"></span>
-                                        </a>
-                                        @break
-
-                                    @case('price')
-                                        <span v-html="product['priceHTML']"></span>
-                                        @break
-
-                                    @case('addToCartHtml')
-                                        <div class="action">
-                                            <vnode-injector :nodes="getDynamicHTML(product.addToCartHtml)"></vnode-injector>
-
-                                            <i
-                                                class="material-icons cross fs16"
-                                                @click="removeProductCompare(product.id)">
-
-                                                close
-                                            </i>
-                                        </div>
-                                        @break
-
-                                    @case('color')
-                                        <span v-html="product.color_label" class="fs16"></span>
-                                        @break
-
-                                    @case('size')
-                                        <span v-html="product.size_label" class="fs16"></span>
-                                        @break
-
-                                    @case('description')
-                                        <span v-html="product.description"></span>
-                                        @break
-
-                                    @default
-                                        <span v-html="product['{{ $attribute['code'] }}']" class="fs16"></span>
-                                        @break
-
-                                @endswitch
-                            </div>
-                        </div>
-                    @endforeach
-                </template>
-
-                <span v-else-if="isProductListLoaded && products.length == 0">
-                    @{{ __('customer.compare.empty-text') }}
-                </span>
-            </div>
-
-            {!! view_render_event('bagisto.shop.customers.account.compare.view.after') !!}
-        </section>
-    </script>
-
-    <script>
-        Vue.component('compare-product', {
-            template: '#compare-product-template',
-
-            data: function () {
-                return {
-                    'products': [],
-                    'isProductListLoaded': false,
-                    'isCustomer': '{{ auth()->guard('customer')->user() ? "true" : "false" }}' == "true",
-                }
-            },
-
-            mounted: function () {
-                this.getComparedProducts();
-            },
-
-            methods: {
-                'getComparedProducts': function () {
-                    let items = '';
-                    let url = `${this.$root.baseUrl}/${this.isCustomer ? 'comparison' : 'detailed-products'}`;
-
-                    let data = {
-                        params: {'data': true}
-                    }
-
-                    if (! this.isCustomer) {
-                        items = this.getStorageValue('compared_product');
-                        items = items ? items.join('&') : '';
-
-                        data = {
-                            params: {
-                                items
-                            }
-                        };
-                    }
-
-                    if (this.isCustomer || (! this.isCustomer && items != "")) {
-                        this.$http.get(url, data)
-                        .then(response => {
-                            this.isProductListLoaded = true;
-                            this.products = response.data.products;
-                        })
-                        .catch(error => {
-                            this.isProductListLoaded = true;
-                            console.log(this.__('error.something_went_wrong'));
-                        });
-                    } else {
-                        this.isProductListLoaded = true;
-                    }
-
-                },
-
-                'removeProductCompare': function (productId) {
-                    if (this.isCustomer) {
-                        this.$http.delete(`${this.$root.baseUrl}/comparison?productId=${productId}`)
-                        .then(response => {
-                            if (productId == 'all') {
-                                this.$set(this, 'products', this.products.filter(product => false));
-                            } else {
-                                this.$set(this, 'products', this.products.filter(product => product.id != productId));
-                            }
-
-                            window.showAlert(`alert-${response.data.status}`, response.data.label, response.data.message);
-                        })
-                        .catch(error => {
-                            console.log(this.__('error.something_went_wrong'));
-                        });
-                    } else {
-                        let existingItems = this.getStorageValue('compared_product');
-
-                        if (productId == "all") {
-                            updatedItems = [];
-                            this.$set(this, 'products', []);
-                        } else {
-                            updatedItems = existingItems.filter(item => item != productId);
-                            this.$set(this, 'products', this.products.filter(product => product.id != productId));
-                        }
-
-                        this.setStorageValue('compared_product', updatedItems);
-
-                        window.showAlert(
-                            `alert-success`,
-                            this.__('shop.general.alert.success'),
-                            `${this.__('customer.compare.removed')}`
-                        );
-                    }
-
-                    this.$root.headerItemsCount++;
-                },
-            }
-        });
-    </script>
-@endpush
\ No newline at end of file
+@endsection
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/layouts/top-nav/login-section.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/layouts/top-nav/login-section.blade.php
index 8523618dd..1125f0e95 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/layouts/top-nav/login-section.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/layouts/top-nav/login-section.blade.php
@@ -87,7 +87,7 @@
                             </li>
 
                             <li>
-                                <a href="{{ route('velocity.product.compare') }}" class="unset">{{ __('velocity::app.customer.compare.text') }}</a>
+                                <a href="{{ route('velocity.customer.product.compare') }}" class="unset">{{ __('velocity::app.customer.compare.text') }}</a>
                             </li>
 
                             <li>