diff --git a/app/Http/Controllers/NocController.php b/app/Http/Controllers/NocController.php
index 49a0986..4bf28a1 100644
--- a/app/Http/Controllers/NocController.php
+++ b/app/Http/Controllers/NocController.php
@@ -229,7 +229,10 @@ use Modules\Lpj\Models\Noc;
                 $search = $request->get('search');
                 $query->where(function ($q) use ($search) {
                     $q->orWhereRelation('penawaran', 'nomor_registrasi', 'LIKE', '%' . $search . '%')
-                      ->orWhereRelation('permohonan.jenisPenilaian', 'name', 'LIKE', '%' . $search . '%');
+                        ->orWhereRelation('permohonan', 'nomor_registrasi', 'LIKE', '%' . $search . '%')
+                        ->orWhereRelation('permohonan.debiture','name', 'LIKE', '%' . $search . '%')
+                        ->orWhereRelation('permohonan.jenisPenilaian', 'name', 'LIKE', '%' . $search . '%')
+                        ->orWhere('nomor_tiket', 'LIKE', '%' . $search . '%');
                 });
             }
 
@@ -326,8 +329,15 @@ use Modules\Lpj\Models\Noc;
             if ($request->has('search') && !empty($request->get('search'))) {
                 $search = $request->get('search');
                 $query->where(function ($q) use ($search) {
-                    $q->orWhereRelation('penawaran', 'nomor_registrasi', 'LIKE', '%' . $search . '%')
-                      ->orWhereRelation('permohonan.jenisPenilaian', 'name', 'LIKE', '%' . $search . '%');
+                     $q->orWhereRelation('penawaran', 'nomor_registrasi', 'LIKE', '%' . $search . '%')
+                        ->orWhereRelation('permohonan', 'nomor_registrasi', 'LIKE', '%' . $search . '%')
+                        ->orWhereRelation('permohonan.debiture','name', 'LIKE', '%' . $search . '%')
+                        ->orWhereRelation('permohonan.jenisPenilaian', 'name', 'LIKE', '%' . $search . '%')
+                        ->orWhere('nomor_tiket', 'LIKE', '%' . $search . '%'); $q->orWhereRelation('penawaran', 'nomor_registrasi', 'LIKE', '%' . $search . '%')
+                        ->orWhereRelation('permohonan', 'nomor_registrasi', 'LIKE', '%' . $search . '%')
+                        ->orWhereRelation('permohonan.debiture','name', 'LIKE', '%' . $search . '%')
+                        ->orWhereRelation('permohonan.jenisPenilaian', 'name', 'LIKE', '%' . $search . '%')
+                        ->orWhere('nomor_tiket', 'LIKE', '%' . $search . '%');
                 });
             }
 
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 16bfbea..765a09e 100644
--- a/resources/views/penilaian/otorisator/show.blade.php
+++ b/resources/views/penilaian/otorisator/show.blade.php
@@ -5,7 +5,7 @@
 @endsection
 
 @section('content')
-    <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
+    <div class="grid gap-5 mx-auto w-full lg:gap-7.5">
 
         @php
             $dataHeader = strtolower($header ?? '');
@@ -14,15 +14,15 @@
         @include('lpj::component.detail-jaminan', ['backLink' => 'otorisator.' . $dataHeader . '.index'])
 
         @foreach ($permohonan->documents as $dokumen)
-            <div class="card border border-agi-100 pb-2.5">
+            <div class="pb-2.5 border card border-agi-100">
                 <div class="card-header bg-agi-50" id="basic_settings">
                     <h3 class="card-title">
                         Team
                     </h3>
                 </div>
 
-                <div class="card-body grid gap-5">
-                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                <div class="grid gap-5 card-body">
+                    <div class="flex flex-wrap gap-2.5 items-baseline lg:flex-nowrap">
                         @php
                             $surveyor = $permohonan->penilaian->userPenilai->where('role', 'surveyor')->first();
                             $penilai = $permohonan->penilaian->userPenilai->where('role', 'penilai')->first();
@@ -33,11 +33,11 @@
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
 
-                            <p class="flex w-full text-gray-600 font-medium text-sm">
+                            <p class="flex w-full text-sm font-medium text-gray-600">
                                 {{ $surveyor->userPenilaiTeam->name }}
                             </p>
 
-                            <p class="flex w-full text-gray-600 font-medium text-sm">
+                            <p class="flex w-full text-sm font-medium text-gray-600">
                                 {{ checkRegionUserName($surveyor->userPenilaiTeam->id) }}
                             </p>
                         </div>
@@ -46,11 +46,11 @@
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
 
-                            <p class="flex w-full text-gray-600 font-medium text-sm">
+                            <p class="flex w-full text-sm font-medium text-gray-600">
                                 {{ $penilai->userPenilaiTeam->name }}
                             </p>
 
