diff --git a/app/Http/Controllers/SpkController.php b/app/Http/Controllers/SpkController.php index 770944c..f5de6aa 100644 --- a/app/Http/Controllers/SpkController.php +++ b/app/Http/Controllers/SpkController.php @@ -158,7 +158,7 @@ use Illuminate\Support\Facades\Auth; $penawaran->jenis_laporan_name = $penawaran->jenisLaporan->name; $penawaran->jenis_laporan_code = $penawaran->jenisLaporan->code; $penawaran->tujuan_penilaian_kjpp_name = $penawaran->tujuanPenilaianKjpp->name; - $penawaran->penilaian_waktu_penilain = $penawaran->penilaian->waktu_penilaian; + $penawaran->penilaian_waktu_penilain = $penawaran->penilaian->waktu_penilaian ?? ""; $permohonan = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi) ->leftJoin('dokumen_jaminan', 'dokumen_jaminan.permohonan_id','=','permohonan.id') @@ -244,7 +244,7 @@ use Illuminate\Support\Facades\Auth; $penawaran->jenis_laporan_name = $penawaran->jenisLaporan->name; $penawaran->jenis_laporan_code = $penawaran->jenisLaporan->code; $penawaran->tujuan_penilaian_kjpp_name = $penawaran->tujuanPenilaianKjpp->name; - $penawaran->penilaian_waktu_penilain = $penawaran->penilaian->waktu_penilaian; + $penawaran->penilaian_waktu_penilain = $penawaran->penilaian->waktu_penilaian ?? ""; $permohonan = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi) ->leftJoin('dokumen_jaminan', 'dokumen_jaminan.permohonan_id','=','permohonan.id') diff --git a/resources/views/spk/documentSPK.blade.php b/resources/views/spk/documentSPK.blade.php index 08dd70a..f24e2f2 100644 --- a/resources/views/spk/documentSPK.blade.php +++ b/resources/views/spk/documentSPK.blade.php @@ -60,7 +60,7 @@

Kepada

-

{{ $penawaran->kjpp_name }}

+

KJPP {{ $penawaran->kjpp_name }}

{{ $penawaran->kjpp_address }}



@@ -237,8 +237,8 @@ - {{ $penawaran->persetujuan_penawaran->creator->name }}
- {{ $penawaran->persetujuan_penawaran->creator->getRoleNames()[0] }} + {{ getUser($penawaran->authorized_by)->name }}
+ {{ getUser($penawaran->authorized_by)->getRoleNames()[0] }} (……………………………………..) diff --git a/resources/views/spk/edit.blade.php b/resources/views/spk/edit.blade.php index be61c5f..85b2a90 100644 --- a/resources/views/spk/edit.blade.php +++ b/resources/views/spk/edit.blade.php @@ -76,7 +76,7 @@

Kepada

-

{{ $penawaran->kjpp_name }}

+

KJPP {{ $penawaran->kjpp_name }}

{{ $penawaran->kjpp_address }}



@@ -258,8 +258,8 @@ - {{ $penawaran->persetujuan_penawaran->creator->name }}
- {{ $penawaran->persetujuan_penawaran->creator->getRoleNames()[0] }} + {{ getUser($penawaran->authorized_by)->name }}
+ {{ getUser($penawaran->authorized_by)->getRoleNames()[0] }} (……………………………………..)