From 3c4d788ea6c9e3f6686e061d92f172571ce176a2 Mon Sep 17 00:00:00 2001
From: daengdeni <ddeni05@gmail.com>
Date: Mon, 25 Mar 2024 14:49:47 +0700
Subject: [PATCH] update detail subrogasi jamkrindo

---
 .../StoreDetailSubrogasiJamkrindoRequest.php           |  4 +---
 .../DetailSubrogasiJamkrindoModal.php                  | 10 +++++-----
 .../detail-subrogasi-jamkrindo-modal.blade.php         |  2 +-
 .../detail_subrogasi_jamkrindo/show.blade.php          |  4 ++--
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/Http/Requests/DetailSubrogasiJamkrindo/StoreDetailSubrogasiJamkrindoRequest.php b/Http/Requests/DetailSubrogasiJamkrindo/StoreDetailSubrogasiJamkrindoRequest.php
index e616732..e40ae31 100644
--- a/Http/Requests/DetailSubrogasiJamkrindo/StoreDetailSubrogasiJamkrindoRequest.php
+++ b/Http/Requests/DetailSubrogasiJamkrindo/StoreDetailSubrogasiJamkrindoRequest.php
@@ -24,8 +24,6 @@
         : array
         {
             return [
-                'kode'                => 'required|numeric',
-                'nomor_pinjaman'      => 'required',
                 'tanggal_pembayaran'  => 'required|date',
                 'pembayaran_debitur'  => 'required|numeric',
                 'subrogasi_jamkrindo' => 'required|numeric',
@@ -43,7 +41,7 @@
         protected function prepareForValidation()
         {
             $this->merge([
-                'nomor_pinjaman' => $_SESSION['nomor_pinjaman'],
+                'nomor_pinjaman' => request()->segment(3),
             ]);
         }
     }
diff --git a/Livewire/DetailSubrogasiJamkrindo/DetailSubrogasiJamkrindoModal.php b/Livewire/DetailSubrogasiJamkrindo/DetailSubrogasiJamkrindoModal.php
index 159d86b..850fb8b 100644
--- a/Livewire/DetailSubrogasiJamkrindo/DetailSubrogasiJamkrindoModal.php
+++ b/Livewire/DetailSubrogasiJamkrindo/DetailSubrogasiJamkrindoModal.php
@@ -41,9 +41,10 @@
             // Validate the form input data
             DB::transaction(function () {
                 // Prepare the data for creating a new user
+                $kode = round(microtime(true) * 100);
                 $data = [
-                    'nomor_pinjaman'      => $_SESSION['nomor_pinjaman'],
-                    'kode'                => round(microtime(true) * 100),
+                    'nomor_pinjaman'      => $this->nomor_pinjaman ?? $_SESSION['nomor_pinjaman'],
+                    'kode'                => $this->kode ?? $kode,
                     'tanggal_pembayaran'  => $this->tanggal_pembayaran,
                     'pembayaran_debitur'  => $this->pembayaran_debitur,
                     'subrogasi_jamkrindo' => $this->subrogasi_jamkrindo,
@@ -92,11 +93,11 @@
                         'new_request' => json_encode($data),
                         'description' => 'Create Detail Subrogasi Jamkrindo',
                         'status'      => '0',
-                        'ref'         => $this->kode
+                        'ref'         => $kode
                     ];
 
                     $is_approval = Approval::where('menu', 'Detail Subrogasi Jamkrindo')
-                                           ->where('ref', $this->kode)
+                                           ->where('ref', $kode)
                                            ->where('status', '0')
                                            ->get()
                                            ->first();
@@ -113,7 +114,6 @@
 
             // Reset the form fields after successful submission
             $this->reset();
-            $this->nomor_pinjaman = request()->segment(3);
         }
 
         public function update($id)
diff --git a/Resources/views/livewire/detail-subrogasi-jamkrindo/detail-subrogasi-jamkrindo-modal.blade.php b/Resources/views/livewire/detail-subrogasi-jamkrindo/detail-subrogasi-jamkrindo-modal.blade.php
index 0988e22..aac3f6f 100644
--- a/Resources/views/livewire/detail-subrogasi-jamkrindo/detail-subrogasi-jamkrindo-modal.blade.php
+++ b/Resources/views/livewire/detail-subrogasi-jamkrindo/detail-subrogasi-jamkrindo-modal.blade.php
@@ -22,7 +22,7 @@
                     <!--begin::Scroll-->
                     <div class="d-flex flex-column scroll-y px-5 px-lg-10" id="kt_modal_add_detail_subrogasi_jamkrindo_scroll" data-kt-scroll="true" data-kt-scroll-activate="true" data-kt-scroll-max-height="auto" data-kt-scroll-dependencies="#kt_modal_add_detail_subrogasi_jamkrindo_header" data-kt-scroll-wrappers="#kt_modal_add_detail_subrogasi_jamkrindo_scroll" data-kt-scroll-offset="300px">
                         <!--begin::Input group-->
-                        <input type="hidden" wire:model.defer="nomor_pinjaman" name="nomor_pinjaman" id="nomor_pinjaman" value="{{ request()->segment(3) }}">
+                        <input type="hidden" wire:model.defer="nomor_pinjaman" name="nomor_pinjaman" id="nomor_pinjaman">
 
                         <!--begin::Input group-->
                         <div class="fv-row mb-7">
diff --git a/Resources/views/pencatatan/detail_subrogasi_jamkrindo/show.blade.php b/Resources/views/pencatatan/detail_subrogasi_jamkrindo/show.blade.php
index 9c8d82b..95931fd 100644
--- a/Resources/views/pencatatan/detail_subrogasi_jamkrindo/show.blade.php
+++ b/Resources/views/pencatatan/detail_subrogasi_jamkrindo/show.blade.php
@@ -141,8 +141,8 @@
                             confirmButton: 'btn btn-primary',
                         }
                     })
-                    $('#kt_modal_add_detail_subrogasi_jamkrindo').modal('hide');
                     LaravelDataTables['detail-pembayaran-table'].ajax.reload();
+                    $('#kt_modal_add_detail_subrogasi_jamkrindo').modal('hide');
                 });
 
                 Livewire.on('error', (message) => {
@@ -171,7 +171,7 @@
 
             $(function () {
                 $('#kt_modal_add_detail_subrogasi_jamkrindo').on('hidden.bs.modal', function () {
-                    $(this).find('form').trigger('reset');
+                    //$(this).find('form').trigger('reset');
                     $("#nomor_pinjaman").val("{{ request()->segment(3) }}");
                 });