diff --git a/Http/Requests/HapusBuku/StoreHapusBukuRequest.php b/Http/Requests/HapusBuku/StoreHapusBukuRequest.php index 2d53c8f..82e7153 100644 --- a/Http/Requests/HapusBuku/StoreHapusBukuRequest.php +++ b/Http/Requests/HapusBuku/StoreHapusBukuRequest.php @@ -50,7 +50,7 @@ 'bunga_non_ekstra' => 'nullable|numeric', 'denda' => 'nullable|numeric', 'tagihan_lain' => 'nullable|numeric', - 'biaya_lain' => 'required|numeric', + 'biaya_lain' => 'nullable|numeric', 'total_all_kewajiban' => 'nullable|numeric', 'memo_persetujuan' => 'nullable|string', 'lama_hari' => 'nullable|numeric', diff --git a/Http/Requests/HapusBuku/UpdateHapusBukuRequest.php b/Http/Requests/HapusBuku/UpdateHapusBukuRequest.php index adab6b8..813291c 100644 --- a/Http/Requests/HapusBuku/UpdateHapusBukuRequest.php +++ b/Http/Requests/HapusBuku/UpdateHapusBukuRequest.php @@ -50,7 +50,7 @@ 'bunga_non_ekstra' => 'nullable|numeric', 'denda' => 'nullable|numeric', 'tagihan_lain' => 'required|numeric', - 'biaya_lain' => 'required|numeric', + 'biaya_lain' => 'nullable|numeric', 'total_all_kewajiban' => 'nullable|numeric', 'memo_persetujuan' => 'nullable|string', 'lama_hari' => 'nullable|numeric', diff --git a/Resources/views/pencatatan/hapus_buku/add.blade.php b/Resources/views/pencatatan/hapus_buku/add.blade.php index da706d0..fe5f4dc 100644 --- a/Resources/views/pencatatan/hapus_buku/add.blade.php +++ b/Resources/views/pencatatan/hapus_buku/add.blade.php @@ -660,7 +660,8 @@ ekstra = 0; if (lama > 0) { - intra = (total * (parseFloat($('#suku_bunga').val()) / 100) * lama) / 360; + //intra = (total * (parseFloat($('#suku_bunga').val()) / 100) * lama) / 360; + intra = (baki * (parseFloat($('#suku_bunga').val()) / 100) * lama) / 360; } extra = (total * (60 / 100) * lama) / 360;