diff --git a/DataTables/DetailPembayaranDataTable.php b/DataTables/DetailPembayaranDataTable.php
index 1508b6a..ed8a0ba 100644
--- a/DataTables/DetailPembayaranDataTable.php
+++ b/DataTables/DetailPembayaranDataTable.php
@@ -25,7 +25,7 @@
             return (new EloquentDataTable($query))->filter(function ($query) {
                 if (request()->has('search')) {
                     $search = request()->get('search');
-                    $query->where('nomor_pinjaman', 'like', "%" . $search['value'] . "%");
+                    $query->where('nomor_pinjaman', 'like', "%" . request()->segment(3) . "%");
                 }
             })->addIndexColumn()->editColumn('tanggal_pembayaran', function ($row) {
                 $date = Carbon::create($row->tanggal_pembayaran);
diff --git a/DataTables/DetailPenagihanDataTable.php b/DataTables/DetailPenagihanDataTable.php
index b18cb11..0806cbc 100644
--- a/DataTables/DetailPenagihanDataTable.php
+++ b/DataTables/DetailPenagihanDataTable.php
@@ -25,7 +25,7 @@
             return (new EloquentDataTable($query))->filter(function ($query) {
                 if (request()->has('search')) {
                     $search = request()->get('search');
-                    $query->where('nomor_pinjaman', 'like', "%" . $search['value'] . "%");
+                    $query->where('nomor_pinjaman', 'like', "%" . request()->segment(3) . "%");
                 }
             })->addIndexColumn()->editColumn('tanggal_penagihan', function ($row) {
                 $date = Carbon::create($row->tanggal_penagihan);
diff --git a/Http/Controllers/ApprovalController.php b/Http/Controllers/ApprovalController.php
index f3e351f..20c77e1 100644
--- a/Http/Controllers/ApprovalController.php
+++ b/Http/Controllers/ApprovalController.php
@@ -99,8 +99,8 @@
                 'Subrogasi Jamkrindo'       => 'SubrogasiJamkrindo',
                 'Klaim Jamkrindo'           => 'KlaimJamkrindo',
                 'Hapus Buku'                => 'HapusBuku',
-                'Detail Pembayaran'           => 'DetailPembayaran',
-                'Detail Penagihan'           => 'DetailPenagihan',
+                'Detail Pembayaran'         => 'DetailPembayaran',
+                'Detail Penagihan'          => 'DetailPenagihan',
             ];
 
             try {
diff --git a/Livewire/DetailJaminan/DetailJaminanModal.php b/Livewire/DetailJaminan/DetailJaminanModal.php
index 149dab3..2f65df3 100644
--- a/Livewire/DetailJaminan/DetailJaminanModal.php
+++ b/Livewire/DetailJaminan/DetailJaminanModal.php
@@ -5,7 +5,6 @@
     use Illuminate\Support\Facades\DB;
     use Livewire\Component;
     use Modules\Writeoff\Entities\Approval;
-    use Modules\Writeoff\Entities\Debitur;
     use Modules\Writeoff\Entities\DetailJaminan;
     use Modules\Writeoff\Entities\GuaranteeType;
     use Modules\Writeoff\Http\Requests\DetailJaminan\StoreDetailJaminanRequest;
@@ -133,8 +132,8 @@
 
         public function delete($id)
         {
-            $detailjaminan = DetailJaminan::find($id);
-            $detailjaminan->delete_by = auth()->user()->id;
+            $detailjaminan             = DetailJaminan::find($id);
+            $detailjaminan->delete_by  = auth()->user()->id;
             $detailjaminan->deleted_at = now();
 
             $approval = [
diff --git a/Livewire/DetailPembayaran/DetailPembayaranModal.php b/Livewire/DetailPembayaran/DetailPembayaranModal.php
index f4072ac..3cbdc37 100644
--- a/Livewire/DetailPembayaran/DetailPembayaranModal.php
+++ b/Livewire/DetailPembayaran/DetailPembayaranModal.php
@@ -52,13 +52,59 @@
                 if ($this->edit_mode) {
                     // Emit a success event with a message
                     $detail_pembayaran = DetailPembayaran::find($this->id);
-                    $detail_pembayaran->update($data);
 
-                    $this->dispatch('success', __('Data Detail Pembayaran berhasil diupdate'));
+                    $data['updated_by'] = auth()->user()->id;
+                    $data['updated_at'] = now();
+
+                    $approval = [
+                        'method'      => 'update',
+                        'menu'        => 'Detail Pembayaran',
+                        'old_request' => json_encode($detail_pembayaran),
+                        'new_request' => json_encode($data),
+                        'description' => 'Update Detail Pembayaran',
+                        'status'      => '0',
+                        'ref'         => $this->kode
+                    ];
+
+                    $is_approval = Approval::where('menu', 'Detail Pembayaran')
+                                           ->where('ref', $this->kode)
+                                           ->where('status', '0')
+                                           ->get()
+                                           ->first();
+
+                    if ($is_approval) {
+                        $this->dispatch('error', 'Data Detail Jaminan Sedang Menunggu Approval');
+                    } else {
+                        Approval::create($approval);
+                        $this->dispatch('success', 'Data Detail Jaminan Berhasil Di Update, Menunggu Approval');
+                    }
                 } else {
                     // Emit a success event with a message
-                    DetailPembayaran::create($data);
-                    $this->dispatch('success', __('Data Detail Pembayaran berhasil ditambahkan'));
+                    $data['created_by'] = auth()->user()->id;
+                    $data['created_at'] = now();
+
+                    $approval = [
+                        'method'      => 'create',
+                        'menu'        => 'Detail Pembayaran',
+                        'new_request' => json_encode($data),
+                        'description' => 'Create Detail Pembayaran',
+                        'status'      => '0',
+                        'ref'         => $this->kode
+                    ];
+
+                    $is_approval = Approval::where('menu', 'Detail Pembayaran')
+                                           ->where('ref', $this->kode)
+                                           ->where('status', '0')
+                                           ->get()
+                                           ->first();
+
+                    if ($is_approval) {
+                        $this->dispatch('error', 'Data Detail Pembayaran Sedang Menunggu Approval');
+                        $this->reset();
+                    } else {
+                        Approval::create($approval);
+                        $this->dispatch('success', 'Data Detail Pembayaran Berhasil Di Input, Menunggu Approval');
+                    }
                 }
             });
 
@@ -84,8 +130,8 @@
 
         public function delete($id)
         {
-            $detailpembayaran = DetailPembayaran::find($id);
-            $detailpembayaran->delete_by = auth()->user()->id;
+            $detailpembayaran             = DetailPembayaran::find($id);
+            $detailpembayaran->delete_by  = auth()->user()->id;
             $detailpembayaran->deleted_at = now();
 
             $approval = [
diff --git a/Livewire/DetailPenagihan/DetailPenagihanModal.php b/Livewire/DetailPenagihan/DetailPenagihanModal.php
index 011579b..730bc28 100644
--- a/Livewire/DetailPenagihan/DetailPenagihanModal.php
+++ b/Livewire/DetailPenagihan/DetailPenagihanModal.php
@@ -58,13 +58,59 @@
                 if ($this->edit_mode) {
                     // Emit a success event with a message
                     $detail_penagihan = DetailPenagihan::find($this->id);
-                    $detail_penagihan->update($data);
 
-                    $this->dispatch('success', __('Data Detail Penagihan berhasil diupdate'));
+                    $data['updated_by'] = auth()->user()->id;
+                    $data['updated_at'] = now();
+
+                    $approval = [
+                        'method'      => 'update',
+                        'menu'        => 'Detail Penagihan',
+                        'old_request' => json_encode($detail_penagihan),
+                        'new_request' => json_encode($data),
+                        'description' => 'Update Detail Penagihan',
+                        'status'      => '0',
+                        'ref'         => $this->kode
+                    ];
+
+                    $is_approval = Approval::where('menu', 'Detail Penagihan')
+                                           ->where('ref', $this->kode)
+                                           ->where('status', '0')
+                                           ->get()
+                                           ->first();
+
+                    if ($is_approval) {
+                        $this->dispatch('error', 'Data Detail Penagihan Sedang Menunggu Approval');
+                    } else {
+                        Approval::create($approval);
+                        $this->dispatch('success', 'Data Detail Penagihan Berhasil Di Update, Menunggu Approval');
+                    }
                 } else {
                     // Emit a success event with a message
-                    DetailPenagihan::create($data);
-                    $this->dispatch('success', __('Data Detail Penagihan berhasil ditambahkan'));
+                    $data['created_by'] = auth()->user()->id;
+                    $data['created_at'] = now();
+
+                    $approval = [
+                        'method'      => 'create',
+                        'menu'        => 'Detail Penagihan',
+                        'new_request' => json_encode($data),
+                        'description' => 'Create Detail Penagihan',
+                        'status'      => '0',
+                        'ref'         => $this->kode
+                    ];
+
+                    $is_approval = Approval::where('menu', 'Detail Penagihan')
+                                           ->where('ref', $this->kode)
+                                           ->where('status', '0')
+                                           ->get()
+                                           ->first();
+
+                    if ($is_approval) {
+                        $this->dispatch('error', 'Data Detail Penagihan Sedang Menunggu Approval');
+                        $this->reset();
+                    } else {
+                        Approval::create($approval);
+                        $this->dispatch('success', 'Data Detail Penagihan Berhasil Di Input, Menunggu Approval');
+                    }
                 }
             });