Merge branch 'staging' into feature/senior-officer
This commit is contained in:
@@ -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->update([
|
||||
|
||||
@@ -189,6 +189,8 @@
|
||||
const inspeksiId = data.debiture?.documents[0]?.inspeksi[0]?.id || '-';
|
||||
const dokumenID = data.debiture?.documents[0]?.id || '-';
|
||||
const jenisJaminanID = data.debiture?.documents[0]?.jenis_jaminan_id || '-';
|
||||
const typePenilaian = data.penilai?.type_penilai || '';
|
||||
const type = data.penilai?.type || '';
|
||||
let laporanButton = '';
|
||||
let resumeButton = '';
|
||||
|
||||
@@ -202,17 +204,23 @@
|
||||
if(data.nilai_liquidasi==null) {
|
||||
laporanButton = `
|
||||
<a href="laporan/${data.id}" class="btn btn-sm btn-dark">
|
||||
Laporn
|
||||
Laporan
|
||||
</a>`;
|
||||
}
|
||||
|
||||
console.log(data.nilai_liquidasi);
|
||||
if(data.status_bayar=="sudah_bayar" && data.nilai_liquidasi >0) {
|
||||
|
||||
laporanButton = `
|
||||
<a href="{{ route('penilai.print-out') }}?permohonanId=${data.id}&documentId=${dokumenID}&inspeksiId=${inspeksiId}&jaminanId=${jenisJaminanID}&statusLpj=0" class="btn btn-sm btn-dark">
|
||||
if(data.penilai.type_penilai=='resume' && !data.penilai.resume){
|
||||
laporanButton = `
|
||||
<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
|
||||
</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}`;
|
||||
|
||||
@@ -372,7 +372,7 @@
|
||||
},
|
||||
});
|
||||
$.ajax({
|
||||
url: `/otorisator/revisi/${dataId}/`,
|
||||
url: `/otorisator/revisi/${dataId}`,
|
||||
type: 'POST',
|
||||
data: {
|
||||
message: userMessage
|
||||
|
||||
Reference in New Issue
Block a user