From d70888c28a3989890ff3febc51d0f517c730c9a5 Mon Sep 17 00:00:00 2001
From: gusaindeepak54 <gusaindeepak54@gmail.com>
Date: Fri, 18 Sep 2020 15:47:46 +0530
Subject: [PATCH 1/9] Add new and featured Product Config

---
 packages/Webkul/Admin/src/Config/system.php   | 16 ++++++++++++
 .../Admin/src/Resources/lang/en/app.php       |  3 +++
 .../views/admin/meta-info/meta-data.blade.php | 25 ++-----------------
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/packages/Webkul/Admin/src/Config/system.php b/packages/Webkul/Admin/src/Config/system.php
index 2572a5a41..df9d6624d 100644
--- a/packages/Webkul/Admin/src/Config/system.php
+++ b/packages/Webkul/Admin/src/Config/system.php
@@ -149,6 +149,22 @@ return [
                 'type'  => 'boolean',
             ],
         ],
+    ], [
+        'key'    => 'catalog.products.homepage',
+        'name'   => 'admin::app.admin.system.homepage',
+        'sort'   => 2,
+        'fields' => [
+            [
+                'name'  => 'no_of_new_product_homepage',
+                'title' => 'admin::app.admin.system.allow-no-of-new-product-homepage',
+                'type'  => 'text',
+            ],
+            [
+                'name'  => 'no_of_featured_product_homepage',
+                'title' => 'admin::app.admin.system.allow-no-of-featured-product-homepage',
+                'type'  => 'text',
+            ],
+        ],
     ], [
         'key'    => 'catalog.products.storefront',
         'name'   => 'admin::app.admin.system.storefront',
diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index a13fd6dc7..b3b75b617 100755
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -1251,6 +1251,9 @@ return [
         ],
         'system' => [
             'catalog' => 'Catalog',
+            'homepage' => 'Homepage configuration',
+            'allow-no-of-new-product-homepage' => 'Allowed No of New Product homepage',
+            'allow-no-of-featured-product-homepage' => 'Allowed No of Featured Product homepage',
             'products' => 'Products',
             'guest-checkout' => 'Guest Checkout',
             'allow-guest-checkout' => 'Allow Guest Checkout',
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 8873e5c00..e1574fda5 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
@@ -105,30 +105,9 @@
                             value="{{ $metaData ? $metaData->header_content_count : '5' }}" />
                     </div>
 
-                    <div class="control-group">
-                        <label>{{ __('shop::app.home.featured-products') }}</label>
-
-                        <input
-                            type="number"
-                            min="0"
-                            class="control"
-                            id="featured_product_count"
-                            name="featured_product_count"
-                            value="{{ $metaData ? $metaData->featured_product_count : 10 }}" />
-                    </div>
-
-                    <div class="control-group">
-                        <label>{{ __('shop::app.home.new-products') }}</label>
-
-                        <input
-                            type="number"
-                            min="0"
-                            class="control"
-                            id="new_products_count"
-                            name="new_products_count"
-                            value="{{ $metaData ? $metaData->new_products_count : 10 }}" />
-                    </div>
+                  
 
+                  
                     <div class="control-group">
                         <label style="width:100%;">
                             {{ __('velocity::app.admin.meta-data.home-page-content') }}

From 26dcef5fb4270ba74a8832ccb2044767ae53f32d Mon Sep 17 00:00:00 2001
From: gusaindeepak54 <gusaindeepak54@gmail.com>
Date: Fri, 18 Sep 2020 16:09:30 +0530
Subject: [PATCH 2/9] Update Velocity Theme

---
 .../src/Resources/views/shop/home/featured-products.blade.php  | 3 ++-
 .../src/Resources/views/shop/home/new-products.blade.php       | 3 ++-
 2 files changed, 4 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 39e150c97..20ad0e629 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
@@ -1,5 +1,6 @@
 @php
-    $count = $velocityMetaData ? $velocityMetaData->featured_product_count : 10;
+    $count = core()->getConfigData('catalog.products.homepage.no_of_featured_product_homepage');
+    $count = $count ? $count : 10;
     $direction = core()->getCurrentLocale()->direction == 'rtl' ? 'rtl' : 'ltr';
 @endphp
 
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 4299579fc..edbc0efbd 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
@@ -1,5 +1,6 @@
 @php
-    $count = $velocityMetaData ? $velocityMetaData->new_products_count : 10;
+    $count = core()->getConfigData('catalog.products.homepage.no_of_new_product_homepage');
+    $count = $count ? $count : 10;
     $direction = core()->getCurrentLocale()->direction == 'rtl' ? 'rtl' : 'ltr';
 @endphp
 

From 7eff946013d8343a440de51970db18906e563b81 Mon Sep 17 00:00:00 2001
From: gusaindeepak54 <gusaindeepak54@gmail.com>
Date: Fri, 18 Sep 2020 16:25:17 +0530
Subject: [PATCH 3/9] Update Shop Theme

---
 .../Webkul/Product/src/Repositories/ProductRepository.php | 8 ++++++--
 .../src/Resources/views/home/featured-products.blade.php  | 2 +-
 .../Shop/src/Resources/views/home/new-products.blade.php  | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/Webkul/Product/src/Repositories/ProductRepository.php b/packages/Webkul/Product/src/Repositories/ProductRepository.php
index abe90d89d..e0cba2c68 100755
--- a/packages/Webkul/Product/src/Repositories/ProductRepository.php
+++ b/packages/Webkul/Product/src/Repositories/ProductRepository.php
@@ -317,6 +317,8 @@ class ProductRepository extends Repository
      */
     public function getNewProducts()
     {
+        $count = core()->getConfigData('catalog.products.homepage.no_of_new_product_homepage'); 
+
         $results = app(ProductFlatRepository::class)->scopeQuery(function ($query) {
             $channel = request()->get('channel') ?: (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode());
 
@@ -330,7 +332,7 @@ class ProductRepository extends Repository
                 ->where('product_flat.channel', $channel)
                 ->where('product_flat.locale', $locale)
                 ->inRandomOrder();
-        })->paginate(4);
+        })->paginate($count);
 
         return $results;
     }
