diff --git a/app/Http/Controllers/PembatalanController.php b/app/Http/Controllers/PembatalanController.php index af65cde..7e735df 100644 --- a/app/Http/Controllers/PembatalanController.php +++ b/app/Http/Controllers/PembatalanController.php @@ -61,12 +61,18 @@ // Update Permohonan Pembatalan if($request->status=='approved'){ $pembatalan->status = 'approved'; + $pembatalan->authorized_at = now(); + $pembatalan->authorized_by = auth()->user()->id; + $pembatalan->authorized_status = 1; $pembatalan->save(); $permohonan->status = 'batal'; $permohonan->save(); } else{ $pembatalan->status = 'rejected'; + $pembatalan->authorized_at = now(); + $pembatalan->authorized_by = auth()->user()->id; + $pembatalan->authorized_status = 3; $pembatalan->save(); } diff --git a/module.json b/module.json index cd65329..c0302e9 100644 --- a/module.json +++ b/module.json @@ -27,7 +27,7 @@ }, { "title": "Otorisasi Pembatalan Permohonan", - "path": "otorisator.pembatalan", + "path": "pembatalan", "icon": "ki-filled ki-file-deleted text-lg text-info", "classes": "", "attributes": [], diff --git a/resources/views/permohonan/authorization/show.blade.php b/resources/views/permohonan/authorization/show.blade.php index 193999a..e9830af 100644 --- a/resources/views/permohonan/authorization/show.blade.php +++ b/resources/views/permohonan/authorization/show.blade.php @@ -58,7 +58,7 @@ form.addEventListener('submit', function(event) { - if (event.submitter === revisiBtn && keterangan.value.trim() === '') { + if (event.submitter === revisiBtn && keterangan.value() === '') { event.preventDefault(); keteranganMessage.textContent = 'Catatan harus diisi.'; } else { diff --git a/resources/views/permohonan/index.blade.php b/resources/views/permohonan/index.blade.php index 6c659a4..579e82b 100644 --- a/resources/views/permohonan/index.blade.php +++ b/resources/views/permohonan/index.blade.php @@ -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 += ` `; } - if (data.status == 'order') { + if (data.status === 'order') { actionHtml += `