diff --git a/Livewire/DetailSubrogasiJamkrindo/DetailSubrogasiJamkrindoModal.php b/Livewire/DetailSubrogasiJamkrindo/DetailSubrogasiJamkrindoModal.php
index 0d672b7..62d8e61 100644
--- a/Livewire/DetailSubrogasiJamkrindo/DetailSubrogasiJamkrindoModal.php
+++ b/Livewire/DetailSubrogasiJamkrindo/DetailSubrogasiJamkrindoModal.php
@@ -35,11 +35,6 @@
         }
 
         public function submit()
-        {
-            $this->dispatch('success', __('Currency updated'));
-        }
-
-        public function _submit()
         {
             $this->validate();
             session_start();
@@ -48,7 +43,7 @@
                 // Prepare the data for creating a new user
                 $data = [
                     'nomor_pinjaman'      => $_SESSION['nomor_pinjaman'],
-                    'kode'     => round(microtime(true) * 100),
+                    'kode'                => round(microtime(true) * 100),
                     'tanggal_pembayaran'  => $this->tanggal_pembayaran,
                     'pembayaran_debitur'  => $this->pembayaran_debitur,
                     'subrogasi_jamkrindo' => $this->subrogasi_jamkrindo,
@@ -60,13 +55,59 @@
                 if ($this->edit_mode) {
                     // Emit a success event with a message
                     $detail_penagihan = DetailSubrogasiJamkrindo::find($this->id);
-                    $detail_penagihan->update($data);
 
-                    $this->dispatch('success', __('Data Detail Subrogasi Jamkrindo berhasil diupdate'));
+                    $data['updated_by'] = auth()->user()->id;
+                    $data['updated_at'] = now();
+
+                    $approval = [
+                        'method'      => 'update',
+                        'menu'        => 'Detail Subrogasi Jamkrindo',
+                        'old_request' => json_encode($detail_penagihan),
+                        'new_request' => json_encode($data),
+                        'description' => 'Update Detail Subrogasi Jamkrindo',
+                        'status'      => '0',
+                        'ref'         => $this->kode
+                    ];
+
+                    $is_approval = Approval::where('menu', 'Detail Subrogasi Jamkrindo')
+                                           ->where('ref', $this->kode)
+                                           ->where('status', '0')
+                                           ->get()
+                                           ->first();
+
+                    if ($is_approval) {
+                        $this->dispatch('error', 'Data Detail Subrogasi Jamkrindo Sedang Menunggu Approval');
+                    } else {
+                        Approval::create($approval);
+                        $this->dispatch('success', 'Data Detail Subrogasi Jamkrindo Berhasil Di Update, Menunggu Approval');
+                    }
                 } else {
                     // Emit a success event with a message
-                    DetailSubrogasiJamkrindo::create($data);
-                    $this->dispatch('success', __('Data Detail Subrogasi Jamkrindo berhasil ditambahkan'));
+                    $data['created_by'] = auth()->user()->id;
+                    $data['created_at'] = now();
+
+                    $approval = [
+                        'method'      => 'create',
+                        'menu'        => 'Detail Subrogasi Jamkrindo',
+                        'new_request' => json_encode($data),
+                        'description' => 'Create Detail Subrogasi Jamkrindo',
+                        'status'      => '0',
+                        'ref'         => $this->kode
+                    ];
+
+                    $is_approval = Approval::where('menu', 'Detail Subrogasi Jamkrindo')
+                                           ->where('ref', $this->kode)
+                                           ->where('status', '0')
+                                           ->get()
+                                           ->first();
+
+                    if ($is_approval) {
+                        $this->dispatch('error', 'Data Detail Subrogasi Jamkrindo Sedang Menunggu Approval');
+                        $this->reset();
+                    } else {
+                        Approval::create($approval);
+                        $this->dispatch('success', 'Data Detail Subrogasi Jamkrindo Berhasil Di Input, Menunggu Approval');
+                    }
                 }
             });
 
@@ -95,8 +136,8 @@
         public function delete($id)
         {
             // Emit a success event with a message
-            $detailsubrogasi = DetailSubrogasiJamkrindo::find($id);
-            $detailsubrogasi->delete_by = auth()->user()->id;
+            $detailsubrogasi             = DetailSubrogasiJamkrindo::find($id);
+            $detailsubrogasi->delete_by  = auth()->user()->id;
             $detailsubrogasi->deleted_at = now();
 
             $approval = [
diff --git a/Resources/views/pencatatan/detail_jaminan/show.blade.php b/Resources/views/pencatatan/detail_jaminan/show.blade.php
index 7d1c8f0..bcc29c7 100644
--- a/Resources/views/pencatatan/detail_jaminan/show.blade.php
+++ b/Resources/views/pencatatan/detail_jaminan/show.blade.php
@@ -125,14 +125,6 @@
                     $(this).find('form').trigger('reset');
                     $("#nomor_pinjaman").val("{{ request()->segment(3) }}");
                 });
-
-                $("#showModal").on('click',function(){
-                    $("#nomor_pinjaman").val("{{ request()->segment(3) }}");
-                });
-
-                $(".editJaminan").on('click',function(){
-                    $("#nomor_pinjaman").val("{{ request()->segment(3) }}");
-                });
             });
         </script>
     @endpush