From 0f1c6598b30040b8752a2f36c9e8863530ece4ab Mon Sep 17 00:00:00 2001
From: Akhtar Khan <67889091+akhtarkhan1@users.noreply.github.com>
Date: Thu, 16 Jul 2020 11:50:54 +0530
Subject: [PATCH 1/7] Update compare-products.blade.php

---
 .../guest/compare/compare-products.blade.php  | 65 +------------------
 1 file changed, 1 insertion(+), 64 deletions(-)

diff --git a/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php b/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php
index 6e7245ec3..9d47794ac 100644
--- a/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php
@@ -3,69 +3,6 @@
     $comparableAttributes = $attributeRepository->findByField('is_comparable', 1);
 @endphp
 
-@push('css')
-    <style>
-        body {
-            overflow-x: hidden;
-        }
-
-        .comparison-component {
-            width: 100%;
-            padding-top: 20px;
-        }
-
-        .comparison-component > h1 {
-            display: inline-block;
-        }
-
-        .cart-wish-wrap{
-            position: relative;
-        }
-
-        td {
-            padding: 15px;
-            min-width: 250px;
-            max-width: 250px;
-            line-height: 30px;
-            vertical-align: top;
-            word-break: break-word;
-        }
-
-        .icon.remove-product {
-            top: 15px;
-            float: right;
-            cursor: pointer;
-            position: relative;
-            background-color: black;
-        }
-
-        .action > div {
-            display: inline-block;
-        }
-
-        .wishlist-icon {
-            margin-left: 183px;
-            position: absolute;
-            margin-top: -39px;
-
-        }
-
-        table{
-            border-style: solid;
-
-        }
-
-        td{
-            vertical-align: top;
-            padding: 5px 20px;
-        }
-       
-        tr:nth-child(odd){
-            background: #f2f2f2;
-        }
-    </style>
-@endpush
-
 @push('scripts')
     <script type="text/x-template" id="compare-product-template">
         <section class="comparison-component">
@@ -309,4 +246,4 @@
             }
         });
     </script>
-@endpush
\ No newline at end of file
+@endpush

From 24603b6cac02319e615d28bd81ffa2f20dd690eb Mon Sep 17 00:00:00 2001
From: Akhtar Khan <akhtar.khan671@webkul.com>
Date: Thu, 20 Aug 2020 16:20:50 +0530
Subject: [PATCH 2/7] final fixed

---
 packages/Webkul/Product/src/Models/Product.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/Webkul/Product/src/Models/Product.php b/packages/Webkul/Product/src/Models/Product.php
index 0f5ae81eb..35d0458fb 100755
--- a/packages/Webkul/Product/src/Models/Product.php
+++ b/packages/Webkul/Product/src/Models/Product.php
@@ -196,6 +196,7 @@ class Product extends Model implements ProductContract
         foreach ($data as $value) {
             $metaData = $value;
         }        
+        
         return $metaData;
     }
 

From c548b645783ed6df3bc67820c38a5e85f140ace3 Mon Sep 17 00:00:00 2001
From: Akhtar Khan <akhtar.khan671@webkul.com>
Date: Thu, 20 Aug 2020 16:24:00 +0530
Subject: [PATCH 3/7] remove compare file from PR

---
 .../guest/compare/compare-products.blade.php  | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php b/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php
index 1c64de3aa..5bb457f64 100644
--- a/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/guest/compare/compare-products.blade.php
@@ -1,6 +1,7 @@
 @php
     $attributeRepository = app('\Webkul\Attribute\Repositories\AttributeFamilyRepository');
     $comparableAttributes = $attributeRepository->getComparableAttributesBelongsToFamily();
+
     $locale = request()->get('locale') ?: app()->getLocale();
     
     $attributeOptionTranslations = DB::table('attribute_option_translations')->where('locale', $locale)->get()->toJson();
@@ -26,10 +27,12 @@
                 <template v-if="isProductListLoaded && products.length > 0">
                     @php
                         $comparableAttributes = $comparableAttributes->toArray();
+
                         array_splice($comparableAttributes, 1, 0, [[
                             'code' => 'product_image',
                             'admin_name' => __('velocity::app.customer.compare.product_image'),
                         ]]);
