From 0a25a32fc84f7171ad3442571860fcf86ffdee59 Mon Sep 17 00:00:00 2001
From: majid <rustammajid76@gmail.com>
Date: Wed, 19 Mar 2025 08:51:12 +0700
Subject: [PATCH] fix(surveyor): perbaikkan back halaman inspeksi dan otor
 paparan

---
 app/Http/Controllers/PenilaianController.php         | 8 ++++----
 resources/views/penilaian/otorisator/show.blade.php  | 4 ++--
 resources/views/surveyor/components/header.blade.php | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

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 @@
                             </button>
                         @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]))
                             <button onclick="otorisatorData({{ $authorization->id }},'EO')" type="button"
                                 class="btn btn-primary">
                                 <i class="ki-filled ki-double-check"></i>
@@ -224,7 +224,7 @@
                             </button>
                         @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]))
                             <button onclick="otorisatorData({{ $authorization->id }},'DD')" type="button"
                                 class="btn btn-primary">
                                 <i class="ki-filled ki-double-check"></i>
diff --git a/resources/views/surveyor/components/header.blade.php b/resources/views/surveyor/components/header.blade.php
index 2434668..d10e7bf 100644
--- a/resources/views/surveyor/components/header.blade.php
+++ b/resources/views/surveyor/components/header.blade.php
@@ -21,12 +21,12 @@
                         class="btn btn-xs btn-info">
                         <i class="ki-filled ki-exit-left"></i> Back
                     </a>
-                @elseif (Auth::user()->hasAnyRole(['administrator', 'surveyor']) && Route::currentRouteName('penilai.show'))
+                @elseif (Auth::user()->hasAnyRole(['administrator', 'surveyor', 'penilai']))
                     @if (Request::is('surveyor/inspeksi/*/create') && request()->has('dokument') && request()->has('jenis_jaminan'))
                         <a href="{{ route('surveyor.show', $permohonan->id) }}" class="btn btn-xs btn-info">
                             <i class="ki-filled ki-exit-left"></i> Back
                         </a>
-                    @else
+                    @elseif (Request::is('penilai/*/*'))
                         <a href="{{ route('penilai.show', $permohonan->id) }}" class="btn btn-xs btn-info">
                             <i class="ki-filled ki-exit-left"></i> Back
                         </a>