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