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-25 08:51:02 +07:00
parent dfa364cdd8 d068593177
commit 2045da36d8
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/DokumenJaminanController.php
View File

@@ -118,13 +118,13 @@
} }
DB::commit(); DB::commit();
return redirect()->route('debitur.jaminan.index', $id)->with( return redirect()->route('debitur.jaminan.index',['id'=>$id,'pemrohonan_id' => $validate['permohonan_id'] ])->with(
'success', 'success',
'Dokumen Jaminan berhasil ditambahkan', 'Dokumen Jaminan berhasil ditambahkan',
); );
} catch (Exception $e) { } catch (Exception $e) {
DB::rollBack(); DB::rollBack();
return redirect()->route('debitur.jaminan.index', $id)->with('error', 'ggl' . $e->getMessage()); return redirect()->route('debitur.jaminan.create',['id'=>$id,'pemrohonan_id' => $validate['permohonan_id'] ])->with('error', $e->getMessage());
} }
} }
} }

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

@@ -123,7 +123,7 @@ class LaporanController extends Controller
$filteredRecords = $query->count(); $filteredRecords = $query->count();
// Get the data for the current page // Get the data for the current page
$data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian','jenisFasilitasKredit', 'debiture.documents.inspeksi','penilai'])->get(); $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian','jenisFasilitasKredit', 'documents.inspeksi','penilai'])->get();
// Calculate the page count // Calculate the page count
$pageCount = ceil($totalRecords / $size); $pageCount = ceil($totalRecords / $size);

2
resources/views/debitur/components/dokumen.blade.php
View File

@@ -537,7 +537,7 @@
${field.label} ${field.label}
</label> </label>
<div class="flex flex-wrap items-baseline w-full"> <div class="flex flex-wrap items-baseline w-full">
${getCustomFieldInput(field.type, field.name, item.details, item.id)} ${getCustomFieldInput(field.type, field.name, item.details, item.jenis_legalitas_jaminan_id)}
</div> </div>
</div> </div>
`).join('') : ""} `).join('') : ""}

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

@@ -186,9 +186,9 @@
actions: { actions: {
title: 'Actions', title: 'Actions',
render: (item, data) => { render: (item, data) => {
const inspeksiId = data.debiture?.documents[0]?.inspeksi[0]?.id || '-'; const inspeksiId = data.documents[0]?.inspeksi[0]?.id || '-';
const dokumenID = data.debiture?.documents[0]?.id || '-'; const dokumenID = data.documents[0]?.id || '-';
const jenisJaminanID = data.debiture?.documents[0]?.jenis_jaminan_id || '-'; const jenisJaminanID = data.documents[0]?.jenis_jaminan_id || '-';
const typePenilaian = data.penilai?.type_penilai || ''; const typePenilaian = data.penilai?.type_penilai || '';
const type = data.penilai?.type || ''; const type = data.penilai?.type || '';
let laporanButton = ''; let laporanButton = '';

3
resources/views/permohonan/index.blade.php
View File

@@ -206,7 +206,7 @@
if (data.status === 'proses-survey' || data.status == 'rejected-reschedule') { if (data.status === 'proses-survey' || data.status == 'rejected-reschedule') {
actionHtml += ` actionHtml += `
<a onclick="surveyorRescheduleJadwalSurvey(${data.id},${data.penilaian.id},'${data.nomor_registrasi}', '${data.debiture.name}', '${data.penilaian.waktu_penilaian}', '${data.penilaian.rejected_note}')" class="delete btn btn-sm btn-outline btn-light" title="Reschedule Jadwal Survey"> <a onclick="surveyorRescheduleJadwalSurvey(${data.id},${data.penilaian.id},'${data.nomor_registrasi}', '${data.debiture.name}', '${data.penilaian.waktu_penilaian}', ${JSON.stringify(data.penilaian.rejected_note)})" class="delete btn btn-sm btn-outline btn-light" title="Reschedule Jadwal Survey">
<i class="ki-filled ki-calendar-remove"></i> <i class="ki-filled ki-calendar-remove"></i>
</a>`; </a>`;
} }
@@ -312,6 +312,7 @@
function surveyorRescheduleJadwalSurvey(permohonanId, idPenilaian, noReg, debitur, waktuPenilaian, rejectedNote) { function surveyorRescheduleJadwalSurvey(permohonanId, idPenilaian, noReg, debitur, waktuPenilaian, rejectedNote) {
rejectedNote = JSON.parse(rejectedNote);
Swal.fire({ Swal.fire({
title: 'Reschedule Jadwal Kunjungan', title: 'Reschedule Jadwal Kunjungan',
html: ` html: `