diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php index ab5897b..cde7ca9 100644 --- a/app/Http/Controllers/PenilaianController.php +++ b/app/Http/Controllers/PenilaianController.php @@ -514,10 +514,10 @@ class PenilaianController extends Controller $status = 'done'; } - if($status=='done'){ + if ($status == 'done') { $_permohonan = Permohonan::with(['documents.jenisJaminan','penilaian._user_penilai','penilai','documents.detail.jenisLegalitasJaminan'])->find(6); - if(isset($_permohonan->penilai->lpj)){ + if (isset($_permohonan->penilai->lpj)) { $npw = json_decode($_permohonan->penilai->lpj, true); $npw = $npw['total_nilai_pasar_wajar'] ?? 0; } @@ -559,7 +559,7 @@ class PenilaianController extends Controller ]); } elseif (Auth::user()->roles[0]->name === 'EO Appraisal' || Auth::user()->roles[0]->name === 'administrator' && $authorization->approve_so && $authorization->approve_eo === null) { $status = '2'; - if (!in_array($permohonan->nilai_plafond_id, [1, 4])) { + if (!in_array($permohonan->nilai_plafond_id, [1, 2])) { $status = '1'; $permohonan->update([ 'status' => $authorization->request @@ -603,7 +603,7 @@ class PenilaianController extends Controller ]); } elseif (Auth::user()->roles[0]->name === 'EO Appraisal') { $status = '2'; - if (!in_array($permohonan->nilai_plafond_id, [1,4])) { + if (!in_array($permohonan->nilai_plafond_id, [1,2])) { $status = '1'; $permohonan->update([ 'status' => $authorization->request diff --git a/resources/views/penilaian/otorisator/show.blade.php b/resources/views/penilaian/otorisator/show.blade.php index f71ccb0..da74054 100644 --- a/resources/views/penilaian/otorisator/show.blade.php +++ b/resources/views/penilaian/otorisator/show.blade.php @@ -216,7 +216,7 @@ @endif - @if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) && $authorization->approve_so && $authorization->approve_eo == null) + @if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) && $authorization->approve_so && $authorization->approve_eo == null && in_array($permohonan->nilai_plafond_id, [1, 2])) @endif - @if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) && $authorization->approve_eo && $authorization->approve_dd == null) + @if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) && $authorization->approve_eo && $authorization->approve_dd == null && in_array($permohonan->nilai_plafond_id, [1, 4]))