From 2d31e6a13d549050251b15d38aa89c4f7b1c3f51 Mon Sep 17 00:00:00 2001 From: sanjeev Date: Mon, 18 Jul 2022 18:22:34 +0530 Subject: [PATCH] validation for percentage discount amt added --- .../src/Http/Controllers/CartRuleController.php | 12 ++++++++++++ .../src/Http/Controllers/CatalogRuleController.php | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/packages/Webkul/CartRule/src/Http/Controllers/CartRuleController.php b/packages/Webkul/CartRule/src/Http/Controllers/CartRuleController.php index 66ca7f168..e8b514242 100644 --- a/packages/Webkul/CartRule/src/Http/Controllers/CartRuleController.php +++ b/packages/Webkul/CartRule/src/Http/Controllers/CartRuleController.php @@ -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) { diff --git a/packages/Webkul/CatalogRule/src/Http/Controllers/CatalogRuleController.php b/packages/Webkul/CatalogRule/src/Http/Controllers/CatalogRuleController.php index 1516f2741..7046d6b79 100644 --- a/packages/Webkul/CatalogRule/src/Http/Controllers/CatalogRuleController.php +++ b/packages/Webkul/CatalogRule/src/Http/Controllers/CatalogRuleController.php @@ -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);