-                            <p class="flex w-full text-gray-600 font-medium text-sm">
+                            <p class="flex w-full text-sm font-medium text-gray-600">
                                 {{ checkRegionUserName($penilai->userPenilaiTeam->id) }}
                             </p>
                         </div>
@@ -65,7 +65,7 @@
 
 
         @if ($permohonan->approval_so)
-            <div class="card border border-agi-100 pb-2.5">
+            <div class="pb-2.5 border card border-agi-100">
                 <div class="card-header bg-agi-50" id="basic_settings">
                     <h3 class="card-title">
                         Approval
@@ -105,7 +105,7 @@
 
 
         @if (isset($permohonan->authorization->approve_so) && $dataHeader == 'paparan' )
-        <div class="card border border-agi-100 pb-2.5">
+        <div class="pb-2.5 border card border-agi-100">
             <div class="card-header bg-agi-50" id="basic_settings">
                 <h3 class="card-title">
                     Approval
@@ -158,6 +158,13 @@
                     @endphp
 
                     @if ($dataHeader == 'pelaporan')
+                        @php
+                            @php
+                                $lpj_ = optional(json_decode($permohonan->penilaian->lpj));
+                                $npw = $lpj_->total_nilai_pasar_wajar ?? 0;
+                                $npw = str_replace('.', '', $npw);
+                            @endphp
+                        @endphp
                         <a class="btn btn-success"
                             href="{{ route('otorisator.view-laporan') }}?permohonanId={{ $permohonan->id }}&documentId={{ $documentId }}&jaminanId={{ $jenisJaminanId }}&statusLpj={{ true }}&header={{ $header ?? '' }}">
                             Lihat Laporan
@@ -172,7 +179,7 @@
                         @if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) &&
                                 $permohonan->approval_so &&
                                 $permohonan->approval_eo == 0 &&
-                                in_array($permohonan->nilai_plafond_id, [1, 2,3, 4]))
+                                $npw > 1000000000)
                             <button onclick="otorisatorData({{ $permohonan->id }})" type="button" class="btn btn-primary">
                                 <i class="ki-filled ki-double-check"></i>
                                 Otorisator {{ $header ?? '' }}
@@ -182,7 +189,7 @@
                         @if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) &&
                                 $permohonan->approval_eo &&
                                 $permohonan->approval_dd == 0 &&
-                                in_array($permohonan->nilai_plafond_id, [4]))
+                                $npw > 5000000000)
                             <button onclick="otorisatorData({{ $permohonan->id }})" type="button" class="btn btn-primary">
                                 <i class="ki-filled ki-double-check"></i>
                                 Otorisator {{ $header ?? '' }}
@@ -192,13 +199,13 @@
                         @if ($permohonan->penilai->file_paparan)
                             <span class="btn btn-success btn-outline"
                                 onclick="viewPDF('{{ Storage::url($permohonan->penilai->file_paparan) }}')"><i
-                                    class="ki-filled ki-eye mr-2"></i>Lihat Data Paparan</span>
+                                    class="mr-2 ki-filled ki-eye"></i>Lihat Data Paparan</span>
                         @endif
 
                         @if ($permohonan->penilai->kertas_kerja)
                             <span class="btn btn-warning btn-outline"
                                 onclick="viewPDF('{{ Storage::url($permohonan->penilai->kertas_kerja) }}')"><i
-                                    class="ki-filled ki-eye mr-2"></i>Lihat Kertas Kerja</span>
+                                    class="mr-2 ki-filled ki-eye"></i>Lihat Kertas Kerja</span>
                         @endif
 
 
@@ -320,14 +327,14 @@
                 const isPaparanSO = dataHeader === 'Paparan' && role === 'SO';
 
                 const swalHtml = isPaparanSO ? `
-        <div class="text-left space-y-4">
-            <p class="text-gray-700 text-center">Untuk melakukan otorisasi ${dataHeader}!</p>
+        <div class="space-y-4 text-left">
+            <p class="text-center text-gray-700">Untuk melakukan otorisasi ${dataHeader}!</p>
             <div>
-                <label for="swal-keterangan" class="block text-sm font-medium text-gray-700 mb-1">Keterangan</label>
+                <label for="swal-keterangan" class="block mb-1 text-sm font-medium text-gray-700">Keterangan</label>
                 <input id="swal-keterangan" class="input" placeholder="Masukkan Keterangan">
             </div>
             <div>
-                <label for="swal-tanggal-paparan" class="block text-sm font-medium text-gray-700 mb-1">Tanggal Paparan</label>
+                <label for="swal-tanggal-paparan" class="block mb-1 text-sm font-medium text-gray-700">Tanggal Paparan</label>
                 <input id="swal-tanggal-paparan" class="input" type="date" placeholder="Tanggal paparan">
             </div>
         </div>` : '';