diff --git a/app/Http/Controllers/NocController.php b/app/Http/Controllers/NocController.php index 891e9ea..5053015 100644 --- a/app/Http/Controllers/NocController.php +++ b/app/Http/Controllers/NocController.php @@ -216,10 +216,13 @@ $persetujuanPenawaran->noc->tanggal_pembayaran ?? $persetujuanPenawaran->noc?->created_at, true, ), - 'nominal_bayar' => currencyFormat( - $persetujuanPenawaran->noc->nominal_bayar ?? $persetujuanPenawaran->nominal_bayar ?? 0, + 'nominal_bayar' => currencyFormat($persetujuanPenawaran->nominal_bayar ?? 0, + ), + 'nominal_diterima' => currencyFormat( + $persetujuanPenawaran->noc->nominal_bayar ?? 0, ), 'bukti_ksl' => $persetujuanPenawaran->noc->bukti_ksl ?? $persetujuanPenawaran->bukti_ksl ?? null, + 'bukti_bayar' => $persetujuanPenawaran->bukti_bayar ?? null, 'memo_penyelesaian' => $persetujuanPenawaran->noc->memo_penyelesaian ?? $persetujuanPenawaran->memo_penyelesaian ?? null, 'nominal_penyelesaian' => currencyFormat( $persetujuanPenawaran->noc->nominal_penyelesaian ?? $persetujuanPenawaran->nominal_penyelesaian ?? 0, diff --git a/resources/views/noc/form.blade.php b/resources/views/noc/form.blade.php index b435428..ff8f8cc 100644 --- a/resources/views/noc/form.blade.php +++ b/resources/views/noc/form.blade.php @@ -28,7 +28,7 @@