@@ -342,6 +344,8 @@ class ProductRepository extends Repository
      */
     public function getFeaturedProducts()
     {
+        $count = core()->getConfigData('catalog.products.homepage.no_of_featured_product_homepage'); 
+
         $results = app(ProductFlatRepository::class)->scopeQuery(function ($query) {
             $channel = request()->get('channel') ?: (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode());
 
@@ -355,7 +359,7 @@ class ProductRepository extends Repository
                 ->where('product_flat.channel', $channel)
                 ->where('product_flat.locale', $locale)
                 ->inRandomOrder();
-        })->paginate(4);
+        })->paginate($count);
 
         return $results;
     }
diff --git a/packages/Webkul/Shop/src/Resources/views/home/featured-products.blade.php b/packages/Webkul/Shop/src/Resources/views/home/featured-products.blade.php
index 02f04f0e5..0280fe71f 100755
--- a/packages/Webkul/Shop/src/Resources/views/home/featured-products.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/home/featured-products.blade.php
@@ -1,4 +1,4 @@
-@if (app('Webkul\Product\Repositories\ProductRepository')->getFeaturedProducts()->count())
+@if (app('Webkul\Product\Repositories\ProductRepository')->getFeaturedProducts())
     <section class="featured-products">
 
         <div class="featured-heading">
diff --git a/packages/Webkul/Shop/src/Resources/views/home/new-products.blade.php b/packages/Webkul/Shop/src/Resources/views/home/new-products.blade.php
index a49b4ebcf..a3581ae23 100755
--- a/packages/Webkul/Shop/src/Resources/views/home/new-products.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/home/new-products.blade.php
@@ -1,4 +1,4 @@
-@if (app('Webkul\Product\Repositories\ProductRepository')->getNewProducts()->count())
+@if (app('Webkul\Product\Repositories\ProductRepository')->getNewProducts())
     <section class="featured-products">
 
         <div class="featured-heading">

