diff --git a/app/Http/Controllers/Forms/FormUpCountryController.php b/app/Http/Controllers/Forms/FormUpCountryController.php index de86299..075faa0 100644 --- a/app/Http/Controllers/Forms/FormUpCountryController.php +++ b/app/Http/Controllers/Forms/FormUpCountryController.php @@ -837,13 +837,18 @@ class FormUpCountryController extends Controller return redirect()->back(); } - public function reject($id) + public function reject(Request $request, $id) { $this->checkAuthorization(auth()->user(), ['approval.reject']); + $request->validate([ + 'remarks' => 'required|string|max:500', + ]); + $form = FormUpCountry::findOrfail($id); $form->update([ - 'status' => 'Rejected' + 'status' => 'Rejected', + 'remarks' => $request->remarks, ]); $heads = $form->user->getCabangAndRegionHead(); @@ -936,4 +941,4 @@ class FormUpCountryController extends Controller session()->flash('success', 'Form has been deleted.'); return redirect()->back(); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Forms/FormVehicleController.php b/app/Http/Controllers/Forms/FormVehicleController.php index 8b55643..d220abe 100644 --- a/app/Http/Controllers/Forms/FormVehicleController.php +++ b/app/Http/Controllers/Forms/FormVehicleController.php @@ -716,13 +716,18 @@ class FormVehicleController extends Controller return redirect()->back(); } - public function reject($id) + public function reject(Request $request, $id) { $this->checkAuthorization(auth()->user(), ['approval.reject']); + $request->validate([ + 'remarks' => 'required|string|max:500', + ]); + $form = FormVehicleRunningCost::findOrfail($id); $form->update([ - 'status' => 'Rejected' + 'status' => 'Rejected', + 'remarks' => $request->remarks, ]); $heads = $form->user->getCabangAndRegionHead(); @@ -815,4 +820,4 @@ class FormVehicleController extends Controller session()->flash('success', 'Form has been deleted.'); return redirect()->back(); } -} \ No newline at end of file +} diff --git a/app/Models/FormUpCountry.php b/app/Models/FormUpCountry.php index e4b49c9..e92ee34 100644 --- a/app/Models/FormUpCountry.php +++ b/app/Models/FormUpCountry.php @@ -34,6 +34,7 @@ class FormUpCountry extends Model 'uc_plan', 'account_number', 'status', + 'remarks', 'approved_at', 'approved2_at', 'approved_by', diff --git a/app/Models/FormVehicleRunningCost.php b/app/Models/FormVehicleRunningCost.php index 4b5bacc..2e2b9d8 100644 --- a/app/Models/FormVehicleRunningCost.php +++ b/app/Models/FormVehicleRunningCost.php @@ -25,6 +25,7 @@ class FormVehicleRunningCost extends Model 'account_number', 'type', 'status', + 'remarks', 'approved_at', 'approved2_at', 'approved_by', diff --git a/resources/views/backend/pages/admins/expense.blade.php b/resources/views/backend/pages/admins/expense.blade.php index 0288d84..0a597c0 100644 --- a/resources/views/backend/pages/admins/expense.blade.php +++ b/resources/views/backend/pages/admins/expense.blade.php @@ -116,13 +116,11 @@ -
+ @else @if ($form->approved_at) {{ \Carbon\Carbon::parse($form->approved_at)->locale('id')->isoFormat('D MMMM Y') }} @@ -277,13 +275,11 @@ - @else @if ($form->approved_at) {{ \Carbon\Carbon::parse($form->approved_at)->locale('id')->isoFormat('D MMMM Y') }} @@ -824,6 +820,35 @@ +