diff --git a/app/Http/Controllers/RegistrasiFinalController.php b/app/Http/Controllers/RegistrasiFinalController.php
index deb2781..033a044 100644
--- a/app/Http/Controllers/RegistrasiFinalController.php
+++ b/app/Http/Controllers/RegistrasiFinalController.php
@@ -47,6 +47,7 @@ use Modules\Lpj\Models\PenawaranTender;
             }
 
             // Retrieve data from the database
+            // data.id => penawaran.id
             $query =PenawaranTender::query()
                             ->select('penawaran.*', 'tujuan_penilaian_kjpp.name as tujuan_penilaian_kjpp_name')
                             ->leftJoin('tujuan_penilaian_kjpp', 'tujuan_penilaian_kjpp.id','=','penawaran.tujuan_penilaian_kjpp_id')
@@ -135,7 +136,10 @@ use Modules\Lpj\Models\PenawaranTender;
 
         public function show($id)
         {
-            $permohonan  = Permohonan::find($id);
+            // $id => penawaran.id
+            $penawaran = PenawaranTender::find($id);
+            $permohonan  = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi)->first();
+
             if($permohonan->dokumen)
             {
                 $pdfSPK_path = Storage::url($permohonan->dokumen);
@@ -148,6 +152,7 @@ use Modules\Lpj\Models\PenawaranTender;
 
         public function edit($id)
         {
+            // $id => penawaran.id
             return view('lpj::registrasifinal.edit', compact('id'));
         }
 
@@ -155,16 +160,17 @@ use Modules\Lpj\Models\PenawaranTender;
         {
             $data = array();
             $datas = array();
+            $penawaran=null;
+            $regions=null;
 
             if (request()->ajax()) {
+                // $id => penawaran.id
                 $id = $request->id;
-                $datas = Permohonan::find($id);
-                
+                $penawaran = PenawaranTender::find($id);
+                $datas  = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi)->first();
                 if ($datas) {
-                    $penawaran=null;
-                    $regions=null;
+                    
                     $regions=Regions::pluck('name', 'id');
-                    $penawaran = PenawaranTender::where('nomor_registrasi','=',$datas->nomor_registrasi)->first();
 
                     $penawaranString = "";
                     if($penawaran->status)
@@ -229,10 +235,10 @@ use Modules\Lpj\Models\PenawaranTender;
 
                         $dataPenawaran = ['status' => 'registrasi-final'];
 
-                       
-                        $permohonan = Permohonan::find($id);
-                        $penawaran = PenawaranTender::where('nomor_registrasi','=',$permohonan->nomor_registrasi)->first();              
-                        
+                        // $id => penawaran.id
+                        $penawaran = PenawaranTender::find($id);
+                        $permohonan  = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi)->first();
+
                         $permohonan->update($dataPermohonan);
                         $penawaran->update($dataPenawaran);
                         // 
diff --git a/resources/views/registrasifinal/edit.blade.php b/resources/views/registrasifinal/edit.blade.php
index a2e15e7..c0b365e 100644
--- a/resources/views/registrasifinal/edit.blade.php
+++ b/resources/views/registrasifinal/edit.blade.php
@@ -13,7 +13,8 @@
 <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
    
         <form id="{{$route[0]}}_form" name="{{$route[0]}}_form" method="POST">
-            <input type="hidden" id="id" name="id" value="{{ $id }}">
+            <!-- $id => penawaran.id -->
+            <input type="hidden" id="{{$route[0]}}_id" name="id" value="{{ $id }}">
             @method('PUT')
             @csrf
                     <div class="card pb-2.5">
diff --git a/resources/views/registrasifinal/js/editjs.blade.php b/resources/views/registrasifinal/js/editjs.blade.php
index c46596d..89f2a5e 100644
--- a/resources/views/registrasifinal/js/editjs.blade.php
+++ b/resources/views/registrasifinal/js/editjs.blade.php
@@ -17,7 +17,8 @@
 
     function setData()
     {
-        let id = $("#id").val();
+        // id => penawaran.id
+        let id = $("#{{$route[0]}}_id").val();
         let token =  "{{ csrf_token() }}";
         // alert('token = ' + token);
         var useURL = "{{ route('registrasifinal.setData') }}";
@@ -81,6 +82,7 @@
         let token   = "{{ csrf_token() }}";
 
         let _method   = $('input[name=_method]').val();
+         // id => penawaran.id
         let id   = $('#{{$route[0]}}_id').val();
         let region = $("#{{$route[0]}}_region").val();
         let catatan = $("#{{$route[0]}}_catatan").val();