From 0f9bc969ae5ca845425fdfb1230d4deb0f94aafd Mon Sep 17 00:00:00 2001
From: gusaindeepak54 <gusaindeepak54@gmail.com>
Date: Tue, 22 Sep 2020 11:47:22 +0530
Subject: [PATCH 4/9] update by default to 4 in default theme for new and
 featured product

---
 .../Webkul/Product/src/Repositories/ProductRepository.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/Product/src/Repositories/ProductRepository.php b/packages/Webkul/Product/src/Repositories/ProductRepository.php
index e0cba2c68..30056c71a 100755
--- a/packages/Webkul/Product/src/Repositories/ProductRepository.php
+++ b/packages/Webkul/Product/src/Repositories/ProductRepository.php
@@ -332,7 +332,7 @@ class ProductRepository extends Repository
                 ->where('product_flat.channel', $channel)
                 ->where('product_flat.locale', $locale)
                 ->inRandomOrder();
-        })->paginate($count);
+        })->paginate(isset($count) ? $count : 4);
 
         return $results;
     }
@@ -359,7 +359,7 @@ class ProductRepository extends Repository
                 ->where('product_flat.channel', $channel)
                 ->where('product_flat.locale', $locale)
                 ->inRandomOrder();
-        })->paginate($count);
+        })->paginate(isset($count) ? $count : 4);
 
         return $results;
     }

From ede9acad1c9c05ef2f806d35fd4fa2bac839c4f8 Mon Sep 17 00:00:00 2001
From: gusaindeepak54 <gusaindeepak54@gmail.com>
Date: Tue, 22 Sep 2020 12:10:37 +0530
Subject: [PATCH 5/9] fix the exception on getting the negative number

---
 packages/Webkul/Admin/src/Config/system.php                 | 6 ++++--
 .../src/Resources/views/configuration/field-type.blade.php  | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/Admin/src/Config/system.php b/packages/Webkul/Admin/src/Config/system.php
