Issue #4392 fixed
This commit is contained in:
parent
c4c871342e
commit
2af7c2cdc1
|
|
@ -180,7 +180,6 @@ class CartRuleController extends Controller
|
||||||
'customer_groups' => 'required|array|min:1',
|
'customer_groups' => 'required|array|min:1',
|
||||||
'coupon_type' => 'required',
|
'coupon_type' => 'required',
|
||||||
'use_auto_generation' => 'required_if:coupon_type,==,1',
|
'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',
|
'starts_from' => 'nullable|date',
|
||||||
'ends_till' => 'nullable|date|after_or_equal:starts_from',
|
'ends_till' => 'nullable|date|after_or_equal:starts_from',
|
||||||
'action_type' => 'required',
|
'action_type' => 'required',
|
||||||
|
|
@ -189,6 +188,12 @@ class CartRuleController extends Controller
|
||||||
|
|
||||||
$cartRule = $this->cartRuleRepository->findOrFail($id);
|
$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);
|
Event::dispatch('promotions.cart_rule.update.before', $cartRule);
|
||||||
|
|
||||||
$cartRule = $this->cartRuleRepository->update(request()->all(), $id);
|
$cartRule = $this->cartRuleRepository->update(request()->all(), $id);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue