From 0dec9277f76d7dcc99bf3efe7fb615c8edeebcee Mon Sep 17 00:00:00 2001 From: Jagad R R Date: Fri, 10 Jan 2025 13:16:17 +0700 Subject: [PATCH] fix bug cannot approve --- .../Forms/FormEntertainmentPresentationController.php | 7 ++++++- app/Http/Controllers/Forms/FormOtherController.php | 7 ++++++- app/Http/Controllers/Forms/FormVehicleController.php | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Forms/FormEntertainmentPresentationController.php b/app/Http/Controllers/Forms/FormEntertainmentPresentationController.php index e87ea98..f766359 100644 --- a/app/Http/Controllers/Forms/FormEntertainmentPresentationController.php +++ b/app/Http/Controllers/Forms/FormEntertainmentPresentationController.php @@ -273,10 +273,15 @@ class FormEntertainmentPresentationController extends Controller { $this->checkAuthorization(auth()->user(), ['approval.approve']); $request->validate([ - 'total' => 'required|numeric|min:1|max:' . BudgetHelper::getAvailableBudget(), + 'total' => 'required', ]); $form = FormEntertaimentPresentation::findOrfail($id); + if($form->total > BudgetHelper::getAvailableBudget()) { + session()->flash('error', 'The total nominal exceeds the available budget.'); + return redirect()->back(); + } + $form->update([ 'approved_at' => now(), 'approved_by' => auth()->user()->id, diff --git a/app/Http/Controllers/Forms/FormOtherController.php b/app/Http/Controllers/Forms/FormOtherController.php index 0d098ec..52e0ec3 100644 --- a/app/Http/Controllers/Forms/FormOtherController.php +++ b/app/Http/Controllers/Forms/FormOtherController.php @@ -266,10 +266,15 @@ class FormOtherController extends Controller $this->checkAuthorization(auth()->user(), ['approval.approve']); $request->validate([ - 'total' => 'required|numeric|min:1|max:' . BudgetHelper::getAvailableBudget(), + 'total' => 'required', ]); $form = FormOthers::findOrfail($id); + if($form->total > BudgetHelper::getAvailableBudget()) { + session()->flash('error', 'The total nominal exceeds the available budget.'); + return redirect()->back(); + } + $form->update([ 'approved_at' => now(), 'approved_by' => auth()->user()->id, diff --git a/app/Http/Controllers/Forms/FormVehicleController.php b/app/Http/Controllers/Forms/FormVehicleController.php index 238fb86..3cd411e 100644 --- a/app/Http/Controllers/Forms/FormVehicleController.php +++ b/app/Http/Controllers/Forms/FormVehicleController.php @@ -275,10 +275,15 @@ class FormVehicleController extends Controller { $this->checkAuthorization(auth()->user(), ['approval.approve']); $request->validate([ - 'total' => 'required|numeric|min:1|max:' . BudgetHelper::getAvailableBudget(), + 'total' => 'required', ]); $form = FormVehicleRunningCost::findOrfail($id); + if($form->total > BudgetHelper::getAvailableBudget()) { + session()->flash('error', 'The total nominal exceeds the available budget.'); + return redirect()->back(); + } + $form->update([ 'approved_at' => now(), 'approved_by' => auth()->user()->id,