Merge pull request #6568 from papnoisanjeev/percentage-discount-validation-cart-rule-catalog-rule
Validation for percentage discount amt added.
This commit is contained in:
commit
8e42cb47f9
|
|
@ -110,6 +110,12 @@ class CartRuleController extends Controller
|
|||
'discount_amount' => 'required|numeric',
|
||||
]);
|
||||
|
||||
if (request()->has('action_type') && request()->action_type == 'by_percent') {
|
||||
$this->validate(request(), [
|
||||
'discount_amount' => 'required|numeric|max:100',
|
||||
]);
|
||||
}
|
||||
|
||||
$data = request()->all();
|
||||
|
||||
$this->cartRuleRepository->create($data);
|
||||
|
|
@ -161,6 +167,12 @@ class CartRuleController extends Controller
|
|||
'discount_amount' => 'required|numeric',
|
||||
]);
|
||||
|
||||
if ($request->has('action_type') && $request->action_type == 'by_percent') {
|
||||
$this->validate(request(), [
|
||||
'discount_amount' => 'required|numeric|max:100',
|
||||
]);
|
||||
}
|
||||
|
||||
$cartRule = $this->cartRuleRepository->findOrFail($id);
|
||||
|
||||
if ($cartRule->coupon_type) {
|
||||
|
|
|
|||
|
|
@ -72,6 +72,12 @@ class CatalogRuleController extends Controller
|
|||
'discount_amount' => 'required|numeric',
|
||||
]);
|
||||
|
||||
if (request()->has('action_type') && request()->action_type == 'by_percent') {
|
||||
$this->validate(request(), [
|
||||
'discount_amount' => 'required|numeric|max:100',
|
||||
]);
|
||||
}
|
||||
|
||||
$data = request()->all();
|
||||
|
||||
$this->catalogRuleRepository->create($data);
|
||||
|
|
@ -115,6 +121,12 @@ class CatalogRuleController extends Controller
|
|||
'discount_amount' => 'required|numeric',
|
||||
]);
|
||||
|
||||
if ($request->has('action_type') && $request->action_type == 'by_percent') {
|
||||
$this->validate(request(), [
|
||||
'discount_amount' => 'required|numeric|max:100',
|
||||
]);
|
||||
}
|
||||
|
||||
$this->catalogRuleRepository->findOrFail($id);
|
||||
|
||||
$this->catalogRuleRepository->update(request()->all(), $id);
|
||||
|
|
|
|||
Loading…
Reference in New Issue