diff --git a/packages/Webkul/Admin/src/Config/system.php b/packages/Webkul/Admin/src/Config/system.php index 2572a5a41..5a952217c 100644 --- a/packages/Webkul/Admin/src/Config/system.php +++ b/packages/Webkul/Admin/src/Config/system.php @@ -149,6 +149,24 @@ 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' => 'number', + 'validation' => 'required|min:0', + ], + [ + 'name' => 'no_of_featured_product_homepage', + 'title' => 'admin::app.admin.system.allow-no-of-featured-product-homepage', + 'type' => 'number', + 'validation' => 'required|min:0', + ], + ], ], [ '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 9bf01841b..3593eab94 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 in 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', 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') + + @elseif ($field['type'] == 'number') + + @elseif ($field['type'] == 'color') diff --git a/packages/Webkul/Product/src/Repositories/ProductRepository.php b/packages/Webkul/Product/src/Repositories/ProductRepository.php index abe90d89d..8245ea1e3 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 ? $count : 4); 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 ? $count : 4); 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())