diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php index 616f5b9..4655298 100644 --- a/app/Http/Controllers/PenilaianController.php +++ b/app/Http/Controllers/PenilaianController.php @@ -891,11 +891,13 @@ class PenilaianController extends Controller public function revisiLaporan(Request $request, $id) { - $permohonan = Permohonan::find($id); - $userRole = Auth::user()->roles[0]->name; - - $authorization = Authorization::where('permohonan_id', $permohonan->id) - ->where('jenis', 'paparan')->first(); + if($request->dataHeader=='Paparan'){ + $authorization = Authorization::find($id); + $permohonan = Permohonan::find($authorization->permohonan_id); + } else { + $permohonan = Permohonan::find($id); + $userRole = Auth::user()->roles[0]->name; + } if ($permohonan->status === 'proses-paparan') { if ($authorization) { diff --git a/resources/views/penilaian/otorisator/show.blade.php b/resources/views/penilaian/otorisator/show.blade.php index 1865701..5a026cc 100644 --- a/resources/views/penilaian/otorisator/show.blade.php +++ b/resources/views/penilaian/otorisator/show.blade.php @@ -110,7 +110,7 @@ @endif - @if ($permohonan->authorization->approve_so && $dataHeader == 'paparan' ) + @if (isset($permohonan->authorization->approve_so) && $dataHeader == 'paparan' )

@@ -247,7 +247,7 @@ @push('scripts')