From 1e2a92e5cfb6eba38618196b5ffacd7f1a240c3d Mon Sep 17 00:00:00 2001 From: daengdeni Date: Wed, 21 Feb 2024 12:01:30 +0700 Subject: [PATCH] fix klaim jamkrindo --- Entities/KlaimJamkrindo.php | 1 + .../KlaimJamkrindo/StoreKlaimJamkrindoRequest.php | 5 ++++- .../KlaimJamkrindo/UpdateKlaimJamkrindoRequest.php | 10 ++++++++++ Livewire/KlaimJamkrindo/KlaimJamkrindoModal.php | 4 ++++ .../klaim-jamkrindo/klaim-jamkrindo-modal.blade.php | 1 + 5 files changed, 20 insertions(+), 1 deletion(-) diff --git a/Entities/KlaimJamkrindo.php b/Entities/KlaimJamkrindo.php index 4ffabcc..d9cde81 100644 --- a/Entities/KlaimJamkrindo.php +++ b/Entities/KlaimJamkrindo.php @@ -7,6 +7,7 @@ protected $table = 'klaim_jamkrindo'; protected $fillable = [ + 'kode', 'tanggal_rtgs_masuk', 'jumlah_debitur_surat', 'jumlah_debitur_excel', diff --git a/Http/Requests/KlaimJamkrindo/StoreKlaimJamkrindoRequest.php b/Http/Requests/KlaimJamkrindo/StoreKlaimJamkrindoRequest.php index f0061d4..161b21c 100644 --- a/Http/Requests/KlaimJamkrindo/StoreKlaimJamkrindoRequest.php +++ b/Http/Requests/KlaimJamkrindo/StoreKlaimJamkrindoRequest.php @@ -28,6 +28,7 @@ : array { return [ + 'kode' => 'required|string', 'tanggal_rtgs_masuk' => 'required|date', 'jumlah_debitur_surat' => 'required|integer', 'jumlah_debitur_excel' => 'required|integer', @@ -82,10 +83,12 @@ ], JsonResponse::HTTP_UNPROCESSABLE_ENTITY)); } - protected function prepareForValidation():void + protected function prepareForValidation() + : void { $this->merge([ + 'kode' => $this->kode ?? 'KJ-' . date('YmdHis'), 'dana_hasil_klaim' => str_replace('', '', $this->dana_hasil_klaim), 'nilai_penyelesaian' => str_replace(',', '', $this->nilai_penyelesaian), 'sisa_dana_ksl' => $this->dana_hasil_klaim - $this->nilai_penyelesaian, diff --git a/Http/Requests/KlaimJamkrindo/UpdateKlaimJamkrindoRequest.php b/Http/Requests/KlaimJamkrindo/UpdateKlaimJamkrindoRequest.php index 947480a..441dd20 100644 --- a/Http/Requests/KlaimJamkrindo/UpdateKlaimJamkrindoRequest.php +++ b/Http/Requests/KlaimJamkrindo/UpdateKlaimJamkrindoRequest.php @@ -28,6 +28,7 @@ : array { return [ + 'kode' => 'required|string', 'tanggal_rtgs_masuk' => 'required|date', 'jumlah_debitur_surat' => 'required|integer', 'jumlah_debitur_excel' => 'required|integer', @@ -71,4 +72,13 @@ 'messages' => 'Klaim Jamkrindo updated failed.' ], JsonResponse::HTTP_UNPROCESSABLE_ENTITY)); } + + protected function prepareForValidation() + : void + { + + $this->merge([ + 'kode' => $this->kode ?? 'KJ-' . date('YmdHis'), + ]); + } } diff --git a/Livewire/KlaimJamkrindo/KlaimJamkrindoModal.php b/Livewire/KlaimJamkrindo/KlaimJamkrindoModal.php index 49a93ac..99707d3 100644 --- a/Livewire/KlaimJamkrindo/KlaimJamkrindoModal.php +++ b/Livewire/KlaimJamkrindo/KlaimJamkrindoModal.php @@ -12,6 +12,7 @@ class KlaimJamkrindoModal extends Component { public $id; + public $kode; public $tanggal_rtgs_masuk; public $jumlah_debitur_surat; public $jumlah_debitur_excel; @@ -33,6 +34,9 @@ public function render() { + if(!$this->edit_mode) { + $this->kode = 'KJ-' . date('YmdHis'); + } return view('writeoff::livewire.klaim-jamkrindo.klaim-jamkrindo-modal'); } diff --git a/Resources/views/livewire/klaim-jamkrindo/klaim-jamkrindo-modal.blade.php b/Resources/views/livewire/klaim-jamkrindo/klaim-jamkrindo-modal.blade.php index a71d1c6..ac3639b 100644 --- a/Resources/views/livewire/klaim-jamkrindo/klaim-jamkrindo-modal.blade.php +++ b/Resources/views/livewire/klaim-jamkrindo/klaim-jamkrindo-modal.blade.php @@ -28,6 +28,7 @@ + @error('tanggal_rtgs_masuk')