From 016791954213170d73cdec46ea939e911d065045 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Wed, 23 Apr 2025 11:29:01 +0700 Subject: [PATCH] feat(laporan-penilaian-jaminan): perbarui tanggal laporan dan tanggal review - Menambahkan logika untuk menampilkan tanggal laporan berdasarkan approval. - Memperbarui tanggal review dengan tanggal kunjungan dari penilaian. --- app/Exports/LaporanPenilaianJaminanExport.php | 6 ++++-- app/Http/Controllers/LaporanPenilaianJaminanController.php | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/Exports/LaporanPenilaianJaminanExport.php b/app/Exports/LaporanPenilaianJaminanExport.php index 6e6e9f1..cbf0196 100644 --- a/app/Exports/LaporanPenilaianJaminanExport.php +++ b/app/Exports/LaporanPenilaianJaminanExport.php @@ -101,8 +101,10 @@ formatRupiah($nilai_tanah, 2), $luas_bangunan . ' m²', formatRupiah($nilai_bangunan, 2), - '', // tanggal_laporan - '', // tanggal_review + ($permohonan->approval_dd_at || $permohonan->approval_eo_at) ? + formatTanggalIndonesia($permohonan->approval_dd_at ?? $permohonan->approval_eo_at) : '', + $permohonan->penilaian->tanggal_kunjungan ? + formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) : '', formatRupiah($npw, 2), formatRupiah($nilai_liquidasi, 2), $permohonan->penilaian->_user_penilai->userPenilaiTeam->name, diff --git a/app/Http/Controllers/LaporanPenilaianJaminanController.php b/app/Http/Controllers/LaporanPenilaianJaminanController.php index ecde913..fd4ff07 100644 --- a/app/Http/Controllers/LaporanPenilaianJaminanController.php +++ b/app/Http/Controllers/LaporanPenilaianJaminanController.php @@ -122,8 +122,8 @@ 'nilai_tanah' => formatRupiah($nilai_tanah,2), 'luas_bangunan' => $luas_bangunan . ' m²', 'nilai_bangunan' => formatRupiah($nilai_bangunan,2), - 'tanggal_laporan' => '', - 'tanggal_review' => '', + 'tanggal_laporan' => $permohonan->approval_dd_at ?? $permohonan->approval_eo_at ?? '', + 'tanggal_review' => $permohonan->penilaian->tanggal_kunjungan ?? '', 'nilai_pasar_wajar' => formatRupiah($npw,2), 'nilai_likuidasi' => formatRupiah($nilai_liquidasi,2), 'nama_penilai' => $permohonan->penilaian->_user_penilai->userPenilaiTeam->name,