index df9d6624d..5a952217c 100644
--- a/packages/Webkul/Admin/src/Config/system.php
+++ b/packages/Webkul/Admin/src/Config/system.php
@@ -157,12 +157,14 @@ return [
             [
                 'name'  => 'no_of_new_product_homepage',
                 'title' => 'admin::app.admin.system.allow-no-of-new-product-homepage',
-                'type'  => 'text',
+                'type'  => 'number',
+                'validation'    => 'required|min:0',
             ],
             [
                 'name'  => 'no_of_featured_product_homepage',
                 'title' => 'admin::app.admin.system.allow-no-of-featured-product-homepage',
-                'type'  => 'text',
+                'type'  => 'number',
+                'validation'    => 'required|min:0',
             ],
         ],
     ], [
diff --git a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
index 9271b8092..c5d268a94 100755
--- a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
@@ -99,6 +99,10 @@
             @elseif ($field['type'] == 'password')
 
                 <input type="password" v-validate="'{{ $validations }}'" class="control" id="{{ $firstField }}[{{ $secondField }}][{{ $thirdField }}][{{ $field['name'] }}]" name="{{ $firstField }}[{{ $secondField }}][{{ $thirdField }}][{{ $field['name'] }}]" value="{{ old($name) ?: core()->getConfigData($name) }}" data-vv-as="&quot;{{ trans($field['title']) }}&quot;">
+            
+            @elseif ($field['type'] == 'number')
+
+                <input type="number" min="0" v-validate="'{{ $validations }}'" class="control" id="{{ $firstField }}[{{ $secondField }}][{{ $thirdField }}][{{ $field['name'] }}]" name="{{ $firstField }}[{{ $secondField }}][{{ $thirdField }}][{{ $field['name'] }}]" value="{{ old($name) ?: core()->getConfigData($name) }}" data-vv-as="&quot;{{ trans($field['title']) }}&quot;">
 
             @elseif ($field['type'] == 'color')
 

From f12c2d4fb082437211523da3a86122c0b29162a1 Mon Sep 17 00:00:00 2001
From: gusaindeepak54 <gusaindeepak54@gmail.com>
Date: Tue, 22 Sep 2020 15:24:27 +0530
Subject: [PATCH 6/9] fixed issue for no of product listed

---
 packages/Webkul/Admin/src/Resources/lang/en/app.php         | 4 ++--
 .../Webkul/Product/src/Repositories/ProductRepository.php   | 6 +++---
 .../Resources/views/shop/home/featured-products.blade.php   | 2 +-
 .../src/Resources/views/shop/home/new-products.blade.php    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index b3b75b617..6c39223bf 100755
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -1252,8 +1252,8 @@ return [
         'system' => [
             'catalog' => 'Catalog',
             'homepage' => 'Homepage configuration',
-            'allow-no-of-new-product-homepage' => 'Allowed No of New Product homepage',
-            'allow-no-of-featured-product-homepage' => 'Allowed No of Featured Product homepage',
+            'allow-no-of-new-product-homepage' => 'Allowed No of New Product in homepage',
+            'allow-no-of-featured-product-homepage' => 'Allowed No of Featured in Product homepage',
             'products' => 'Products',
             'guest-checkout' => 'Guest Checkout',
             'allow-guest-checkout' => 'Allow Guest Checkout',
diff --git a/packages/Webkul/Product/src/Repositories/ProductRepository.php b/packages/Webkul/Product/src/Repositories/ProductRepository.php
index 30056c71a..8245ea1e3 100755
--- a/packages/Webkul/Product/src/Repositories/ProductRepository.php
+++ b/packages/Webkul/Product/src/Repositories/ProductRepository.php
@@ -332,7 +332,7 @@ class ProductRepository extends Repository
                 ->where('product_flat.channel', $channel)
                 ->where('product_flat.locale', $locale)
                 ->inRandomOrder();
-        })->paginate(isset($count) ? $count : 4);
+        })->paginate($count ? $count : 4);
 
         return $results;
     }
@@ -344,7 +344,7 @@ class ProductRepository extends Repository
      */
     public function getFeaturedProducts()
     {
-        $count = core()->getConfigData('catalog.products.homepage.no_of_featured_product_homepage'); 
+        $count = core()->getConfigData('catalog.products.homepage.no_of_featured_product_homepage');
 
         $results = app(ProductFlatRepository::class)->scopeQuery(function ($query) {
             $channel = request()->get('channel') ?: (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode());
@@ -359,7 +359,7 @@ class ProductRepository extends Repository
                 ->where('product_flat.channel', $channel)
                 ->where('product_flat.locale', $locale)
                 ->inRandomOrder();
-        })->paginate(isset($count) ? $count : 4);
+        })->paginate($count ? $count : 4);
 
         return $results;
     }
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 20ad0e629..b0b4a9fcf 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
@@ -17,7 +17,7 @@
 
                 <div class="carousel-products vc-full-screen {{ $direction }}" v-if="!isMobileView">
                     <carousel-component
-                        slides-per-page="6"
+                        slides-per-page="{{$count}}"
                         navigation-enabled="hide"
                         pagination-enabled="hide"
                         id="fearured-products-carousel"
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 edbc0efbd..94120e4ee 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
@@ -29,7 +29,7 @@
                         <div class="row {{ $direction }}">
                             <div class="col-9 no-padding carousel-products vc-full-screen with-recent-viewed" v-if="!isMobileView">
                                 <carousel-component
-                                    slides-per-page="5"
+                                    slides-per-page="{{$count}}"
                                     navigation-enabled="hide"
                                     pagination-enabled="hide"
                                     id="new-products-carousel"
@@ -77,7 +77,7 @@
                     @else
                         <div class="carousel-products vc-full-screen {{ $direction }}" v-if="!isMobileView">
                             <carousel-component
