From e8a735e97708e8e4090f04e50a0d09f64b1f7d47 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Mon, 15 Dec 2025 11:13:37 +0700 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(lpj-print-out):=20perbaiki=20f?= =?UTF-8?q?ormat=20currency=20dan=20parsing=20data=20NPW?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Standarisasi format currency menggunakan number_format() di seluruh print-out - Hapus penggunaan formatRupiah() yang tidak konsisten - Bersihkan data currency dengan str_replace() sebelum diproses - Tangani karakter Rp, titik, dan koma agar parsing aman - Perbaiki perhitungan total NPW dari data numerik murni - Tambahkan null safety dengan default nilai 0 - Cegah error parsing akibat string currency - Pastikan tampilan angka konsisten (contoh: 1.500.000) --- .../penilai/components/print-out-sederhana.blade.php | 10 ++++------ .../penilai/components/print-out-standar.blade.php | 8 +++----- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php index 8e96bb8..b8b80e6 100644 --- a/resources/views/penilai/components/print-out-sederhana.blade.php +++ b/resources/views/penilai/components/print-out-sederhana.blade.php @@ -582,16 +582,14 @@ X - {{ formatRupiah($npw['nilai_1'] ?? 0, 0, false) ?? '' }} - - - = + {{ number_format((float) str_replace(['Rp', '.', ','], '', $npw['nilai_1'] ?? 0), 0, ',', '.') }} + = - {{ formatRupiah($npw['nilai_2'] ?? 0, 0, false) ?? '' }} + {{ number_format((float) str_replace(['Rp', '.', ','], '', $npw['nilai_2'] ?? 0), 0, ',', '.') }} - @php $totalNilaiPasarWajar += str_replace(['Rp', '.'], '', $npw['nilai_2']); @endphp + @php $totalNilaiPasarWajar += str_replace(['Rp', '.', ','], '', $npw['nilai_2'] ?? 0); @endphp @endforeach @endif diff --git a/resources/views/penilai/components/print-out-standar.blade.php b/resources/views/penilai/components/print-out-standar.blade.php index 782a366..6807618 100644 --- a/resources/views/penilai/components/print-out-standar.blade.php +++ b/resources/views/penilai/components/print-out-standar.blade.php @@ -370,7 +370,6 @@ @endif @endforeach @endif - @if (isset($lpjData['npw_tambahan'])) @foreach ($lpjData['npw_tambahan'] as $npw) @@ -382,15 +381,14 @@ X - {{ number_format($npw['nilai_1'], 0, ',', '.') ?? '' }} + {{ number_format((float) str_replace(['Rp', '.', ','], '', $npw['nilai_1'] ?? 0), 0, ',', '.') }} = - {{ number_format($npw['nilai_2'], 0, ',', '.') ?? '' }} + {{ number_format((float) str_replace(['Rp', '.', ','], '', $npw['nilai_2'] ?? 0), 0, ',', '.') }} - @php $totalNilaiPasarWajar += $npw['nilai_2']; @endphp - + @php $totalNilaiPasarWajar += str_replace(['Rp', '.', ','], '', $npw['nilai_2'] ?? 0); @endphp @endforeach @endif