diff --git a/Database/Migrations/2023_12_05_033249_create_hapus_buku_table.php b/Database/Migrations/2023_12_05_033249_create_hapus_buku_table.php index 934a2b3..568edee 100644 --- a/Database/Migrations/2023_12_05_033249_create_hapus_buku_table.php +++ b/Database/Migrations/2023_12_05_033249_create_hapus_buku_table.php @@ -31,7 +31,7 @@ $table->double('jumlah_bunga', 15, 2); $table->double('jumlah_kewajiban_lain', 15, 2)->nullable(); $table->double('total_kewajiban', 15, 2)->nullable(); - $table->double('total_bunga_extra', 15, 2); + $table->double('bunga_iintra', 15, 2); $table->double('bunga_ekstra', 15, 2)->nullable(); $table->double('bunga_non_ekstra', 15, 2); $table->double('denda', 15, 2)->nullable(); diff --git a/Entities/HapusBuku.php b/Entities/HapusBuku.php index 95fbc8f..ce63230 100644 --- a/Entities/HapusBuku.php +++ b/Entities/HapusBuku.php @@ -24,7 +24,7 @@ 'jumlah_bunga', 'jumlah_kewajiban_lain', 'total_kewajiban', - 'total_bunga_extra', + 'bunga_intra', 'bunga_ekstra', 'bunga_non_ekstra', 'denda', diff --git a/Http/Requests/HapusBuku/StoreHapusBukuRequest.php b/Http/Requests/HapusBuku/StoreHapusBukuRequest.php index 4b542b9..2d53c8f 100644 --- a/Http/Requests/HapusBuku/StoreHapusBukuRequest.php +++ b/Http/Requests/HapusBuku/StoreHapusBukuRequest.php @@ -45,7 +45,7 @@ 'jumlah_bunga' => 'required|numeric', 'jumlah_kewajiban_lain' => 'nullable|numeric', 'total_kewajiban' => 'nullable|numeric', - 'total_bunga_extra' => 'required|numeric', + 'bunga_intra' => 'required|numeric', 'bunga_ekstra' => 'nullable|numeric', 'bunga_non_ekstra' => 'nullable|numeric', 'denda' => 'nullable|numeric', diff --git a/Http/Requests/HapusBuku/UpdateHapusBukuRequest.php b/Http/Requests/HapusBuku/UpdateHapusBukuRequest.php index a7792a5..adab6b8 100644 --- a/Http/Requests/HapusBuku/UpdateHapusBukuRequest.php +++ b/Http/Requests/HapusBuku/UpdateHapusBukuRequest.php @@ -45,7 +45,7 @@ 'jumlah_bunga' => 'required|numeric', 'jumlah_kewajiban_lain' => 'nullable|numeric', 'total_kewajiban' => 'nullable|numeric', - 'total_bunga_extra' => 'required|numeric', + 'bunga_intra' => 'required|numeric', 'bunga_ekstra' => 'nullable|numeric', 'bunga_non_ekstra' => 'nullable|numeric', 'denda' => 'nullable|numeric', diff --git a/Livewire/DetailPenagihan/DetailPenagihanModal.php b/Livewire/DetailPenagihan/DetailPenagihanModal.php index 7ee1e65..03890a0 100644 --- a/Livewire/DetailPenagihan/DetailPenagihanModal.php +++ b/Livewire/DetailPenagihan/DetailPenagihanModal.php @@ -46,12 +46,12 @@ // 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_penagihan' => $this->tanggal_penagihan, 'tindakan' => $this->tindakan, 'informasi_lku' => $this->informasi_lku, 'pic_penagihan' => $this->pic_penagihan, - 'proses_hukum' => $this->proses_hukum, + 'proses_hukum' => $this->proses_hukum, 'komitmen_debitur' => $this->komitmen_debitur, 'status' => $this->status, ]; @@ -126,23 +126,23 @@ $detail_penagihan = DetailPenagihan::find($id); - $this->id = $id; - $this->nomor_pinjaman = $detail_penagihan->nomor_pinjaman; - $this->tanggal_penagihan = $detail_penagihan->tanggal_penagihan; - $this->tindakan = $detail_penagihan->tindakan; - $this->informasi_lku = $detail_penagihan->informasi_lku; - $this->pic_penagihan = $detail_penagihan->pic_penagihan; - $this->proses_hukum = $detail_penagihan->proses_hukum; - $this->komitmen_debitur = $detail_penagihan->komitmen_debitur; - $this->status = $detail_penagihan->status; + $this->id = $id; + $this->nomor_pinjaman = $detail_penagihan->nomor_pinjaman; + $this->tanggal_penagihan = $detail_penagihan->tanggal_penagihan; + $this->tindakan = $detail_penagihan->tindakan; + $this->informasi_lku = $detail_penagihan->informasi_lku; + $this->pic_penagihan = $detail_penagihan->pic_penagihan; + $this->proses_hukum = $detail_penagihan->proses_hukum; + $this->komitmen_debitur = $detail_penagihan->komitmen_debitur; + $this->status = $detail_penagihan->status; } public function delete($id) { // Emit a success event with a message - $detailpenagihan = DetailPenagihan::find($id); - $detailpenagihan->delete_by = auth()->user()->id; + $detailpenagihan = DetailPenagihan::find($id); + $detailpenagihan->delete_by = auth()->user()->id; $detailpenagihan->deleted_at = now(); $approval = [ diff --git a/Resources/views/pencatatan/hapus_buku/add.blade.php b/Resources/views/pencatatan/hapus_buku/add.blade.php index 95c9959..51e8228 100644 --- a/Resources/views/pencatatan/hapus_buku/add.blade.php +++ b/Resources/views/pencatatan/hapus_buku/add.blade.php @@ -295,9 +295,9 @@ - + - @error('total_bunga_extra') + @error('bunga_intra') {{ $message }} @enderror
@@ -315,10 +315,10 @@
- + - + @error('bunga_non_ekstra') {{ $message }} @enderror @@ -477,7 +477,7 @@ calcTotKewajiban(); }) - $('#total_kewajiban,#total_bunga_extra,#bunga_ekstra,#denda,#biaya_lain').on('change', function () { + $('#total_kewajiban,#bunga_intra,#bunga_ekstra,#denda,#biaya_lain').on('change', function () { calcTotAllKewajiban(); }) @@ -526,7 +526,7 @@ all = parseFloat(total) + parseFloat(intraFixed) + parseFloat(ekstraFixed); $('#total_kewajiban').val(parseFloat(total)); - $('#total_bunga_extra').val(intraFixed); + $('#bunga_intra').val(intraFixed); $('#bunga_ekstra').val(ekstraFixed); $('#total_all_kewajiban').val(parseFloat(all)); } @@ -538,7 +538,7 @@ var denda = $('#denda').val() === '' ? 0 : $('#denda').val(); total = parseFloat($('#total_kewajiban').val()) + - parseFloat($('#total_bunga_extra').val()) + parseFloat($('#bunga_ekstra').val()) + parseFloat(denda) + parseFloat(biaya_lain); + parseFloat($('#bunga_intra').val()) + parseFloat($('#bunga_ekstra').val()) + parseFloat(denda) + parseFloat(biaya_lain); $('#total_all_kewajiban').val(total); }