-                                slides-per-page="6"
+                                slides-per-page="{{$count}}"
                                 navigation-enabled="hide"
                                 pagination-enabled="hide"
                                 id="new-products-carousel"

From 31d3c7f7cc10df6e7773a149ed1a8c94cfbe3cfb Mon Sep 17 00:00:00 2001
From: gusaindeepak54 <gusaindeepak54@gmail.com>
Date: Tue, 22 Sep 2020 15:27:27 +0530
Subject: [PATCH 7/9] Updated App.php

---
 packages/Webkul/Admin/src/Resources/lang/en/app.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index 6c39223bf..98652dc7b 100755
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -1252,8 +1252,8 @@ return [
         'system' => [
             'catalog' => 'Catalog',
             'homepage' => 'Homepage configuration',
-            'allow-no-of-new-product-homepage' => 'Allowed No of New Product in homepage',
-            'allow-no-of-featured-product-homepage' => 'Allowed No of Featured in Product homepage',
+            'allow-no-of-new-product-homepage' => 'Allowed No of New Product in Homepage',
+            'allow-no-of-featured-product-homepage' => 'Allowed No of Featured in Product Homepage',
             'products' => 'Products',
             'guest-checkout' => 'Guest Checkout',
             'allow-guest-checkout' => 'Allow Guest Checkout',

From a75055f5cfa10267e672cd07789092574d540869 Mon Sep 17 00:00:00 2001
From: gusaindeepak54 <gusaindeepak54@gmail.com>
Date: Tue, 22 Sep 2020 16:42:20 +0530
Subject: [PATCH 8/9] updated app.php

---
 packages/Webkul/Admin/src/Resources/lang/en/app.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index 98652dc7b..399b735db 100755
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -1253,7 +1253,7 @@ return [
             'catalog' => 'Catalog',
             'homepage' => 'Homepage configuration',
             'allow-no-of-new-product-homepage' => 'Allowed No of New Product in Homepage',
-            'allow-no-of-featured-product-homepage' => 'Allowed No of Featured in Product Homepage',
+            'allow-no-of-featured-product-homepage' => 'Allowed No of Featured Product in Homepage',
             'products' => 'Products',
             'guest-checkout' => 'Guest Checkout',
             'allow-guest-checkout' => 'Allow Guest Checkout',

From 0248bd2b951213ea097c2c0970165b0ba647e158 Mon Sep 17 00:00:00 2001
From: gusaindeepak54 <gusaindeepak54@gmail.com>
Date: Tue, 22 Sep 2020 16:56:25 +0530
Subject: [PATCH 9/9] fixed ui issue

---
 .../src/Resources/views/shop/home/featured-products.blade.php | 2 +-
 .../src/Resources/views/shop/home/new-products.blade.php      | 4 ++--
 2 files changed, 3 insertions(+), 3 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 b0b4a9fcf..20ad0e629 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
@@ -17,7 +17,7 @@
 
                 <div class="carousel-products vc-full-screen {{ $direction }}" v-if="!isMobileView">
                     <carousel-component
-                        slides-per-page="{{$count}}"
+                        slides-per-page="6"
                         navigation-enabled="hide"
                         pagination-enabled="hide"
                         id="fearured-products-carousel"
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 94120e4ee..edbc0efbd 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
@@ -29,7 +29,7 @@
                         <div class="row {{ $direction }}">
                             <div class="col-9 no-padding carousel-products vc-full-screen with-recent-viewed" v-if="!isMobileView">
                                 <carousel-component
-                                    slides-per-page="{{$count}}"
+                                    slides-per-page="5"
                                     navigation-enabled="hide"
                                     pagination-enabled="hide"
                                     id="new-products-carousel"
@@ -77,7 +77,7 @@
                     @else
                         <div class="carousel-products vc-full-screen {{ $direction }}" v-if="!isMobileView">
                             <carousel-component
-                                slides-per-page="{{$count}}"
+                                slides-per-page="6"
                                 navigation-enabled="hide"
                                 pagination-enabled="hide"
                                 id="new-products-carousel"