+
                         array_splice($comparableAttributes, 2, 0, [[
                             'code' => 'addToCartHtml',
                             'admin_name' => __('velocity::app.customer.compare.actions'),
@@ -137,6 +140,7 @@
     <script>
         Vue.component('compare-product', {
             template: '#compare-product-template',
+
             data: function () {
                 return {
                     'products': [],
@@ -146,32 +150,40 @@
                     'isCustomer': '{{ auth()->guard('customer')->user() ? "true" : "false" }}' == "true",
                 }
             },
+
             mounted: function () {
                 this.getComparedProducts();
             },
+
             methods: {
                 'getComparedProducts': function () {
                     let items = '';
                     let url = `${this.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;
+
                             if (response.data.products.length > 2) {
                                 $('.comparison-component').css('overflow-x', 'scroll');
                             }
+
                             this.products = response.data.products;
                         })
                         .catch(error => {
@@ -181,7 +193,9 @@
                     } else {
                         this.isProductListLoaded = true;
                     }
+
                 },
+
                 'removeProductCompare': function (productId) {
                     if (this.isCustomer) {
                         this.$http.delete(`${this.baseUrl}/comparison?productId=${productId}`)
@@ -191,7 +205,9 @@
                             } else {
                                 this.$set(this, 'products', this.products.filter(product => product.id != productId));
                             }
+
                             window.flashMessages = [{'type': 'alert-success', 'message': response.data.message }];
+
                             this.$root.addFlashMessages();
                         })
                         .catch(error => {
@@ -199,6 +215,7 @@
                         });
                     } else {
                         let existingItems = this.getStorageValue('compared_product');
+
                         if (productId == "all") {
                             updatedItems = [];
                             this.$set(this, 'products', []);
@@ -208,27 +225,36 @@
                             this.$set(this, 'products', this.products.filter(product => product.id != productId));
                             window.flashMessages = [{'type': 'alert-success', 'message': '{{ __('shop::app.customer.compare.removed') }}' }];
                         }
+
                         this.setStorageValue('compared_product', updatedItems);
+
                         this.$root.addFlashMessages();
                     }
+
                     this.updateCompareCount();
                 },
+
                 'getDynamicHTML': function (input) {
                     var _staticRenderFns;
                     const { render, staticRenderFns } = Vue.compile(input);
+
                     if (this.$options.staticRenderFns.length > 0) {
                         _staticRenderFns = this.$options.staticRenderFns;
                     } else {
                         _staticRenderFns = this.$options.staticRenderFns = staticRenderFns;
                     }
+
                     try {
                         var output = render.call(this, this.$createElement);
                     } catch (exception) {
                         console.log(this.__('error.something_went_wrong'));
                     }
+
                     this.$options.staticRenderFns = _staticRenderFns;
+
                     return output;
                 },
+
                 'isMobile': function () {
                     if (/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)) {
                     return true
@@ -236,26 +262,35 @@
                     return false
                     }
                 },
+
                 'getStorageValue': function (key) {
                     let value = window.localStorage.getItem(key);
+
                     if (value) {
                         value = JSON.parse(value);
                     }
+
                     return value;
                 },
+
                 'setStorageValue': function (key, value) {
                     window.localStorage.setItem(key, JSON.stringify(value));
+
                     return true;
                 },
+
                 'getAttributeOptions': function (productDetails, attributeValues, type) {
                     var attributeOptions = '__';
+
                     if (productDetails && attributeValues) {
                         var attributeItems;
+
                         if (type == "multiple") {
                             attributeItems = productDetails[attributeValues].split(',');
                         } else if (type == "single") {
                             attributeItems = productDetails[attributeValues];
                         }
+
                         attributeOptions = this.attributeOptions.filter(option => {
                             if (type == "multiple") {
                                 if (attributeItems.indexOf(option.attribute_option_id.toString()) > -1) {
@@ -266,15 +301,20 @@
                                     return true;
                                 }
                             }
+
                             return false;
                         });
+
                         attributeOptions = attributeOptions.map(option => {
                             return option.label;
                         });
+
                         attributeOptions = attributeOptions.join(', ');
                     }
+
                     return attributeOptions;
                 },
+
                 'updateCompareCount': function () {
                     if (this.isCustomer == "true" || this.isCustomer == true) {
                         this.$http.get(`${this.baseUrl}/items-count`)
@@ -292,6 +332,7 @@
                     } else {
                         let comparedItems = JSON.parse(localStorage.getItem('compared_product'));
                         comparedItemsCount = comparedItems ? comparedItems.length : 0;
+
                         $('#compare-items-count').html(comparedItemsCount);
                     }
                 }

From 1a302657effbddae30454b156cd0a160fc98a2de Mon Sep 17 00:00:00 2001
From: Akhtar Khan <akhtar.khan671@webkul.com>
Date: Thu, 20 Aug 2020 18:38:49 +0530
Subject: [PATCH 4/7] solved

---
 packages/Webkul/Product/src/Models/Product.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/Webkul/Product/src/Models/Product.php b/packages/Webkul/Product/src/Models/Product.php
index 35d0458fb..8b548910b 100755
--- a/packages/Webkul/Product/src/Models/Product.php
+++ b/packages/Webkul/Product/src/Models/Product.php
@@ -193,6 +193,7 @@ class Product extends Model implements ProductContract
                     ->where('channel',$channel)
                     ->get();
 
+        $metaData = [];
         foreach ($data as $value) {
             $metaData = $value;
         }        

From b39487beaea2f685b2814e5fa0d77dd693b41ae3 Mon Sep 17 00:00:00 2001
From: Akhtar Khan <akhtar.khan671@webkul.com>
Date: Thu, 20 Aug 2020 20:34:36 +0530
Subject: [PATCH 5/7] issue #3799

---
 .../Resources/views/shop/home/featured-products.blade.php  | 7 ++++++-
 .../src/Resources/views/shop/home/new-products.blade.php   | 6 +++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/home/featured-products.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/home/featured-products.blade.php
index 57ee55597..39e150c97 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/home/featured-products.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/home/featured-products.blade.php
@@ -82,8 +82,13 @@
                     'getFeaturedProducts': function () {
                         this.$http.get(`${this.baseUrl}/category-details?category-slug=featured-products&count={{ $count }}`)
                         .then(response => {
-                            if (response.data.status)
+                            var count = '{{$count}}';
+                            if (response.data.status && count != 0 )
+                            {
                                 this.featuredProducts = response.data.products;
+                            }else{
+                                this.featuredProducts = 0;   
+                            }
 
                             this.isLoading = false;
                         })
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/home/new-products.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/home/new-products.blade.php
index bc762ccfc..360e79f5e 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/home/new-products.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/home/new-products.blade.php
@@ -146,8 +146,12 @@
                     'getNewProducts': function () {
                         this.$http.get(`${this.baseUrl}/category-details?category-slug=new-products&count={{ $count }}`)
                         .then(response => {
-                            if (response.data.status)
+                            var count = '{{$count}}';
+                            if (response.data.status && count != 0){
                                 this.newProducts = response.data.products;
+                            }else{
+                                this.newProducts = 0;
+                            }
 
                             this.isLoading = false;
                         })

From 2a4218bfa1f3f42d5db8db393ac9aed0b2ae8913 Mon Sep 17 00:00:00 2001
From: Akhtar Khan <akhtar.khan671@webkul.com>
Date: Thu, 20 Aug 2020 20:44:24 +0530
Subject: [PATCH 6/7] final

---
 .../Webkul/Product/src/Models/Product.php     | 30 ++------------
 ...12_30_155256_create_velocity_meta_data.php |  3 --
 .../Velocity/src/Resources/lang/en/app.php    |  3 --
 .../views/admin/meta-info/meta-data.blade.php | 41 ++-----------------
 .../shop/products/view/cross-sells.blade.php  |  6 +--
 5 files changed, 8 insertions(+), 75 deletions(-)

diff --git a/packages/Webkul/Product/src/Models/Product.php b/packages/Webkul/Product/src/Models/Product.php
index 8b548910b..be98c2cf8 100755
--- a/packages/Webkul/Product/src/Models/Product.php
+++ b/packages/Webkul/Product/src/Models/Product.php
@@ -11,7 +11,6 @@ use Webkul\Product\Database\Eloquent\Builder;
 use Webkul\Attribute\Models\AttributeFamilyProxy;
 use Webkul\Inventory\Models\InventorySourceProxy;
 use Webkul\Attribute\Repositories\AttributeRepository;
-use Webkul\Velocity\Repositories\VelocityMetadataRepository;
 use Webkul\Product\Contracts\Product as ProductContract;
 
 class Product extends Model implements ProductContract
@@ -159,8 +158,7 @@ class Product extends Model implements ProductContract
      */
     public function related_products()
     {
-        $count = $this->getMetaData()->related_product_count;
-        return $this->belongsToMany(static::class, 'product_relations', 'parent_id', 'child_id')->limit($count);
+        return $this->belongsToMany(static::class, 'product_relations', 'parent_id', 'child_id')->limit(4);
     }
 
     /**
@@ -168,8 +166,7 @@ class Product extends Model implements ProductContract
      */
     public function up_sells()
     {
-        $count = $this->getMetaData()->up_selling_product_count;
-        return $this->belongsToMany(static::class, 'product_up_sells', 'parent_id', 'child_id')->limit($count);
+        return $this->belongsToMany(static::class, 'product_up_sells', 'parent_id', 'child_id')->limit(4);
     }
 
     /**
@@ -177,28 +174,7 @@ class Product extends Model implements ProductContract
      */
     public function cross_sells()
     {
-        $count = $this->getMetaData()->cross_selling_product_count;
-        return $this->belongsToMany(static::class, 'product_cross_sells', 'parent_id', 'child_id')->limit($count);
-    }
-
-    /**
-     * GetMetaData belongs to the Velocity Meta Data
-     */
-    public function getMetaData()
-    {   
-        $locale = app()->getLocale();
-        $channel = core()->getCurrentChannelCode();
-        $data = app(VelocityMetadataRepository::class)
-                    ->where('locale',$locale)
-                    ->where('channel',$channel)
-                    ->get();
-
-        $metaData = [];
-        foreach ($data as $value) {
-            $metaData = $value;
-        }        
-        
-        return $metaData;
+        return $this->belongsToMany(static::class, 'product_cross_sells', 'parent_id', 'child_id')->limit(4);
     }
 
     /**
diff --git a/packages/Webkul/Velocity/src/Database/Migrations/2019_12_30_155256_create_velocity_meta_data.php b/packages/Webkul/Velocity/src/Database/Migrations/2019_12_30_155256_create_velocity_meta_data.php
index a610fa7d0..aa66107f7 100644
--- a/packages/Webkul/Velocity/src/Database/Migrations/2019_12_30_155256_create_velocity_meta_data.php
+++ b/packages/Webkul/Velocity/src/Database/Migrations/2019_12_30_155256_create_velocity_meta_data.php
@@ -23,9 +23,6 @@ class CreateVelocityMetaData extends Migration
             $table->integer('sidebar_category_count')->default(9);
             $table->integer('featured_product_count')->default(10);
             $table->integer('new_products_count')->default(10);
-            $table->integer('up_selling_product_count')->default(10);
-            $table->integer('cross_selling_product_count')->default(5);
-            $table->integer('related_product_count')->default(10);
             $table->text('subscription_bar_content')->nullable();
             $table->timestamps();
         });
diff --git a/packages/Webkul/Velocity/src/Resources/lang/en/app.php b/packages/Webkul/Velocity/src/Resources/lang/en/app.php
index a36d34043..c595338cc 100644
--- a/packages/Webkul/Velocity/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Velocity/src/Resources/lang/en/app.php
@@ -98,9 +98,6 @@ return [
             'subscription-content'      => 'Subscription bar Content',
             'sidebar-categories'        => 'Sidebar Categories',
             'header_content_count'      => 'Header Content Count',
-            'up_selling_product_count'  => 'Up Selling Product Count',
-            'cross_selling_product_count'=>'Cross Selling Product Count',
-            'related_product_count'     => 'Related Product Count',
             'footer-left-raw-content'   => '<p>We love to craft softwares and solve the real world problems with the binaries. We are highly committed to our goals. We invest our resources to create world class easy to use softwares and applications for the enterprise business with the top notch, on the edge technology expertise.</p>',
             'slider-path'               => 'Slider Path',
             'category-logo'             => 'Category logo',
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 cc06c42ff..f809714b8 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
@@ -125,42 +125,6 @@
                             value="{{ $metaData ? $metaData->new_products_count : 10 }}" />
                     </div>
 
-                    <div class="control-group">
-                        <label>{{ __('velocity::app.admin.meta-data.up_selling_product_count') }}</label>
-
-                        <input
-                            type="number"
-                            min="0"
-                            class="control"
-                            id="up_selling_product_count"
-                            name="up_selling_product_count"
-                            value="{{$metaData->up_selling_product_count}}" />
-                    </div>
-
-                    <div class="control-group">
-                        <label>{{ __('velocity::app.admin.meta-data.cross_selling_product_count') }}</label>
-
-                        <input
-                            type="number"
-                            min="0"
-                            class="control"
-                            id="cross_selling_product_count"
-                            name="cross_selling_product_count"
-                            value="{{$metaData->cross_selling_product_count}}" />
-                    </div>
-
-                    <div class="control-group">
-                        <label>{{ __('velocity::app.admin.meta-data.related_product_count') }}</label>
-
-                        <input
-                            type="number"
-                            min="0"
-                            class="control"
-                            id="related_product_count"
-                            name="related_product_count"
-                            value="{{$metaData->related_product_count}}" />
-                    </div>
-
                     <div class="control-group">
                         <label style="width:100%;">
                             {{ __('velocity::app.admin.meta-data.home-page-content') }}
@@ -203,12 +167,15 @@
                                 3 => [],
                                 2 => [],
                             ];
+
                             $index = 0;
+
                             foreach ($metaData->get('locale')->all() as $key => $value) {
                                 if ($value->locale == $locale) {
                                     $index = $key;
                                 }
                             }
+
                             $advertisement = json_decode($metaData->get('advertisement')->all()[$index]->advertisement, true);
                         @endphp
 
@@ -354,4 +321,4 @@
             });
         });
     </script>
-@endpush
\ No newline at end of file
+@endpush
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/products/view/cross-sells.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/products/view/cross-sells.blade.php
index 212529a08..f095c431b 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/products/view/cross-sells.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/products/view/cross-sells.blade.php
@@ -6,10 +6,6 @@
             $products[] = $product;
             $products = array_unique($products);
         }
-
-        $data = app('Webkul\Product\Repositories\ProductRepository')
-                    ->getMetaData();
-        $product_count = $data->cross_selling_product_count;
     ?>
 @endforeach
 
@@ -30,7 +26,7 @@
             :slides-count="{{ $product->cross_sells()->count() }}">
             
             @foreach($products as $product)
-                @foreach ($product->cross_sells()->paginate($product_count) as $index => $crossSellProduct)
+                @foreach ($product->cross_sells()->paginate(2) as $index => $crossSellProduct)
                     <slide slot="slide-{{ $index }}">
                         @include ('shop::products.list.card', [
                             'product' => $crossSellProduct,

From d3e1057cb5903208888233c5324d832f5af22caf Mon Sep 17 00:00:00 2001
From: Akhtar Khan <akhtar.khan671@webkul.com>
Date: Fri, 21 Aug 2020 17:31:44 +0530
Subject: [PATCH 7/7] recently view product issue solved

---
 .../views/shop/home/new-products.blade.php    | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/home/new-products.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/home/new-products.blade.php
index 360e79f5e..aae047276 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/home/new-products.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/home/new-products.blade.php
@@ -122,6 +122,30 @@
 
                 {!! view_render_event('bagisto.shop.new-products.after') !!}
             </template>
+
+            @if($count==0)
+                <template>
+                    
+                        @if ($showRecentlyViewed)
+                            @push('css')
+                                <style>
+                                    .recently-viewed {
+                                        padding-right: 0px;
+                                    }
+                                </style>
+                            @endpush
+
+                            <div class="row {{ $direction }}">
+                                <div class="col-9 no-padding carousel-products vc-full-screen with-recent-viewed" v-if="!isMobileView"></div>
+
+                                @include ('shop::products.list.recently-viewed', [
+                                    'quantity'          => 3,
+                                    'addClass'          => 'col-lg-3 col-md-12',
+                                ])
+                            </div>     
+                        @endif
+                </template>
+            @endif
         </div>
     </script>
 
@@ -146,7 +170,7 @@
                     'getNewProducts': function () {
                         this.$http.get(`${this.baseUrl}/category-details?category-slug=new-products&count={{ $count }}`)
                         .then(response => {
-                            var count = '{{$count}}';
+                             var count = '{{$count}}';
                             if (response.data.status && count != 0){
                                 this.newProducts = response.data.products;
                             }else{