From 2af7c2cdc19bbd115d36a7f70f81348488df2441 Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Wed, 13 Jan 2021 16:42:47 +0530 Subject: [PATCH] Issue #4392 fixed --- .../CartRule/src/Http/Controllers/CartRuleController.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/Webkul/CartRule/src/Http/Controllers/CartRuleController.php b/packages/Webkul/CartRule/src/Http/Controllers/CartRuleController.php index 0705841fe..459788067 100644 --- a/packages/Webkul/CartRule/src/Http/Controllers/CartRuleController.php +++ b/packages/Webkul/CartRule/src/Http/Controllers/CartRuleController.php @@ -180,7 +180,6 @@ class CartRuleController extends Controller 'customer_groups' => 'required|array|min:1', 'coupon_type' => 'required', 'use_auto_generation' => 'required_if:coupon_type,==,1', - 'coupon_code' => 'required_if:use_auto_generation,==,0|unique:cart_rule_coupons,code,' . $id, 'starts_from' => 'nullable|date', 'ends_till' => 'nullable|date|after_or_equal:starts_from', 'action_type' => 'required', @@ -189,6 +188,12 @@ 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, + ]); + } + Event::dispatch('promotions.cart_rule.update.before', $cartRule); $cartRule = $this->cartRuleRepository->update(request()->all(), $id);