diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php
index 071b17b..b322e35 100644
--- a/resources/views/penilai/components/print-out-sederhana.blade.php
+++ b/resources/views/penilai/components/print-out-sederhana.blade.php
@@ -561,8 +561,7 @@
@endforeach
@endif
|
- {{ $lpjData['likuidasi'] ?? '' }}%
+ {{ $lpjData['likuidasi'] ?? '70' }}%
|
X Total Nilai Pasar
@@ -586,7 +585,7 @@
|
= Rp
- {{ number_format($lpjData['likuidasi_nilai_2'], 0, ',', '.') ?? '' }}
+ {{ number_format($permohonan_migrasi->mig_mst_lpj_tot_nilai_likuidasi, 0, ',', '.') ?? '' }}
|
@@ -636,7 +635,7 @@
maupun ekstern
@php
@@ -375,8 +377,7 @@
@endforeach
@endif
- | Total Nilai Pasar Wajar |
- |
+ Total Nilai Pasar Wajar |
=
@@ -386,7 +387,7 @@
|
- @if (isset($lpjData['likuidasi']) && $lpjData['likuidasi_nilai_2'] > 0)
+ @if (isset($permohonan_migrasi->mig_mst_lpj_tot_nilai_likuidasi) || isset($lpjData['likuidasi']) && $lpjData['likuidasi_nilai_2'] > 0)
|
2. Total Nilai Likuidasi
@@ -394,14 +395,14 @@
|
|
- {{ $lpjData['likuidasi'] ?? '' }}%
+ {{ $lpjData['likuidasi'] ?? '70' }}%
|
-
+ |
X Total Nilai Pasar Wajar
|
= Rp
- {{ number_format($lpjData['likuidasi_nilai_2'], 0, ',', '.') ?? '' }}
+ {{ number_format($permohonan_migrasi->mig_mst_lpj_tot_nilai_likuidasi, 0, ',', '.') ?? '' }}
|
@endif
diff --git a/resources/views/penilai/components/signature-approval.blade.php b/resources/views/penilai/components/signature-approval.blade.php
index 685cd39..33ed97b 100644
--- a/resources/views/penilai/components/signature-approval.blade.php
+++ b/resources/views/penilai/components/signature-approval.blade.php
@@ -1,7 +1,8 @@
@php
- use Modules\Usermanagement\Models\User;
+ use Modules\Usermanagement\Models\User;
+ $laporan = $laporan ?? '';
$penilaiUser = isset($penilai->userPenilaiTeam) ? $penilai->userPenilaiTeam : null;
$imagePathPenilai = $penilaiUser && $penilaiUser->sign
? storage_path('app/public/signatures/' . $penilaiUser->id . '/' . $penilaiUser->sign)
@@ -111,7 +112,7 @@
- {{ isset($permohonan_migrasi->mig_mst_jaminan_tgl_laporan) ? formatTanggalIndonesia(\Carbon\Carbon::createFromFormat('d/m/Y H:i:s', $permohonan_migrasi->mig_mst_jaminan_tgl_laporan)) : '' }}
+ {{ isset($permohonan_migrasi->mig_mst_jaminan_tgl_laporan) ? formatTanggalIndonesia($permohonan_migrasi->mig_mst_jaminan_tgl_laporan) : '' }}
@if($soUser->name==$eoUser->name)
@@ -119,7 +120,11 @@
|
{{ $soUser->name ?? $senior_officer->name ?? '' }}
+ @if($laporan=='sederhana')
+ {{ ucwords(strtolower('SENIOR OFFICER')) }}
+ @else
{{ ucwords(strtolower('EXECUTIVE OFFICER')) }}
+ @endif
|