From 6b2e65807070d9fc9404b75a415cea7e2f028435 Mon Sep 17 00:00:00 2001 From: Fiqh Pratama Date: Sun, 12 Oct 2025 19:14:17 +0700 Subject: [PATCH] add remarks 1 --- .../Forms/FormUpCountryController.php | 11 ++- .../Forms/FormVehicleController.php | 11 ++- app/Models/FormUpCountry.php | 1 + app/Models/FormVehicleRunningCost.php | 1 + .../backend/pages/admins/expense.blade.php | 65 +++++++++++++---- .../pages/forms/upcountry/index.blade.php | 71 ++++++++++++++---- .../pages/forms/upcountry/view.blade.php | 69 ++++++++++++++---- .../pages/forms/vehicle/index.blade.php | 72 +++++++++++++++---- .../pages/forms/vehicle/view.blade.php | 69 ++++++++++++++---- 9 files changed, 295 insertions(+), 75 deletions(-) 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 @@ -
- @csrf - @method('PUT') - -
+ @else @if ($form->approved_at) {{ \Carbon\Carbon::parse($form->approved_at)->locale('id')->isoFormat('D MMMM Y') }} @@ -277,13 +275,11 @@ -
- @csrf - @method('PUT') - -
@else @if ($form->approved_at) {{ \Carbon\Carbon::parse($form->approved_at)->locale('id')->isoFormat('D MMMM Y') }} @@ -824,6 +820,35 @@ +
+ +
@endsection @section('scripts') @@ -844,5 +869,21 @@ if ($('#dataTable-form_others').length) { $('#dataTable-form_others').DataTable({ responsive: false }); } + + $(document).on('click', '.open-reject-modal', function () { + const rejectUrl = $(this).data('action'); + $('#rejectForm').attr('action', rejectUrl); + $('#rejectRemarks').val(''); + $('#rejectModal').modal('show'); + }); + + $('#rejectModal').on('shown.bs.modal', function () { + $('#rejectRemarks').trigger('focus'); + }); + + $('#rejectModal').on('hidden.bs.modal', function () { + $('#rejectForm').attr('action', ''); + $('#rejectRemarks').val(''); + }); @endsection diff --git a/resources/views/backend/pages/forms/upcountry/index.blade.php b/resources/views/backend/pages/forms/upcountry/index.blade.php index 3f1ecef..7611de3 100644 --- a/resources/views/backend/pages/forms/upcountry/index.blade.php +++ b/resources/views/backend/pages/forms/upcountry/index.blade.php @@ -166,13 +166,11 @@ -
- @csrf - @method('PUT') - -
+ @endif @endif @if ($item->approved_at) @@ -193,13 +191,11 @@ -
- @csrf - @method('PUT') - -
+ @endif @endif @if ($item->approved2_at) @@ -470,6 +466,35 @@ +
+ +
@endsection @section('scripts') @@ -514,6 +539,24 @@ }); } + + // Handle Reject Button Click + $(document).on('click', '.open-reject-modal', function () { + const rejectUrl = $(this).data('action'); + $('#rejectForm').attr('action', rejectUrl); + $('#rejectRemarks').val(''); + $('#rejectModal').modal('show'); + }); + + $('#rejectModal').on('shown.bs.modal', function () { + $('#rejectRemarks').trigger('focus'); + }); + + $('#rejectModal').on('hidden.bs.modal', function () { + $('#rejectForm').attr('action', ''); + $('#rejectRemarks').val(''); + }); + // -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/backend/pages/forms/vehicle/view.blade.php b/resources/views/backend/pages/forms/vehicle/view.blade.php index 6b76683..126d848 100644 --- a/resources/views/backend/pages/forms/vehicle/view.blade.php +++ b/resources/views/backend/pages/forms/vehicle/view.blade.php @@ -94,23 +94,19 @@ @if (auth()->user()->can('approval.approve') && $form->status == 'On Progress') -
- @csrf - @method('PUT') - -
+ @elseif(auth()->user()->can('approval2.approve') && $form->status == 'Approved 1') -
- @csrf - @method('PUT') - -
+ @elseif(auth()->user()->can('final_approval.approve') && $form->status == 'Approved 2') @endif @@ -265,6 +261,35 @@ +
+ +
@endsection @section('scripts') @@ -279,6 +304,22 @@