feat(pembatalan): perbarui logika otorisasi dan perbaikan tampilan
- Tambahkan atribut otorisasi pada model pembatalan. - Perbarui tampilan untuk menampilkan status pembatalan yang benar. - Perbaiki logika validasi pada form otorisasi. - Ubah path pada module.json untuk konsistensi.
This commit is contained in:
@@ -61,12 +61,18 @@
|
|||||||
// Update Permohonan Pembatalan
|
// Update Permohonan Pembatalan
|
||||||
if($request->status=='approved'){
|
if($request->status=='approved'){
|
||||||
$pembatalan->status = 'approved';
|
$pembatalan->status = 'approved';
|
||||||
|
$pembatalan->authorized_at = now();
|
||||||
|
$pembatalan->authorized_by = auth()->user()->id;
|
||||||
|
$pembatalan->authorized_status = 1;
|
||||||
$pembatalan->save();
|
$pembatalan->save();
|
||||||
|
|
||||||
$permohonan->status = 'batal';
|
$permohonan->status = 'batal';
|
||||||
$permohonan->save();
|
$permohonan->save();
|
||||||
} else{
|
} else{
|
||||||
$pembatalan->status = 'rejected';
|
$pembatalan->status = 'rejected';
|
||||||
|
$pembatalan->authorized_at = now();
|
||||||
|
$pembatalan->authorized_by = auth()->user()->id;
|
||||||
|
$pembatalan->authorized_status = 3;
|
||||||
$pembatalan->save();
|
$pembatalan->save();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -27,7 +27,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"title": "Otorisasi Pembatalan Permohonan",
|
"title": "Otorisasi Pembatalan Permohonan",
|
||||||
"path": "otorisator.pembatalan",
|
"path": "pembatalan",
|
||||||
"icon": "ki-filled ki-file-deleted text-lg text-info",
|
"icon": "ki-filled ki-file-deleted text-lg text-info",
|
||||||
"classes": "",
|
"classes": "",
|
||||||
"attributes": [],
|
"attributes": [],
|
||||||
|
|||||||
@@ -58,7 +58,7 @@
|
|||||||
|
|
||||||
|
|
||||||
form.addEventListener('submit', function(event) {
|
form.addEventListener('submit', function(event) {
|
||||||
if (event.submitter === revisiBtn && keterangan.value.trim() === '') {
|
if (event.submitter === revisiBtn && keterangan.value() === '') {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
keteranganMessage.textContent = 'Catatan harus diisi.';
|
keteranganMessage.textContent = 'Catatan harus diisi.';
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -255,13 +255,13 @@ title="Approve Jadwal Kunjungan No Reg ${data.nomor_registrasi}"
|
|||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (data.status !== 'done') {
|
if (data.status !== 'done' && data.status !== 'batal') {
|
||||||
actionHtml += `
|
actionHtml += `
|
||||||
<a class="btn btn-sm btn-outline btn-info" href="permohonan/${data.id}/edit" title="Edit Permohonan">
|
<a class="btn btn-sm btn-outline btn-info" href="permohonan/${data.id}/edit" title="Edit Permohonan">
|
||||||
<i class="ki-outline ki-notepad-edit"></i>
|
<i class="ki-outline ki-notepad-edit"></i>
|
||||||
</a>`;
|
</a>`;
|
||||||
}
|
}
|
||||||
if (data.status == 'order') {
|
if (data.status === 'order') {
|
||||||
actionHtml += `
|
actionHtml += `
|
||||||
<a onclick="deleteData(${data.id}, '${data.nomor_registrasi}','${data.debiture?.name}')" class="delete btn btn-sm btn-outline btn-danger" title="Batalkan Permohonan">
|
<a onclick="deleteData(${data.id}, '${data.nomor_registrasi}','${data.debiture?.name}')" class="delete btn btn-sm btn-outline btn-danger" title="Batalkan Permohonan">
|
||||||
<i class="ki-outline ki-cross-square"></i>
|
<i class="ki-outline ki-cross-square"></i>
|
||||||
|
|||||||
Reference in New Issue
Block a user