From 678586b21d26faa7916bbf78955f27da039cea58 Mon Sep 17 00:00:00 2001
From: Jagad R R <jagadraya388@gmail.com>
Date: Tue, 4 Mar 2025 14:35:50 +0700
Subject: [PATCH] update approve button

---
 .../views/backend/pages/admins/edit.blade.php |  12 +-
 .../pages/forms/entertainment/view.blade.php  | 274 ++++++++++++++++
 .../pages/forms/meeting/view.blade.php        | 296 +++++++++++++++++
 .../backend/pages/forms/other/view.blade.php  | 264 ++++++++++++++++
 .../pages/forms/upcountry/view.blade.php      | 297 +++++++++++++++++-
 .../pages/forms/vehicle/view.blade.php        | 279 ++++++++++++++++
 6 files changed, 1414 insertions(+), 8 deletions(-)

diff --git a/resources/views/backend/pages/admins/edit.blade.php b/resources/views/backend/pages/admins/edit.blade.php
index c563514..c6095da 100644
--- a/resources/views/backend/pages/admins/edit.blade.php
+++ b/resources/views/backend/pages/admins/edit.blade.php
@@ -140,13 +140,13 @@
         // on page load call /api/cabang-by-regionId/region_id
         $(document).ready(function() {
             var region_id = {{ $admin->region_id }};
-            if (region_id) {
+            var admin_cabang_id = {{ $admin->cabang_id }};
+            if (region_id && admin_cabang_id) {
                 $.ajax({
                     url: '/api/cabang-by-regionId/' + region_id,
                     type: 'GET',
                     dataType: 'json',
                     success: function(data) {
-                        console.log(data);
                         $('#cabang_id').empty();
                         $('#cabang_id').append('<option value="">Select Cabang</option>');
                         $.each(data, function(key, value) {
@@ -159,17 +159,17 @@
 
         $(document).ready(function() {
             var cabang_id = {{ $admin->cabang_id }};
-            if (cabang_id) {
+            var admin_rayon_id = {{ $admin->rayon_id ? $admin->rayon_id : 0 }};
+            if (cabang_id && admin_rayon_id != 0) {
                 $.ajax({
                     url: '/api/rayon-by-cabangId/' + cabang_id,
                     type: 'GET',
                     dataType: 'json',
                     success: function(data) {
-                        console.log(data);
                         $('#rayon_id').empty();
                         $('#rayon_id').append('<option value="">Select Rayon</option>');
                         $.each(data, function(key, value) {
-                            $('#rayon_id').append('<option value="' + value.id + '" ' + (value.id == {{ $admin->rayon_id }} ? 'selected' : '') + '>' + value.name + '</option>');
+                            $('#rayon_id').append('<option value="' + value.id + '" ' + (value.id == admin_rayon_id ? 'selected' : '') + '>' + value.name + '</option>');
                         });
                     }
                 });
@@ -187,7 +187,6 @@
                         type: 'GET',
                         dataType: 'json',
                         success: function(data) {
-                            console.log(data);
                             $('#cabang_id').empty();
                             $('#cabang_id').append(
                                 '<option value="">Select Cabang</option>');
@@ -212,7 +211,6 @@
                         type: 'GET',
                         dataType: 'json',
                         success: function(data) {
-                            console.log(data);
                             $('#rayon_id').empty();
                             $('#rayon_id').append(
                                 '<option value="">Select Rayon</option>');
diff --git a/resources/views/backend/pages/forms/entertainment/view.blade.php b/resources/views/backend/pages/forms/entertainment/view.blade.php
index 1c8b1eb..0965912 100644
--- a/resources/views/backend/pages/forms/entertainment/view.blade.php
+++ b/resources/views/backend/pages/forms/entertainment/view.blade.php
@@ -80,6 +80,13 @@
 
                             <div class="col-lg-12">
                                 <a href="{{ route('forms.entertainment') }}" class="btn btn-secondary">Kembali</a>
+                                @if (auth()->user()->can('approval.approve') && $form->status == 'On Progress')
+                                    <button type="button" class="btn btn-success final-approve-modal" data-id="{{ route('forms.entertainment.approve', $form->id) }}">Approve 1</button>
+                                @elseif(auth()->user()->can('approval2.approve') && $form->status == 'Approved 1')
+                                    <button type="button" class="btn btn-success open-approve-modal" data-id="{{ route('forms.entertainment.approve2', $form->id) }}">Approve 2</button>
+                                @elseif(auth()->user()->can('final_approval.approve') && $form->status == 'Approved 2')
+                                    <button type="button" class="btn btn-primary open-approve-modal" data-id="{{ route('forms.entertainment.final-approve', $form->id) }}">Final Approve</button>
+                                @endif
                             </div>
                         </div>
 					</form>
@@ -87,7 +94,147 @@
             </div>
         </div>
     </section>
+    <section>
+		<div class="modal fade" id="approveModal" tabindex="-1" role="dialog" aria-labelledby="approveModalLabel" aria-hidden="true">
+			<div class="modal-dialog modal-lg" role="document">
+				<div class="modal-content">
+					<form id="approveForm" method="POST" action="">
+						@csrf
+						@method('PUT')
+						<div class="modal-header">
+							<h5 class="modal-title" id="approveModalLabel">Approve Item</h5>
+							<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+								<span aria-hidden="true">&times;</span>
+							</button>
+						</div>
+						<div class="modal-body">
+							<!-- Loading spinner -->
+							<div id="loadingSpinner" class="d-flex justify-content-center align-items-center" style="height: 200px;">
+								<div class="spinner-border text-primary" role="status">
+									<span class="sr-only">Loading...</span>
+								</div>
+							</div>
 
+							<!-- Modal content (hidden initially) -->
+							<div id="modalContent" class="d-none">
+								<p>Please review the details below:</p>
+								<ul class="list-group">
+									<li class="list-group-item">
+										<strong>Expense Number:</strong> <span id="expense_number"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>User:</strong> <span id="user"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>NIK/NPWP Penerima:</strong> <span id="nik_or_npwp"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Tanggal:</strong> <span id="tanggal"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Nama Penerima:</strong> <span id="name"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Jenis:</strong> <span id="jenis"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Keterangan:</strong> <span id="keterangan"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Bukti Total:</strong> <span id="bukti_total"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Nominal Total:</strong> <span id="total_value"></span>
+									</li>
+								</ul>
+							</div>
+						</div>
+
+						<div class="modal-footer">
+							<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+							<button type="submit" class="btn btn-primary">Approve</button>
+						</div>
+					</form>
+				</div>
+			</div>
+		</div>
+	</section>
+	<section>
+		<div class="modal fade" id="finalApproveModal" tabindex="-1" role="dialog" aria-labelledby="finalApproveModalLabel" aria-hidden="true">
+			<div class="modal-dialog modal-lg" role="document">
+				<div class="modal-content">
+					<form id="finalApproveForm" method="POST" action="">
+						@csrf
+						@method('PUT')
+						<div class="modal-header">
+							<h5 class="modal-title" id="approveModalLabel">Approve Item</h5>
+							<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+								<span aria-hidden="true">&times;</span>
+							</button>
+						</div>
+						<div class="modal-body">
+							<!-- Loading spinner -->
+							<div id="finalLoadingSpinner" class="d-flex justify-content-center align-items-center" style="height: 200px;">
+								<div class="spinner-border text-primary" role="status">
+									<span class="sr-only">Loading...</span>
+								</div>
+							</div>
+
+							<!-- Modal content (hidden initially) -->
+							<div id="finalModalContent" class="d-none">
+								<p>Please review the details below:</p>
+								<ul class="list-group">
+									<li class="list-group-item">
+										<strong>Expense Number:</strong> <span id="final_expense_number"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>User:</strong> <span id="final_user"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>NIK/NPWP Penerima:</strong> <span id="final_nik_or_npwp"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Tanggal:</strong> <span id="final_tanggal"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Nama Penerima:</strong> <span id="final_name"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Jenis:</strong> <span id="final_jenis"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Keterangan:</strong> <span id="final_keterangan"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Bukti Total:</strong> <span id="final_bukti_total"></span>
+									</li>
+								</ul>
+								<p class="mt-2">Please select the items you want to approve:</p>
+								<ul class="list-group list-unstyled">
+									<li>
+										<div class="form-group">
+											<div class="custom-control custom-checkbox">
+												<input type="checkbox" class="custom-control-input" id="final_total" name="total" required>
+												<label class="custom-control-label" for="final_total">Total (<span id="final_total_value"></span>)</label>
+											</div>
+										</div>
+									</li>
+								</ul>
+							</div>
+						</div>
+
+						<div class="modal-footer">
+							<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+							<button type="submit" class="btn btn-primary">Approve</button>
+						</div>
+					</form>
+				</div>
+			</div>
+		</div>
+	</section>
+@endsection
+
+@section('scripts')
     <script>
         new AutoNumeric('#total', {
             digitGroupSeparator: '.', // Pemisah ribuan
@@ -97,4 +244,131 @@
             unformatOnSubmit: true    // Nilai asli tanpa format saat dikirimkan
         });
     </script>
+
+    <script>
+		$(document).on('click', '.open-approve-modal', function() {
+			const approveUrl = $(this).data('id');
+
+			// Show spinner and hide content initially
+			$('#loadingSpinner').show();
+			$('#modalContent').addClass('d-none');
+
+			$('#approveForm').attr('action', approveUrl); // Set the form action
+			$('#loadingSpinner').addClass('d-flex');
+			$('#approveModal').modal('show'); // Show the modal
+
+			// Get detail from /forms/entertainment/detail/{id}
+			$.get(approveUrl.replace(/approve2|final-approve/g, 'detail'), function (data) {
+				const formatter = new Intl.NumberFormat('id-ID', {
+					style: 'currency',
+					currency: 'IDR',
+					minimumFractionDigits: 0
+				});
+
+				$('#total_value').text(formatter.format(data.total));
+
+				// Detail data
+				$('#user').text(data.user.name);
+				$('#expense_number').text(data.expense_number);
+				$('#tanggal').text(new Date(data.created_at).toLocaleDateString('id-ID', {
+					year: 'numeric',
+					month: 'long',
+					day: 'numeric'
+				}));
+
+				$('#nik_or_npwp').text(data.nik_or_npwp);
+				$('#name').text(data.name);
+				$('#jenis').text(data.jenis);
+				$('#keterangan').text(data.keterangan);
+
+				$('#bukti_total').html(data.total ? '<a href="' + data.total + '" target="_blank">Download</a>' : '-');
+
+				// Hide spinner and show content
+				$('#loadingSpinner').hide();
+				$('#loadingSpinner').removeClass('d-flex');
+				$('#loadingSpinner').addClass('d-none');
+				$('#modalContent').removeClass('d-none');
+
+				// Reset the total to zero
+				$('#total').val(0);
+			});
+		});
+
+		// Handle Approve Button Click
+		$(document).on('click', '.final-approve-modal', function() {
+			const approveUrl = $(this).data('id');
+
+			// Show spinner and hide content initially
+			$('#finalLoadingSpinner').show();
+			$('#finalModalContent').addClass('d-none');
+
+			$('#finalApproveForm').attr('action', approveUrl); // Set the form action
+			$('#finalLoadingSpinner').addClass('d-flex');
+			$('#finalApproveModal').modal('show'); // Show the modal
+
+			// Get detail from /forms/entertainment/detail/{id}
+			$.get(approveUrl.replace('approve', 'detail'), function (data) {
+				console.log(data);
+				const formatter = new Intl.NumberFormat('id-ID', {
+					style: 'currency',
+					currency: 'IDR',
+					minimumFractionDigits: 0
+				});
+
+				$('#final_total_value').text(formatter.format(data.total));
+
+				// Assign data values to checkboxes
+				$('#final_total').data('value', data.total);
+
+				// Detail data
+				$('#final_user').text(data.user.name);
+				$('#final_expense_number').text(data.expense_number);
+				$('#final_tanggal').text(new Date(data.created_at).toLocaleDateString('id-ID', {
+					year: 'numeric',
+					month: 'long',
+					day: 'numeric'
+				}));
+
+				$('#final_nik_or_npwp').text(data.nik_or_npwp);
+				$('#final_name').text(data.name);
+				$('#final_jenis').text(data.jenis);
+				$('#final_keterangan').text(data.keterangan);
+
+
+				$('#final_bukti_total').html(data.bukti_total ? '<a href="' + data.bukti_total + '" target="_blank">Download</a>' : '-');
+
+				// Hide spinner and show content
+				$('#finalLoadingSpinner').hide();
+				$('#finalLoadingSpinner').removeClass('d-flex');
+				$('#finalLoadingSpinner').addClass('d-none');
+				$('#finalModalContent').removeClass('d-none');
+
+				// Reset the total to zero
+				$('#total').val(0);
+			});
+		});
+
+		// Update total dynamically
+		$('.custom-control-input').on('change', function () {
+			let total = 0;
+			$('.custom-control-input:checked').each(function () {
+				total += parseFloat($(this).data('value') || 0);
+			});
+
+			const formatter = new Intl.NumberFormat('id-ID', {
+				style: 'currency',
+				currency: 'IDR',
+				minimumFractionDigits: 0,
+			});
+
+			$('#total').val(formatter.format(total));
+		});
+
+
+		// Uncheck all checkboxes when the modal is closed
+		$('#finalApproveModal').on('hidden.bs.modal', function () {
+			$('.custom-control-input').prop('checked', false);  // Uncheck all checkboxes
+			$('#total').val('0');  // Reset total to 0
+		});
+    </script>
 @endsection
diff --git a/resources/views/backend/pages/forms/meeting/view.blade.php b/resources/views/backend/pages/forms/meeting/view.blade.php
index cb5910b..6adbf90 100644
--- a/resources/views/backend/pages/forms/meeting/view.blade.php
+++ b/resources/views/backend/pages/forms/meeting/view.blade.php
@@ -72,6 +72,13 @@
                             {{-- back button --}}
                             <div class="col-lg-12">
                                 <a href="{{ route('forms.meeting') }}" class="btn btn-secondary">Kembali</a>
+                                @if (auth()->user()->can('approval.approve') && $form->status == 'On Progress')
+                                    <button type="button" class="btn btn-success final-approve-modal" data-id="{{ route('forms.meeting.approve', $form->id) }}">Approve 1</button>
+                                @elseif(auth()->user()->can('approval2.approve') && $form->status == 'Approved 1')
+                                    <button type="button" class="btn btn-success open-approve-modal" data-id="{{ route('forms.meeting.approve2', $form->id) }}">Approve 2</button>
+                                @elseif(auth()->user()->can('final_approval.approve') && $form->status == 'Approved 2')
+                                    <button type="button" class="btn btn-primary open-approve-modal" data-id="{{ route('forms.meeting.final-approve', $form->id) }}">Final Approve</button>
+                                @endif
                             </div>
                         </div>
 					</form>
@@ -79,7 +86,169 @@
             </div>
         </div>
     </section>
+    <section>
+		<div class="modal fade" id="approveModal" tabindex="-1" role="dialog" aria-labelledby="approveModalLabel" aria-hidden="true">
+			<div class="modal-dialog modal-lg" role="document">
+				<div class="modal-content">
+					<form id="approveForm" method="POST" action="">
+						@csrf
+						@method('PUT')
+						<div class="modal-header">
+							<h5 class="modal-title" id="approveModalLabel">Approve Item</h5>
+							<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+								<span aria-hidden="true">&times;</span>
+							</button>
+						</div>
+						<div class="modal-body">
+							<!-- Loading spinner -->
+							<div id="loadingSpinner" class="d-flex justify-content-center align-items-center" style="height: 200px;">
+								<div class="spinner-border text-primary" role="status">
+									<span class="sr-only">Loading...</span>
+								</div>
+							</div>
 
+							<!-- Modal content (hidden initially) -->
+							<div id="modalContent" class="d-none">
+								<p>Please review the details below:</p>
+								<ul class="list-group">
+									<li class="list-group-item">
+										<strong>Expense Number:</strong> <span id="expense_number"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>User:</strong> <span id="user"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Tipe:</strong> Meeting / Seminar
+									</li>
+									<li class="list-group-item">
+										<strong>Tanggal:</strong> <span id="tanggal"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Nominal Allowance:</strong> <span id="allowance_value"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Bukti Allowance:</strong> <span id="bukti_allowance"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Nominal Transport Antar Kota:</strong> <span id="transport_ankot_value"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Bukti Transport Antar Kota:</strong> <span id="bukti_transport_ankot"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Nominal Hotel:</strong> <span id="hotel_value"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Bukti Hotel:</strong> <span id="bukti_hotel"></span>
+									</li>
+								</ul>
+							</div>
+						</div>
+
+						<div class="modal-footer">
+							<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+							<button type="submit" class="btn btn-primary">Approve</button>
+						</div>
+					</form>
+				</div>
+			</div>
+		</div>
+	</section>
+	<section>
+		<div class="modal fade" id="finalApproveModal" tabindex="-1" role="dialog" aria-labelledby="finalApproveModalLabel" aria-hidden="true">
+			<div class="modal-dialog modal-lg" role="document">
+				<div class="modal-content">
+					<form id="finalApproveForm" method="POST" action="">
+						@csrf
+						@method('PUT')
+						<div class="modal-header">
+							<h5 class="modal-title" id="approveModalLabel">Approve Item</h5>
+							<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+								<span aria-hidden="true">&times;</span>
+							</button>
+						</div>
+						<div class="modal-body">
+							<!-- Loading spinner -->
+							<div id="finalLoadingSpinner" class="d-flex justify-content-center align-items-center" style="height: 200px;">
+								<div class="spinner-border text-primary" role="status">
+									<span class="sr-only">Loading...</span>
+								</div>
+							</div>
+
+							<!-- Modal content (hidden initially) -->
+							<div id="finalModalContent" class="d-none">
+								<p>Please review the details below:</p>
+								<ul class="list-group">
+									<li class="list-group-item">
+										<strong>Expense Number:</strong> <span id="final_expense_number"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>User:</strong> <span id="final_user"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Tipe:</strong> Meeting / Seminar
+									</li>
+									<li class="list-group-item">
+										<strong>Tanggal:</strong> <span id="final_tanggal"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Bukti Allowance:</strong> <span id="final_bukti_allowance"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Bukti Transport Antar Kota:</strong> <span id="final_bukti_transport_ankot"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Bukti Hotel:</strong> <span id="final_bukti_hotel"></span>
+									</li>
+								</ul>
+								<p class="mt-2">Please select the items you want to approve:</p>
+								<ul class="list-group list-unstyled">
+									<li>
+										<div class="form-group">
+											<div class="custom-control custom-checkbox">
+												<input type="checkbox" class="custom-control-input" id="final_allowance" name="allowance">
+												<label class="custom-control-label" for="final_allowance">Allowance (<span id="final_allowance_value"></span>)</label>
+											</div>
+										</div>
+									</li>
+									<li>
+										<div class="form-group">
+											<div class="custom-control custom-checkbox">
+												<input type="checkbox" class="custom-control-input" id="final_transport_ankot" name="transport_ankot">
+												<label class="custom-control-label" for="final_transport_ankot">Transport Ankot (<span id="final_transport_ankot_value"></span>)</label>
+											</div>
+										</div>
+									</li>
+									<li>
+										<div class="form-group">
+											<div class="custom-control custom-checkbox">
+												<input type="checkbox" class="custom-control-input" id="final_hotel" name="hotel">
+												<label class="custom-control-label" for="final_hotel">Hotel (<span id="final_hotel_value"></span>)</label>
+											</div>
+										</div>
+									</li>
+									<li>
+										<div class="form-group">
+											<label for="total">Total</label>
+											<input type="text" class="form-control" id="total" name="total" value="0" readonly>
+										</div>
+									</li>
+								</ul>
+							</div>
+						</div>
+
+						<div class="modal-footer">
+							<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+							<button type="submit" class="btn btn-primary">Approve</button>
+						</div>
+					</form>
+				</div>
+			</div>
+		</div>
+	</section>
+@endsection
+
+@section('scripts')
     <script>
         new AutoNumeric('#allowance', {
             digitGroupSeparator: '.', // Pemisah ribuan
@@ -113,4 +282,131 @@
             unformatOnSubmit: true    // Nilai asli tanpa format saat dikirimkan
         });
     </script>
+
+    <script>
+        // Handle Approve Button Click
+			$(document).on('click', '.open-approve-modal', function() {
+				const approveUrl = $(this).data('id');
+
+				// Show spinner and hide content initially
+				$('#loadingSpinner').show();
+				$('#modalContent').addClass('d-none');
+
+				$('#approveForm').attr('action', approveUrl); // Set the form action
+				$('#loadingSpinner').addClass('d-flex');
+				$('#approveModal').modal('show'); // Show the modal
+
+				// Get detail from /forms/meeting/detail/{id}
+				$.get(approveUrl.replace(/approve2|final-approve/g, 'detail'), function (data) {
+					const formatter = new Intl.NumberFormat('id-ID', {
+						style: 'currency',
+						currency: 'IDR',
+						minimumFractionDigits: 0
+					});
+
+					$('#allowance_value').text(formatter.format(data.allowance));
+					$('#transport_ankot_value').text(formatter.format(data.transport_ankot));
+					$('#hotel_value').text(formatter.format(data.hotel));
+
+					// Detail data
+					$('#user').text(data.user.name);
+					$('#expense_number').text(data.expense_number);
+					$('#tanggal').text(new Date(data.created_at).toLocaleDateString('id-ID', {
+						year: 'numeric',
+						month: 'long',
+						day: 'numeric'
+					}));
+
+					$('#bukti_allowance').html(data.bukti_allowance ? '<a href="' + data.bukti_allowance + '" target="_blank">Download</a>' : '-');
+					$('#bukti_transport_ankot').html(data.bukti_transport_ankot ? '<a href="' + data.bukti_transport_ankot + '" target="_blank">Download</a>' : '-');
+					$('#bukti_hotel').html(data.bukti_hotel ? '<a href="' + data.bukti_hotel + '" target="_blank">Download</a>' : '-');
+
+					// Hide spinner and show content
+					$('#loadingSpinner').hide();
+					$('#loadingSpinner').removeClass('d-flex');
+					$('#loadingSpinner').addClass('d-none');
+					$('#modalContent').removeClass('d-none');
+
+					// Reset the total to zero
+					$('#total').val(0);
+				});
+			});
+
+			// Handle Approve Button Click
+			$(document).on('click', '.final-approve-modal', function() {
+				const approveUrl = $(this).data('id');
+
+				// Show spinner and hide content initially
+				$('#finalLoadingSpinner').show();
+				$('#finalModalContent').addClass('d-none');
+
+				$('#finalApproveForm').attr('action', approveUrl); // Set the form action
+				$('#finalLoadingSpinner').addClass('d-flex');
+				$('#finalApproveModal').modal('show'); // Show the modal
+
+				// Get detail from /forms/meeting/detail/{id}
+				$.get(approveUrl.replace('approve', 'detail'), function (data) {
+					console.log(data);
+					const formatter = new Intl.NumberFormat('id-ID', {
+						style: 'currency',
+						currency: 'IDR',
+						minimumFractionDigits: 0
+					});
+
+					$('#final_allowance_value').text(formatter.format(data.allowance));
+					$('#final_transport_ankot_value').text(formatter.format(data.transport_ankot));
+					$('#final_hotel_value').text(formatter.format(data.hotel));
+
+					// Assign data values to checkboxes
+					$('#final_allowance').data('value', data.allowance);
+					$('#final_transport_ankot').data('value', data.transport_ankot);
+					$('#final_hotel').data('value', data.hotel);
+
+					// Detail data
+					$('#final_user').text(data.user.name);
+					$('#final_expense_number').text(data.expense_number);
+					$('#final_tanggal').text(new Date(data.created_at).toLocaleDateString('id-ID', {
+						year: 'numeric',
+						month: 'long',
+						day: 'numeric'
+					}));
+
+					$('#final_bukti_allowance').html(data.bukti_allowance ? '<a href="' + data.bukti_allowance + '" target="_blank">Download</a>' : '-');
+					$('#final_bukti_transport_ankot').html(data.bukti_transport_ankot ? '<a href="' + data.bukti_transport_ankot + '" target="_blank">Download</a>' : '-');
+					$('#final_bukti_hotel').html(data.bukti_hotel ? '<a href="' + data.bukti_hotel + '" target="_blank">Download</a>' : '-');
+
+					// Hide spinner and show content
+					$('#finalLoadingSpinner').hide();
+					$('#finalLoadingSpinner').removeClass('d-flex');
+					$('#finalLoadingSpinner').addClass('d-none');
+					$('#finalModalContent').removeClass('d-none');
+
+					// Reset the total to zero
+					$('#total').val(0);
+				});
+			});
+
+			// Update total dynamically
+			$('.custom-control-input').on('change', function () {
+				let total = 0;
+				$('.custom-control-input:checked').each(function () {
+					total += parseFloat($(this).data('value') || 0);
+				});
+
+				const formatter = new Intl.NumberFormat('id-ID', {
+					style: 'currency',
+					currency: 'IDR',
+					minimumFractionDigits: 0,
+				});
+
+				$('#total').val(formatter.format(total));
+			});
+
+
+			// Uncheck all checkboxes when the modal is closed
+			$('#finalApproveModal').on('hidden.bs.modal', function () {
+				$('.custom-control-input').prop('checked', false);  // Uncheck all checkboxes
+				$('#total').val('0');  // Reset total to 0
+			});
+    </script>
 @endsection
diff --git a/resources/views/backend/pages/forms/other/view.blade.php b/resources/views/backend/pages/forms/other/view.blade.php
index 4eb378b..a2c0ac1 100644
--- a/resources/views/backend/pages/forms/other/view.blade.php
+++ b/resources/views/backend/pages/forms/other/view.blade.php
@@ -68,8 +68,22 @@
                                 </div>
                             </div>
 
+                            <div class="col-lg-12">
+                                <div class="mb-3">
+                                    <label class="form-label">Status</label>
+                                    <input type="text" class="form-control" name="status" value="{{ $form->status }}" readonly>
+                                </div>
+                            </div>
+
                             <div class="col-lg-12">
                                 <a href="{{ route('forms.other') }}" class="btn btn-secondary">Kembali</a>
+                                @if (auth()->user()->can('approval.approve') && $form->status == 'On Progress')
+                                    <button type="button" class="btn btn-success final-approve-modal" data-id="{{ route('forms.other.approve', $form->id) }}">Approve 1</button>
+                                @elseif(auth()->user()->can('approval2.approve') && $form->status == 'Approved 1')
+                                    <button type="button" class="btn btn-success open-approve-modal" data-id="{{ route('forms.other.approve2', $form->id) }}">Approve 2</button>
+                                @elseif(auth()->user()->can('final_approval.approve') && $form->status == 'Approved 2')
+                                    <button type="button" class="btn btn-primary open-approve-modal" data-id="{{ route('forms.other.final-approve', $form->id) }}">Final Approve</button>
+                                @endif
                             </div>
                         </div>
 					</form>
@@ -77,7 +91,135 @@
             </div>
         </div>
     </section>
+    <section>
+		<div class="modal fade" id="approveModal" tabindex="-1" role="dialog" aria-labelledby="approveModalLabel" aria-hidden="true">
+			<div class="modal-dialog modal-lg" role="document">
+				<div class="modal-content">
+					<form id="approveForm" method="POST" action="">
+						@csrf
+						@method('PUT')
+						<div class="modal-header">
+							<h5 class="modal-title" id="approveModalLabel">Approve Item</h5>
+							<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+								<span aria-hidden="true">&times;</span>
+							</button>
+						</div>
+						<div class="modal-body">
+							<!-- Loading spinner -->
+							<div id="loadingSpinner" class="d-flex justify-content-center align-items-center" style="height: 200px;">
+								<div class="spinner-border text-primary" role="status">
+									<span class="sr-only">Loading...</span>
+								</div>
+							</div>
 
+							<!-- Modal content (hidden initially) -->
+							<div id="modalContent" class="d-none">
+								<p>Please review the details below:</p>
+								<ul class="list-group">
+									<li class="list-group-item">
+										<strong>Expense Number:</strong> <span id="expense_number"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>User:</strong> <span id="user"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Kategori:</strong> <span id="kategori"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Tanggal:</strong> <span id="tanggal"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Keterangan:</strong> <span id="keterangan"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Bukti Total:</strong> <span id="bukti_total"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Nominal Total:</strong> <span id="total_value"></span>
+									</li>
+								</ul>
+							</div>
+						</div>
+
+						<div class="modal-footer">
+							<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+							<button type="submit" class="btn btn-primary">Approve</button>
+						</div>
+					</form>
+				</div>
+			</div>
+		</div>
+	</section>
+	<section>
+		<div class="modal fade" id="finalApproveModal" tabindex="-1" role="dialog" aria-labelledby="finalApproveModalLabel" aria-hidden="true">
+			<div class="modal-dialog modal-lg" role="document">
+				<div class="modal-content">
+					<form id="finalApproveForm" method="POST" action="">
+						@csrf
+						@method('PUT')
+						<div class="modal-header">
+							<h5 class="modal-title" id="approveModalLabel">Approve Item</h5>
+							<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+								<span aria-hidden="true">&times;</span>
+							</button>
+						</div>
+						<div class="modal-body">
+							<!-- Loading spinner -->
+							<div id="finalLoadingSpinner" class="d-flex justify-content-center align-items-center" style="height: 200px;">
+								<div class="spinner-border text-primary" role="status">
+									<span class="sr-only">Loading...</span>
+								</div>
+							</div>
+
+							<!-- Modal content (hidden initially) -->
+							<div id="finalModalContent" class="d-none">
+								<p>Please review the details below:</p>
+								<ul class="list-group">
+									<li class="list-group-item">
+										<strong>Expense Number:</strong> <span id="final_expense_number"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>User:</strong> <span id="final_user"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Kategori:</strong> <span id="final_kategori"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Tanggal:</strong> <span id="final_tanggal"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Keterangan:</strong> <span id="final_keterangan"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Bukti Total:</strong> <span id="final_bukti_total"></span>
+									</li>
+								</ul>
+								<p class="mt-2">Please select the items you want to approve:</p>
+								<ul class="list-group list-unstyled">
+									<li>
+										<div class="form-group">
+											<div class="custom-control custom-checkbox">
+												<input type="checkbox" class="custom-control-input" id="final_total" name="total" required>
+												<label class="custom-control-label" for="final_total">Total (<span id="final_total_value"></span>)</label>
+											</div>
+										</div>
+									</li>
+								</ul>
+							</div>
+						</div>
+
+						<div class="modal-footer">
+							<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+							<button type="submit" class="btn btn-primary">Approve</button>
+						</div>
+					</form>
+				</div>
+			</div>
+		</div>
+	</section>
+
+@endsection
+@section('scripts')
     <script>
         new AutoNumeric('#total', {
             digitGroupSeparator: '.', // Pemisah ribuan
@@ -87,4 +229,126 @@
             unformatOnSubmit: true    // Nilai asli tanpa format saat dikirimkan
         });
     </script>
+
+    <script>
+        // Handle Approve Button Click
+		$(document).on('click', '.open-approve-modal', function() {
+			const approveUrl = $(this).data('id');
+
+			// Show spinner and hide content initially
+			$('#loadingSpinner').show();
+			$('#modalContent').addClass('d-none');
+
+			$('#approveForm').attr('action', approveUrl); // Set the form action
+			$('#loadingSpinner').addClass('d-flex');
+			$('#approveModal').modal('show'); // Show the modal
+
+			// Get detail from /forms/vehicle/detail/{id}
+			$.get(approveUrl.replace(/approve2|final-approve/g, 'detail'), function (data) {
+				const formatter = new Intl.NumberFormat('id-ID', {
+					style: 'currency',
+					currency: 'IDR',
+					minimumFractionDigits: 0
+				});
+
+				$('#total_value').text(formatter.format(data.total));
+
+				// Detail data
+				$('#user').text(data.user.name);
+				$('#expense_number').text(data.expense_number);
+				$('#tanggal').text(new Date(data.created_at).toLocaleDateString('id-ID', {
+					year: 'numeric',
+					month: 'long',
+					day: 'numeric'
+				}));
+				
+				$('#kategori').text(data.kategori.name);
+				$('#keterangan').text(data.keterangan);
+
+				$('#bukti_total').html(data.total ? '<a href="' + data.total + '" target="_blank">Download</a>' : '-');
+
+				// Hide spinner and show content
+				$('#loadingSpinner').hide();
+				$('#loadingSpinner').removeClass('d-flex');
+				$('#loadingSpinner').addClass('d-none');
+				$('#modalContent').removeClass('d-none');
+
+				// Reset the total to zero
+				$('#total').val(0);
+			});
+		});
+
+		// Handle Approve Button Click
+		$(document).on('click', '.final-approve-modal', function() {
+			const approveUrl = $(this).data('id');
+
+			// Show spinner and hide content initially
+			$('#finalLoadingSpinner').show();
+			$('#finalModalContent').addClass('d-none');
+
+			$('#finalApproveForm').attr('action', approveUrl); // Set the form action
+			$('#finalLoadingSpinner').addClass('d-flex');
+			$('#finalApproveModal').modal('show'); // Show the modal
+
+			// Get detail from /forms/vehicle/detail/{id}
+			$.get(approveUrl.replace('approve', 'detail'), function (data) {
+				const formatter = new Intl.NumberFormat('id-ID', {
+					style: 'currency',
+					currency: 'IDR',
+					minimumFractionDigits: 0
+				});
+
+				$('#final_total_value').text(formatter.format(data.total));
+
+				// Assign data values to checkboxes
+				$('#final_total').data('value', data.total);
+
+				// Detail data
+				$('#final_user').text(data.user.name);
+				$('#final_expense_number').text(data.expense_number);
+				$('#final_tanggal').text(new Date(data.created_at).toLocaleDateString('id-ID', {
+					year: 'numeric',
+					month: 'long',
+					day: 'numeric'
+				}));
+
+				$('#final_kategori').text(data.kategori.name);
+				$('#final_keterangan').text(data.keterangan);
+
+				$('#final_bukti_total').html(data.bukti_total ? '<a href="' + data.bukti_total + '" target="_blank">Download</a>' : '-');
+
+				// Hide spinner and show content
+				$('#finalLoadingSpinner').hide();
+				$('#finalLoadingSpinner').removeClass('d-flex');
+				$('#finalLoadingSpinner').addClass('d-none');
+				$('#finalModalContent').removeClass('d-none');
+
+				// Reset the total to zero
+				$('#total').val(0);
+			});
+		});
+
+		// Update total dynamically
+		$('.custom-control-input').on('change', function () {
+			let total = 0;
+			$('.custom-control-input:checked').each(function () {
+				total += parseFloat($(this).data('value') || 0);
+			});
+
+			const formatter = new Intl.NumberFormat('id-ID', {
+				style: 'currency',
+				currency: 'IDR',
+				minimumFractionDigits: 0,
+			});
+
+			$('#total').val(formatter.format(total));
+		});
+
+
+		// Uncheck all checkboxes when the modal is closed
+		$('#finalApproveModal').on('hidden.bs.modal', function () {
+			$('.custom-control-input').prop('checked', false);  // Uncheck all checkboxes
+			$('#total').val('0');  // Reset total to 0
+		});
+    </script>
 @endsection
diff --git a/resources/views/backend/pages/forms/upcountry/view.blade.php b/resources/views/backend/pages/forms/upcountry/view.blade.php
index bdc5588..2aa0771 100644
--- a/resources/views/backend/pages/forms/upcountry/view.blade.php
+++ b/resources/views/backend/pages/forms/upcountry/view.blade.php
@@ -97,9 +97,15 @@
                                 </div>
                             </div>
 
-                            {{-- back button --}}
                             <div class="col-lg-12">
                                 <a href="{{ route('forms.up-country') }}" class="btn btn-secondary">Kembali</a>
+                                @if (auth()->user()->can('approval.approve') && $form->status == 'On Progress')
+                                    <button type="button" class="btn btn-success final-approve-modal" data-id="{{ route('forms.up-country.approve', $form->id) }}">Approve 1</button>
+                                @elseif(auth()->user()->can('approval2.approve') && $form->status == 'Approved 1')
+                                    <button type="button" class="btn btn-success open-approve-modal" data-id="{{ route('forms.up-country.approve2', $form->id) }}">Approve 2</button>
+                                @elseif(auth()->user()->can('final_approval.approve') && $form->status == 'Approved 2')
+                                    <button type="button" class="btn btn-primary open-approve-modal" data-id="{{ route('forms.up-country.final-approve', $form->id) }}">Final Approve</button>
+                                @endif
                             </div>
                         </div>
 					</form>
@@ -107,7 +113,169 @@
             </div>
         </div>
     </section>
+    <section>
+		<div class="modal fade" id="approveModal" tabindex="-1" role="dialog" aria-labelledby="approveModalLabel" aria-hidden="true">
+			<div class="modal-dialog modal-lg" role="document">
+				<div class="modal-content">
+					<form id="approveForm" method="POST" action="">
+						@csrf
+						@method('PUT')
+						<div class="modal-header">
+							<h5 class="modal-title" id="approveModalLabel">Approve Item</h5>
+							<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+								<span aria-hidden="true">&times;</span>
+							</button>
+						</div>
+						<div class="modal-body">
+							<!-- Loading spinner -->
+							<div id="loadingSpinner" class="d-flex justify-content-center align-items-center" style="height: 200px;">
+								<div class="spinner-border text-primary" role="status">
+									<span class="sr-only">Loading...</span>
+								</div>
+							</div>
 
+							<!-- Modal content (hidden initially) -->
+							<div id="modalContent" class="d-none">
+								<p>Please review the details below:</p>
+								<ul class="list-group">
+									<li class="list-group-item">
+										<strong>Expense Number:</strong> <span id="expense_number"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>User:</strong> <span id="user"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Tipe:</strong> Meeting / Seminar
+									</li>
+									<li class="list-group-item">
+										<strong>Tanggal:</strong> <span id="tanggal"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Nominal Allowance:</strong> <span id="allowance_value"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Bukti Allowance:</strong> <span id="bukti_allowance"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Nominal Transport Antar Kota:</strong> <span id="transport_ankot_value"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Bukti Transport Antar Kota:</strong> <span id="bukti_transport_ankot"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Nominal Hotel:</strong> <span id="hotel_value"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Bukti Hotel:</strong> <span id="bukti_hotel"></span>
+									</li>
+								</ul>
+							</div>
+						</div>
+
+						<div class="modal-footer">
+							<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+							<button type="submit" class="btn btn-primary">Approve</button>
+						</div>
+					</form>
+				</div>
+			</div>
+		</div>
+	</section>
+	<section>
+		<div class="modal fade" id="finalApproveModal" tabindex="-1" role="dialog" aria-labelledby="finalApproveModalLabel" aria-hidden="true">
+			<div class="modal-dialog modal-lg" role="document">
+				<div class="modal-content">
+					<form id="finalApproveForm" method="POST" action="">
+						@csrf
+						@method('PUT')
+						<div class="modal-header">
+							<h5 class="modal-title" id="approveModalLabel">Approve Item</h5>
+							<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+								<span aria-hidden="true">&times;</span>
+							</button>
+						</div>
+						<div class="modal-body">
+							<!-- Loading spinner -->
+							<div id="finalLoadingSpinner" class="d-flex justify-content-center align-items-center" style="height: 200px;">
+								<div class="spinner-border text-primary" role="status">
+									<span class="sr-only">Loading...</span>
+								</div>
+							</div>
+
+							<!-- Modal content (hidden initially) -->
+							<div id="finalModalContent" class="d-none">
+								<p>Please review the details below:</p>
+								<ul class="list-group">
+									<li class="list-group-item">
+										<strong>Expense Number:</strong> <span id="final_expense_number"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>User:</strong> <span id="final_user"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Tipe:</strong> Meeting / Seminar
+									</li>
+									<li class="list-group-item">
+										<strong>Tanggal:</strong> <span id="final_tanggal"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Bukti Allowance:</strong> <span id="final_bukti_allowance"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Bukti Transport Antar Kota:</strong> <span id="final_bukti_transport_ankot"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Bukti Hotel:</strong> <span id="final_bukti_hotel"></span>
+									</li>
+								</ul>
+								<p class="mt-2">Please select the items you want to approve:</p>
+								<ul class="list-group list-unstyled">
+									<li>
+										<div class="form-group">
+											<div class="custom-control custom-checkbox">
+												<input type="checkbox" class="custom-control-input" id="final_allowance" name="allowance">
+												<label class="custom-control-label" for="final_allowance">Allowance (<span id="final_allowance_value"></span>)</label>
+											</div>
+										</div>
+									</li>
+									<li>
+										<div class="form-group">
+											<div class="custom-control custom-checkbox">
+												<input type="checkbox" class="custom-control-input" id="final_transport_ankot" name="transport_ankot">
+												<label class="custom-control-label" for="final_transport_ankot">Transport Ankot (<span id="final_transport_ankot_value"></span>)</label>
+											</div>
+										</div>
+									</li>
+									<li>
+										<div class="form-group">
+											<div class="custom-control custom-checkbox">
+												<input type="checkbox" class="custom-control-input" id="final_hotel" name="hotel">
+												<label class="custom-control-label" for="final_hotel">Hotel (<span id="final_hotel_value"></span>)</label>
+											</div>
+										</div>
+									</li>
+									<li>
+										<div class="form-group">
+											<label for="total">Total</label>
+											<input type="text" class="form-control" id="total" name="total" value="0" readonly>
+										</div>
+									</li>
+								</ul>
+							</div>
+						</div>
+
+						<div class="modal-footer">
+							<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+							<button type="submit" class="btn btn-primary">Approve</button>
+						</div>
+					</form>
+				</div>
+			</div>
+		</div>
+	</section>
+@endsection
+
+@section('scripts')
     <script>
         new AutoNumeric('#allowance', {
             digitGroupSeparator: '.', // Pemisah ribuan
@@ -149,4 +317,131 @@
             unformatOnSubmit: true    // Nilai asli tanpa format saat dikirimkan
         });
     </script>
+
+    <script>
+        // Handle Approve Button Click
+			$(document).on('click', '.open-approve-modal', function() {
+				const approveUrl = $(this).data('id');
+
+				// Show spinner and hide content initially
+				$('#loadingSpinner').show();
+				$('#modalContent').addClass('d-none');
+
+				$('#approveForm').attr('action', approveUrl); // Set the form action
+				$('#loadingSpinner').addClass('d-flex');
+				$('#approveModal').modal('show'); // Show the modal
+
+				// Get detail from /forms/meeting/detail/{id}
+				$.get(approveUrl.replace(/approve2|final-approve/g, 'detail'), function (data) {
+					const formatter = new Intl.NumberFormat('id-ID', {
+						style: 'currency',
+						currency: 'IDR',
+						minimumFractionDigits: 0
+					});
+
+					$('#allowance_value').text(formatter.format(data.allowance));
+					$('#transport_ankot_value').text(formatter.format(data.transport_ankot));
+					$('#hotel_value').text(formatter.format(data.hotel));
+
+					// Detail data
+					$('#user').text(data.user.name);
+					$('#expense_number').text(data.expense_number);
+					$('#tanggal').text(new Date(data.created_at).toLocaleDateString('id-ID', {
+						year: 'numeric',
+						month: 'long',
+						day: 'numeric'
+					}));
+
+					$('#bukti_allowance').html(data.bukti_allowance ? '<a href="' + data.bukti_allowance + '" target="_blank">Download</a>' : '-');
+					$('#bukti_transport_ankot').html(data.bukti_transport_ankot ? '<a href="' + data.bukti_transport_ankot + '" target="_blank">Download</a>' : '-');
+					$('#bukti_hotel').html(data.bukti_hotel ? '<a href="' + data.bukti_hotel + '" target="_blank">Download</a>' : '-');
+
+					// Hide spinner and show content
+					$('#loadingSpinner').hide();
+					$('#loadingSpinner').removeClass('d-flex');
+					$('#loadingSpinner').addClass('d-none');
+					$('#modalContent').removeClass('d-none');
+
+					// Reset the total to zero
+					$('#total').val(0);
+				});
+			});
+
+			// Handle Approve Button Click
+			$(document).on('click', '.final-approve-modal', function() {
+				const approveUrl = $(this).data('id');
+
+				// Show spinner and hide content initially
+				$('#finalLoadingSpinner').show();
+				$('#finalModalContent').addClass('d-none');
+
+				$('#finalApproveForm').attr('action', approveUrl); // Set the form action
+				$('#finalLoadingSpinner').addClass('d-flex');
+				$('#finalApproveModal').modal('show'); // Show the modal
+
+				// Get detail from /forms/meeting/detail/{id}
+				$.get(approveUrl.replace('approve', 'detail'), function (data) {
+					console.log(data);
+					const formatter = new Intl.NumberFormat('id-ID', {
+						style: 'currency',
+						currency: 'IDR',
+						minimumFractionDigits: 0
+					});
+
+					$('#final_allowance_value').text(formatter.format(data.allowance));
+					$('#final_transport_ankot_value').text(formatter.format(data.transport_ankot));
+					$('#final_hotel_value').text(formatter.format(data.hotel));
+
+					// Assign data values to checkboxes
+					$('#final_allowance').data('value', data.allowance);
+					$('#final_transport_ankot').data('value', data.transport_ankot);
+					$('#final_hotel').data('value', data.hotel);
+
+					// Detail data
+					$('#final_user').text(data.user.name);
+					$('#final_expense_number').text(data.expense_number);
+					$('#final_tanggal').text(new Date(data.created_at).toLocaleDateString('id-ID', {
+						year: 'numeric',
+						month: 'long',
+						day: 'numeric'
+					}));
+
+					$('#final_bukti_allowance').html(data.bukti_allowance ? '<a href="' + data.bukti_allowance + '" target="_blank">Download</a>' : '-');
+					$('#final_bukti_transport_ankot').html(data.bukti_transport_ankot ? '<a href="' + data.bukti_transport_ankot + '" target="_blank">Download</a>' : '-');
+					$('#final_bukti_hotel').html(data.bukti_hotel ? '<a href="' + data.bukti_hotel + '" target="_blank">Download</a>' : '-');
+
+					// Hide spinner and show content
+					$('#finalLoadingSpinner').hide();
+					$('#finalLoadingSpinner').removeClass('d-flex');
+					$('#finalLoadingSpinner').addClass('d-none');
+					$('#finalModalContent').removeClass('d-none');
+
+					// Reset the total to zero
+					$('#total').val(0);
+				});
+			});
+
+			// Update total dynamically
+			$('.custom-control-input').on('change', function () {
+				let total = 0;
+				$('.custom-control-input:checked').each(function () {
+					total += parseFloat($(this).data('value') || 0);
+				});
+
+				const formatter = new Intl.NumberFormat('id-ID', {
+					style: 'currency',
+					currency: 'IDR',
+					minimumFractionDigits: 0,
+				});
+
+				$('#total').val(formatter.format(total));
+			});
+
+
+			// Uncheck all checkboxes when the modal is closed
+			$('#finalApproveModal').on('hidden.bs.modal', function () {
+				$('.custom-control-input').prop('checked', false);  // Uncheck all checkboxes
+				$('#total').val('0');  // Reset total to 0
+			});
+    </script>
 @endsection
diff --git a/resources/views/backend/pages/forms/vehicle/view.blade.php b/resources/views/backend/pages/forms/vehicle/view.blade.php
index b37e404..6574181 100644
--- a/resources/views/backend/pages/forms/vehicle/view.blade.php
+++ b/resources/views/backend/pages/forms/vehicle/view.blade.php
@@ -76,6 +76,13 @@
 
                             <div class="col-lg-12">
                                 <a href="{{ route('forms.vehicle') }}" class="btn btn-secondary">Kembali</a>
+                                @if (auth()->user()->can('approval.approve') && $form->status == 'On Progress')
+                                    <button type="button" class="btn btn-success final-approve-modal" data-id="{{ route('forms.vehicle.approve', $form->id) }}">Approve 1</button>
+                                @elseif(auth()->user()->can('approval2.approve') && $form->status == 'Approved 1')
+                                    <button type="button" class="btn btn-success open-approve-modal" data-id="{{ route('forms.vehicle.approve2', $form->id) }}">Approve 2</button>
+                                @elseif(auth()->user()->can('final_approval.approve') && $form->status == 'Approved 2')
+                                    <button type="button" class="btn btn-primary open-approve-modal" data-id="{{ route('forms.vehicle.final-approve', $form->id) }}">Final Approve</button>
+                                @endif
                             </div>
                         </div>
 					</form>
@@ -83,7 +90,153 @@
             </div>
         </div>
     </section>
+    <section>
+		<div class="modal fade" id="approveModal" tabindex="-1" role="dialog" aria-labelledby="approveModalLabel" aria-hidden="true">
+			<div class="modal-dialog modal-lg" role="document">
+				<div class="modal-content">
+					<form id="approveForm" method="POST" action="">
+						@csrf
+						@method('PUT')
+						<div class="modal-header">
+							<h5 class="modal-title" id="approveModalLabel">Approve Item</h5>
+							<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+								<span aria-hidden="true">&times;</span>
+							</button>
+						</div>
+						<div class="modal-body">
+							<!-- Loading spinner -->
+							<div id="loadingSpinner" class="d-flex justify-content-center align-items-center" style="height: 200px;">
+								<div class="spinner-border text-primary" role="status">
+									<span class="sr-only">Loading...</span>
+								</div>
+							</div>
 
+							<!-- Modal content (hidden initially) -->
+							<div id="modalContent" class="d-none">
+								<p>Please review the details below:</p>
+								<ul class="list-group">
+									<li class="list-group-item">
+										<strong>Expense Number:</strong> <span id="expense_number"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>User:</strong> <span id="user"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Tipe:</strong> Vehicle Running Cost
+									</li>
+									<li class="list-group-item">
+										<strong>Tanggal & Waktu:</strong> <span id="tanggal"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Jarak:</strong> <span id="jarak"></span> km
+									</li>
+									<li class="list-group-item">
+										<strong>Total Liter Bensin:</strong> <span id="liter"></span> liter
+									</li>
+									<li class="list-group-item">
+										<strong>No Polisi:</strong> <span id="nopol"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Tipe Bensin:</strong> <span id="tipe_bensin"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Bukti Total:</strong> <span id="bukti_total"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Nominal Total:</strong> <span id="total_value"></span>
+									</li>
+								</ul>
+							</div>
+						</div>
+
+						<div class="modal-footer">
+							<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+							<button type="submit" class="btn btn-primary">Approve</button>
+						</div>
+					</form>
+				</div>
+			</div>
+		</div>
+	</section>
+	<section>
+		<div class="modal fade" id="finalApproveModal" tabindex="-1" role="dialog" aria-labelledby="finalApproveModalLabel" aria-hidden="true">
+			<div class="modal-dialog modal-lg" role="document">
+				<div class="modal-content">
+					<form id="finalApproveForm" method="POST" action="">
+						@csrf
+						@method('PUT')
+						<div class="modal-header">
+							<h5 class="modal-title" id="approveModalLabel">Approve Item</h5>
+							<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+								<span aria-hidden="true">&times;</span>
+							</button>
+						</div>
+						<div class="modal-body">
+							<!-- Loading spinner -->
+							<div id="finalLoadingSpinner" class="d-flex justify-content-center align-items-center" style="height: 200px;">
+								<div class="spinner-border text-primary" role="status">
+									<span class="sr-only">Loading...</span>
+								</div>
+							</div>
+
+							<!-- Modal content (hidden initially) -->
+							<div id="finalModalContent" class="d-none">
+								<p>Please review the details below:</p>
+								<ul class="list-group">
+									<li class="list-group-item">
+										<strong>Expense Number:</strong> <span id="final_expense_number"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>User:</strong> <span id="final_user"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Tipe:</strong> Vehicle Running Cost
+									</li>
+									<li class="list-group-item">
+										<strong>Tanggal & Waktu:</strong> <span id="final_tanggal"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Jarak:</strong> <span id="final_jarak"></span> km
+									</li>
+									<li class="list-group-item">
+										<strong>Total Liter Bensin:</strong> <span id="final_liter"></span> liter
+									</li>
+									<li class="list-group-item">
+										<strong>No Polisi:</strong> <span id="final_nopol"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Tipe Bensin:</strong> <span id="final_tipe_bensin"></span>
+									</li>
+									<li class="list-group-item">
+										<strong>Bukti Total:</strong> <span id="final_bukti_total"></span>
+									</li>
+								</ul>
+								<p class="mt-2">Please select the items you want to approve:</p>
+								<ul class="list-group list-unstyled">
+									<li>
+										<div class="form-group">
+											<div class="custom-control custom-checkbox">
+												<input type="checkbox" class="custom-control-input" id="final_total" name="total" required>
+												<label class="custom-control-label" for="final_total">Total (<span id="final_total_value"></span>)</label>
+											</div>
+										</div>
+									</li>
+								</ul>
+							</div>
+						</div>
+
+						<div class="modal-footer">
+							<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+							<button type="submit" class="btn btn-primary">Approve</button>
+						</div>
+					</form>
+				</div>
+			</div>
+		</div>
+	</section>
+@endsection
+
+@section('scripts')
     <script>
         new AutoNumeric('#total', {
             digitGroupSeparator: '.', // Pemisah ribuan
@@ -93,4 +246,130 @@
             unformatOnSubmit: true    // Nilai asli tanpa format saat dikirimkan
         });
     </script>
+
+    <script>
+        $(document).on('click', '.open-approve-modal', function() {
+				const approveUrl = $(this).data('id');
+
+				// Show spinner and hide content initially
+				$('#loadingSpinner').show();
+				$('#modalContent').addClass('d-none');
+
+				$('#approveForm').attr('action', approveUrl); // Set the form action
+				$('#loadingSpinner').addClass('d-flex');
+				$('#approveModal').modal('show'); // Show the modal
+
+				// Get detail from /forms/vehicle/detail/{id}
+				$.get(approveUrl.replace(/approve2|final-approve/g, 'detail'), function (data) {
+					const formatter = new Intl.NumberFormat('id-ID', {
+						style: 'currency',
+						currency: 'IDR',
+						minimumFractionDigits: 0
+					});
+
+					$('#total_value').text(formatter.format(data.total));
+
+					// Detail data
+					$('#user').text(data.user.name);
+					$('#expense_number').text(data.expense_number);
+					$('#tanggal').text(new Date(data.created_at).toLocaleDateString('id-ID', {
+						year: 'numeric',
+						month: 'long',
+						day: 'numeric'
+					}));
+					
+					$('#jarak').text(data.jarak);
+					$('#liter').text(data.liter);
+					$('#tipe_bensin').text(data.tipe_bensin);
+					$('#nopol').text(data.nopol);
+
+					$('#bukti_total').html(data.total ? '<a href="' + data.total + '" target="_blank">Download</a>' : '-');
+
+					// Hide spinner and show content
+					$('#loadingSpinner').hide();
+					$('#loadingSpinner').removeClass('d-flex');
+					$('#loadingSpinner').addClass('d-none');
+					$('#modalContent').removeClass('d-none');
+
+					// Reset the total to zero
+					$('#total').val(0);
+				});
+			});
+
+			// Handle Approve Button Click
+			$(document).on('click', '.final-approve-modal', function() {
+				const approveUrl = $(this).data('id');
+
+				// Show spinner and hide content initially
+				$('#finalLoadingSpinner').show();
+				$('#finalModalContent').addClass('d-none');
+
+				$('#finalApproveForm').attr('action', approveUrl); // Set the form action
+				$('#finalLoadingSpinner').addClass('d-flex');
+				$('#finalApproveModal').modal('show'); // Show the modal
+
+				// Get detail from /forms/vehicle/detail/{id}
+				$.get(approveUrl.replace('approve', 'detail'), function (data) {
+					console.log(data);
+					const formatter = new Intl.NumberFormat('id-ID', {
+						style: 'currency',
+						currency: 'IDR',
+						minimumFractionDigits: 0
+					});
+
+					$('#final_total_value').text(formatter.format(data.total));
+
+					// Assign data values to checkboxes
+					$('#final_total').data('value', data.total);
+
+					// Detail data
+					$('#final_user').text(data.user.name);
+					$('#final_expense_number').text(data.expense_number);
+					$('#final_tanggal').text(new Date(data.created_at).toLocaleDateString('id-ID', {
+						year: 'numeric',
+						month: 'long',
+						day: 'numeric'
+					}));
+
+					$('#final_jarak').text(data.jarak);
+					$('#final_liter').text(data.liter);
+					$('#final_tipe_bensin').text(data.tipe_bensin);
+					$('#final_nopol').text(data.nopol);
+
+					$('#final_bukti_total').html(data.bukti_total ? '<a href="' + data.bukti_total + '" target="_blank">Download</a>' : '-');
+
+					// Hide spinner and show content
+					$('#finalLoadingSpinner').hide();
+					$('#finalLoadingSpinner').removeClass('d-flex');
+					$('#finalLoadingSpinner').addClass('d-none');
+					$('#finalModalContent').removeClass('d-none');
+
+					// Reset the total to zero
+					$('#total').val(0);
+				});
+			});
+
+			// Update total dynamically
+			$('.custom-control-input').on('change', function () {
+				let total = 0;
+				$('.custom-control-input:checked').each(function () {
+					total += parseFloat($(this).data('value') || 0);
+				});
+
+				const formatter = new Intl.NumberFormat('id-ID', {
+					style: 'currency',
+					currency: 'IDR',
+					minimumFractionDigits: 0,
+				});
+
+				$('#total').val(formatter.format(total));
+			});
+
+
+			// Uncheck all checkboxes when the modal is closed
+			$('#finalApproveModal').on('hidden.bs.modal', function () {
+				$('.custom-control-input').prop('checked', false);  // Uncheck all checkboxes
+				$('#total').val('0');  // Reset total to 0
+			});
+    </script>
 @endsection