diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php index 24a60bf..142dea2 100644 --- a/app/Http/Controllers/PenilaianController.php +++ b/app/Http/Controllers/PenilaianController.php @@ -517,12 +517,18 @@ class PenilaianController extends Controller $role = Auth::user()->roles[0]->name; $status = 'done'; $approvalField = null; + + $lpj_ = optional(json_decode($permohonan->penilaian->lpj)); + $npw = $lpj_->total_nilai_pasar_wajar ?? 0; + $npw = str_replace('.', '', $npw); + + if ($role === 'senior-officer') { $approvalField = 'approval_so'; - $status = in_array($permohonan->nilai_plafond_id, [3]) ? 'done' : 'proses-laporan'; + $status = $npw <=1000000000 ? 'done' : 'proses-laporan'; } elseif ($role === 'EO Appraisal') { $approvalField = 'approval_eo'; - $status = in_array($permohonan->nilai_plafond_id, [2, 1]) ? 'done' : 'proses-laporan'; + $status = $npw <=5000000000 ? 'done' : 'proses-laporan'; } elseif ($role === 'DD Appraisal') { $approvalField = 'approval_dd'; $status = 'done'; diff --git a/resources/views/penilaian/otorisator/show.blade.php b/resources/views/penilaian/otorisator/show.blade.php index ca79239..7930683 100644 --- a/resources/views/penilaian/otorisator/show.blade.php +++ b/resources/views/penilaian/otorisator/show.blade.php @@ -5,7 +5,7 @@ @endsection @section('content') -
+
{{ $surveyor->userPenilaiTeam->name }}
-+
{{ checkRegionUserName($surveyor->userPenilaiTeam->id) }}
+
{{ $penilai->userPenilaiTeam->name }}
-+
{{ checkRegionUserName($penilai->userPenilaiTeam->id) }}