daengdeni/lpj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'staging' into feature/senior-officer

Browse Source
This commit is contained in:
majid
2025-02-05 15:18:55 +07:00
parent 821324e8a1 28d579d65d
commit e650cda8fc
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/PenilaianController.php
View File

@@ -834,7 +834,7 @@ class PenilaianController extends Controller
} }
} }
public function revisiLaporan($id, Request $request) public function revisiLaporan(Request $request,$id)
{ {
$permohonan = Permohonan::findOrFail($id); $permohonan = Permohonan::findOrFail($id);
$permohonan->update([ $permohonan->update([

18
resources/views/laporan/index.blade.php
View File

@@ -189,6 +189,8 @@
const inspeksiId = data.debiture?.documents[0]?.inspeksi[0]?.id || '-'; const inspeksiId = data.debiture?.documents[0]?.inspeksi[0]?.id || '-';
const dokumenID = data.debiture?.documents[0]?.id || '-'; const dokumenID = data.debiture?.documents[0]?.id || '-';
const jenisJaminanID = data.debiture?.documents[0]?.jenis_jaminan_id || '-'; const jenisJaminanID = data.debiture?.documents[0]?.jenis_jaminan_id || '-';
const typePenilaian = data.penilai?.type_penilai || '';
const type = data.penilai?.type || '';
let laporanButton = ''; let laporanButton = '';
let resumeButton = ''; let resumeButton = '';
@@ -202,17 +204,23 @@
if(data.nilai_liquidasi==null) { if(data.nilai_liquidasi==null) {
laporanButton = ` laporanButton = `
<a href="laporan/${data.id}" class="btn btn-sm btn-dark"> <a href="laporan/${data.id}" class="btn btn-sm btn-dark">
Laporn Laporan
</a>`; </a>`;
} }
console.log(data.nilai_liquidasi);
if(data.status_bayar=="sudah_bayar" && data.nilai_liquidasi >0) { if(data.status_bayar=="sudah_bayar" && data.nilai_liquidasi >0) {
if(data.penilai.type_penilai=='resume' && !data.penilai.resume){
laporanButton = ` laporanButton = `
<a href="{{ route('penilai.print-out') }}?permohonanId=${data.id}&documentId=${dokumenID}&inspeksiId=${inspeksiId}&jaminanId=${jenisJaminanID}&statusLpj=0" class="btn btn-sm btn-dark"> <a href="{{ route('penilai.print-out') }}?permohonanId=${data.id}&documentId=${dokumenID}&inspeksiId=${inspeksiId}&jaminanId=${jenisJaminanID}&statusLpj=0&type=${type}" class="btn btn-sm btn-dark">
Laporan Laporan
</a>`; </a>`;
} else {
laporanButton = `
<a href="{{ route('penilai.print-out') }}?permohonanId=${data.id}&documentId=${dokumenID}&inspeksiId=${inspeksiId}&jaminanId=${jenisJaminanID}&statusLpj=0&type=${typePenilaian}" class="btn btn-sm btn-dark">
Laporan
</a>`;
}
} }
return `${resumeButton} ${laporanButton}`; return `${resumeButton} ${laporanButton}`;

2
resources/views/penilaian/otorisator/show.blade.php
View File

@@ -372,7 +372,7 @@
}, },
}); });
$.ajax({ $.ajax({
url: `/otorisator/revisi/${dataId}/`, url: `/otorisator/revisi/${dataId}`,
type: 'POST', type: 'POST',
data: { data: {
message: userMessage message: userMessage