itdept/expense
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revised approval system (all forms)

Browse Source
This commit is contained in:
Jagad R R
2025-01-16 15:56:22 +07:00
parent f48b74589e
commit 45dd0a67b6
32 changed files with 2360 additions and 501 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/backend/pages/forms/entertainment/index.blade.php
+181 -41
View File
@@ -110,7 +110,10 @@
<th>Account Number</th>
<th>Status</th>
@if (auth()->user()->can('approval.approve'))
<th>Approval</th>
<th>Approval 1</th>
@endif
@if (auth()->user()->can('approval2.approve'))
<th>Approval 2</th>
@endif
@if (auth()->user()->can('final_approval.approve'))
<th>Final Approval</th>
@@ -148,7 +151,7 @@
<td>
@if ($item->status == 'On Progress')
<span class="badge badge-warning text-white">{{ $item->status }}</span>
@elseif ($item->status == 'Approved' || $item->status == 'Final Approved')
@elseif ($item->status == 'Approved 1' || $item->status == 'Approved 2' || $item->status == 'Final Approved')
<span class="badge badge-success text-white">{{ $item->status }}</span>
@else
<span class="badge badge-danger text-white">{{ $item->status }}</span>
@@ -157,16 +160,16 @@
@if (auth()->user()->can('approval.approve'))
<td>
{{-- approve / reject button --}}
@if ($item->status == 'On Progress')
@if ($item->status == 'On Progress' || $item->status == 'Rejected')
<form action="javascript:void(0);" class="d-inline">
<button type="button"
class="btn btn-success btn-sm open-approve-modal"
data-id="{{ route('forms.entertainment.approve', $item->id) }}">
Approve
Approve 1
</button>
</form>
<form action="{{ route('forms.entertainment.reject', $item->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to reject this item?');">
<form action="{{ route('forms.entertainment.reject', $item->id) }}" method="POST" class="d-inline" onsubmit="return confirm('Are you sure you want to reject this item?');">
@csrf
@method('PUT')
<button type="submit" class="btn btn-danger btn-sm">
@@ -184,14 +187,44 @@
@endif
</td>
@endif
@if (auth()->user()->can('approval2.approve'))
<td>
{{-- approve / reject button --}}
@if ($item->status == 'Approved 1' && $item->approved_at)
<form action="javascript:void(0);" class="d-inline">
<button type="button"
class="btn btn-success btn-sm open-approve-modal"
data-id="{{ route('forms.entertainment.approve2', $item->id) }}">
Approve 2
</button>
</form>
<form action="{{ route('forms.entertainment.reject', $item->id) }}" method="POST" class="d-inline" onsubmit="return confirm('Are you sure you want to reject this item?');">
@csrf
@method('PUT')
<button type="submit" class="btn btn-danger btn-sm">
Reject
</button>
</form>
@else
@if ($item->approved2_at)
{{ \Carbon\Carbon::parse($item->approved_at)->locale('id')->isoFormat('D MMMM Y') }}
@elseif($item->rejected_at)
{{ \Carbon\Carbon::parse($item->rejected_at)->locale('id')->isoFormat('D MMMM Y') }}
@else
-
@endif
@endif
</td>
@endif
@if(auth()->user()->can('final_approval.approve'))
<td>
{{-- approve / reject button --}}
@if ($item->status == 'Approved' && $item->approved_at && !$item->final_approved_at)
<form action="{{ route('forms.entertainment.final-approve', $item->id) }}" method="POST" class="d-inline"onsubmit="return confirm('Are you sure you want to approve this item?');">
@csrf
@method('PUT')
<button type="submit" class="btn btn-success btn-sm">
@if ($item->status == 'Approved 2' && $item->approved2_at && !$item->final_approved_at)
<form action="javascript:void(0);" class="d-inline">
<button type="button"
class="btn btn-success btn-sm final-approve-modal"
data-id="{{ route('forms.entertainment.final-approve', $item->id) }}">
Final Approve
</button>
</form>
@@ -280,22 +313,84 @@
<strong>NIK/NPWP Penerima:</strong> <span id="nik_or_npwp"></span>
</li>
<li class="list-group-item">
<strong>Nama Penerima:</strong> <span id="name"></span>
<strong>Tanggal:</strong> <span id="tanggal"></span>
</li>
<li class="list-group-item">
<strong>Alamat Penerima:</strong> <span id="alamat"></span>
<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>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 Pengeluaran:</strong> <span id="bukti_total"></span>
<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>
@@ -303,17 +398,11 @@
<li>
<div class="form-group">
<div class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" id="total_bensin" name="total_bensin">
<label class="custom-control-label" for="total_bensin">Total Pengeluaran (<span id="total_bensin_value"></span>)</label>
<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>
<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>
@@ -379,32 +468,31 @@
$('#loadingSpinner').addClass('d-flex');
$('#approveModal').modal('show'); // Show the modal
// Get detail from /forms/up-country/detail/{id}
$.get(approveUrl.replace('approve', 'detail'), function (data) {
// Get detail from /forms/entertainment/detail/{id}
$.get(approveUrl.replace(/approve(2)?/, 'detail'), function (data) {
const formatter = new Intl.NumberFormat('id-ID', {
style: 'currency',
currency: 'IDR',
minimumFractionDigits: 0
});
$('#total_bensin_value').text(formatter.format(data.total));
$('#total_bensin').data('value', data.total);
$('#total_value').text(formatter.format(data.total));
// Detail data
$('#user').text(data.user.name);
$('#nik_or_npwp').text(data.nik_or_npwp);
$('#name').text(data.name);
$('#alamat').text(data.alamat);
$('#expense_number').text(data.expense_number);
$('#jenis').text(data.jenis);
$('#keterangan').text(data.keterangan);
$('#tanggal').text(new Date(data.tanggal).toLocaleDateString('id-ID', {
$('#tanggal').text(new Date(data.created_at).toLocaleDateString('id-ID', {
year: 'numeric',
month: 'long',
day: 'numeric',
day: 'numeric'
}));
$('#bukti_total').html(data.bukti_total ? '<a href="' + data.bukti_total + '" target="_blank">Download</a>' : '-');
$('#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();
@@ -417,27 +505,79 @@
});
});
// Handle Approve Button Click
$('.final-approve-modal').on('click', 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('final-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;
// Calculate the total based on checked checkboxes
$('.custom-control-input:checked').each(function () {
total += parseFloat($(this).data('value') || 0);
});
// Update the total field with formatted value
const formatter = new Intl.NumberFormat('id-ID', {
style: 'currency',
currency: 'IDR',
minimumFractionDigits: 0
minimumFractionDigits: 0,
});
$('#total').val(formatter.format(total));
});
// Uncheck all checkboxes when the modal is closed
$('#approveModal').on('hidden.bs.modal', function () {
$('#finalApproveModal').on('hidden.bs.modal', function () {
$('.custom-control-input').prop('checked', false); // Uncheck all checkboxes
$('#total').val('0'); // Reset total to 0
});