From 6d59ac651578afdb7e9a2bed1912c910d86781a6 Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Fri, 15 Jan 2021 13:27:46 +0530 Subject: [PATCH] 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);