From 6d59ac651578afdb7e9a2bed1912c910d86781a6 Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Fri, 15 Jan 2021 13:27:46 +0530 Subject: [PATCH 1/2] Issue #4486 fixed --- .../src/Http/Controllers/CartRuleController.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/Webkul/CartRule/src/Http/Controllers/CartRuleController.php b/packages/Webkul/CartRule/src/Http/Controllers/CartRuleController.php index 459788067..7788e05e9 100644 --- a/packages/Webkul/CartRule/src/Http/Controllers/CartRuleController.php +++ b/packages/Webkul/CartRule/src/Http/Controllers/CartRuleController.php @@ -189,9 +189,15 @@ class CartRuleController extends Controller $cartRule = $this->cartRuleRepository->findOrFail($id); if ($cartRule->coupon_type) { - $this->validate(request(), [ - 'coupon_code' => 'required_if:use_auto_generation,==,0|unique:cart_rule_coupons,code,' . $cartRule->cart_rule_coupon->id, - ]); + if ($cartRule->cart_rule_coupon) { + $this->validate(request(), [ + 'coupon_code' => 'required_if:use_auto_generation,==,0|unique:cart_rule_coupons,code,' . $cartRule->cart_rule_coupon->id, + ]); + } else { + $this->validate(request(), [ + 'coupon_code' => 'required_if:use_auto_generation,==,0|unique:cart_rule_coupons,code', + ]); + } } Event::dispatch('promotions.cart_rule.update.before', $cartRule); From 349c39fdc910d80ff53f5ef604f804fc04016f18 Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Fri, 15 Jan 2021 15:57:54 +0530 Subject: [PATCH 2/2] Enhancement #4468 done --- packages/Webkul/Admin/src/Config/system.php | 5 +++++ packages/Webkul/Admin/src/Resources/lang/ar/app.php | 4 ++++ packages/Webkul/Admin/src/Resources/lang/de/app.php | 6 +++++- packages/Webkul/Admin/src/Resources/lang/en/app.php | 1 + packages/Webkul/Admin/src/Resources/lang/es/app.php | 4 ++++ packages/Webkul/Admin/src/Resources/lang/fa/app.php | 4 ++++ packages/Webkul/Admin/src/Resources/lang/it/app.php | 4 ++++ packages/Webkul/Admin/src/Resources/lang/nl/app.php | 4 ++++ packages/Webkul/Admin/src/Resources/lang/pl/app.php | 4 ++++ packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php | 4 ++++ packages/Webkul/Admin/src/Resources/lang/tr/app.php | 4 ++++ .../src/Resources/views/home/featured-products.blade.php | 8 +++++++- .../Shop/src/Resources/views/home/new-products.blade.php | 8 +++++++- 13 files changed, 57 insertions(+), 3 deletions(-) diff --git a/packages/Webkul/Admin/src/Config/system.php b/packages/Webkul/Admin/src/Config/system.php index e1e5bce54..964771e54 100644 --- a/packages/Webkul/Admin/src/Config/system.php +++ b/packages/Webkul/Admin/src/Config/system.php @@ -166,6 +166,11 @@ return [ 'type' => 'number', 'validation' => 'min:0', ], + [ + 'name' => 'out_of_stock_items', + 'title' => 'admin::app.admin.system.allow-out-of-stock-items', + 'type' => 'boolean', + ], ], ], [ 'key' => 'catalog.products.storefront', diff --git a/packages/Webkul/Admin/src/Resources/lang/ar/app.php b/packages/Webkul/Admin/src/Resources/lang/ar/app.php index 391f81f63..1d057c45c 100644 --- a/packages/Webkul/Admin/src/Resources/lang/ar/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/ar/app.php @@ -1329,6 +1329,10 @@ return [ ], 'system' => [ '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', + 'allow-out-of-stock-items' => 'Allow out of stock items', 'products' => 'منتجات', 'guest-checkout' => 'ضيف المحاسبة', 'allow-guest-checkout' => 'السماح للضيف بالخروج', diff --git a/packages/Webkul/Admin/src/Resources/lang/de/app.php b/packages/Webkul/Admin/src/Resources/lang/de/app.php index 7088d4541..bfcbea65a 100755 --- a/packages/Webkul/Admin/src/Resources/lang/de/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/de/app.php @@ -1197,7 +1197,7 @@ return [ 'edit-error' => 'Can not edit this event.' ] ], - + 'error' => [ 'go-to-home' => 'HOME ÖFFNEN', @@ -1337,6 +1337,10 @@ return [ 'system' => [ 'catalog' => 'Katalog', + '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', + 'allow-out-of-stock-items' => 'Allow out of stock items', 'products' => 'Produkte', 'guest-checkout' => 'Gastbestellungen', 'allow-guest-checkout' => 'Gastbestellungen erlauben', diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 2625e665e..a3330437c 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -1340,6 +1340,7 @@ return [ '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', + 'allow-out-of-stock-items' => 'Allow out of stock items', 'products' => 'Products', 'guest-checkout' => 'Guest Checkout', 'allow-guest-checkout' => 'Allow Guest Checkout', diff --git a/packages/Webkul/Admin/src/Resources/lang/es/app.php b/packages/Webkul/Admin/src/Resources/lang/es/app.php index 6f4f46711..f54ffc478 100644 --- a/packages/Webkul/Admin/src/Resources/lang/es/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/es/app.php @@ -1318,6 +1318,10 @@ return [ ], 'system' => [ 'catalog' => 'Catálogo', + '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', + 'allow-out-of-stock-items' => 'Allow out of stock items', 'products' => 'Productos', 'guest-checkout' => 'Compras como invitado', 'allow-guest-checkout' => 'Permitir compras como invitado', diff --git a/packages/Webkul/Admin/src/Resources/lang/fa/app.php b/packages/Webkul/Admin/src/Resources/lang/fa/app.php index ef58c897f..4f1170385 100644 --- a/packages/Webkul/Admin/src/Resources/lang/fa/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/fa/app.php @@ -1326,6 +1326,10 @@ return [ ], 'system' => [ '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', + 'allow-out-of-stock-items' => 'Allow out of stock items', 'products' => 'محصولات', 'guest-checkout' => 'وارسی میهمان', 'allow-guest-checkout' => 'مجاز به پرداخت مهمان', diff --git a/packages/Webkul/Admin/src/Resources/lang/it/app.php b/packages/Webkul/Admin/src/Resources/lang/it/app.php index 0ddf943ec..a56528d93 100644 --- a/packages/Webkul/Admin/src/Resources/lang/it/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/it/app.php @@ -1329,6 +1329,10 @@ return [ ], 'system' => [ 'catalog' => 'Catalogo', + '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', + 'allow-out-of-stock-items' => 'Allow out of stock items', 'products' => 'Prodotti', 'guest-checkout' => 'Checkout come Ospite', 'allow-guest-checkout' => 'Consenti Checkout come Ospite', diff --git a/packages/Webkul/Admin/src/Resources/lang/nl/app.php b/packages/Webkul/Admin/src/Resources/lang/nl/app.php index a0bbbfd43..1ef434a9a 100644 --- a/packages/Webkul/Admin/src/Resources/lang/nl/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/nl/app.php @@ -1325,6 +1325,10 @@ return [ ], 'system' => [ 'catalog' => 'Catalogus', + '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', + 'allow-out-of-stock-items' => 'Allow out of stock items', 'products' => 'Producten', 'guest-checkout' => 'Gast afrekenen', 'allow-guest-checkout' => 'Gast afrekenen toestaan', diff --git a/packages/Webkul/Admin/src/Resources/lang/pl/app.php b/packages/Webkul/Admin/src/Resources/lang/pl/app.php index 899d8ba2e..b2b695be5 100644 --- a/packages/Webkul/Admin/src/Resources/lang/pl/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/pl/app.php @@ -1326,6 +1326,10 @@ return [ ], 'system' => [ 'catalog' => 'Katalog', + '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', + 'allow-out-of-stock-items' => 'Allow out of stock items', 'products' => 'Produkty', 'guest-checkout' => 'Zamówienia gości', 'allow-guest-checkout' => 'Zezwalaj na zamówienia gości', diff --git a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php index 26b1473cd..bc166bd3d 100755 --- a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php @@ -1325,6 +1325,10 @@ return [ ], 'system' => [ 'catalog' => 'Catálogo', + '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', + 'allow-out-of-stock-items' => 'Allow out of stock items', 'products' => 'Produtos', 'guest-checkout' => 'Compras sem cadastro?', 'allow-guest-checkout' => 'Permitir compra para clientes sem cadastros?', diff --git a/packages/Webkul/Admin/src/Resources/lang/tr/app.php b/packages/Webkul/Admin/src/Resources/lang/tr/app.php index 16fef768b..15adcc075 100644 --- a/packages/Webkul/Admin/src/Resources/lang/tr/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/tr/app.php @@ -1313,6 +1313,10 @@ return [ ], 'system' => [ 'catalog' => 'Katalog', + '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', + 'allow-out-of-stock-items' => 'Allow out of stock items', 'products' => 'Ürünler', 'guest-checkout' => 'Ziyaretçi Satışı', 'allow-guest-checkout' => 'Ziyaretçi Alımına İzin Ver', 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 77aa48998..654a02043 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 @@ -11,7 +11,13 @@ @foreach (app('Webkul\Product\Repositories\ProductRepository')->getFeaturedProducts() as $productFlat) - @include ('shop::products.list.card', ['product' => $productFlat]) + @if (core()->getConfigData('catalog.products.homepage.out_of_stock_items')) + @include ('shop::products.list.card', ['product' => $productFlat]) + @else + @if ($productFlat->isSaleable()) + @include ('shop::products.list.card', ['product' => $productFlat]) + @endif + @endif @endforeach 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 c36bfca87..5a31b168c 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 @@ -11,7 +11,13 @@ @foreach (app('Webkul\Product\Repositories\ProductRepository')->getNewProducts() as $productFlat) - @include ('shop::products.list.card', ['product' => $productFlat]) + @if (core()->getConfigData('catalog.products.homepage.out_of_stock_items')) + @include ('shop::products.list.card', ['product' => $productFlat]) + @else + @if ($productFlat->isSaleable()) + @include ('shop::products.list.card', ['product' => $productFlat]) + @endif + @endif @endforeach