From 31129602b1732a84fa3ff52963055002fdbbde9e Mon Sep 17 00:00:00 2001 From: daengdeni Date: Tue, 4 Jun 2024 15:36:58 +0700 Subject: [PATCH] add history bunga pada detail hapus buku --- Http/Controllers/HapusBukuController.php | 9 +++++---- .../views/pencatatan/hapus_buku/add.blade.php | 18 ++++++++++++++++-- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/Http/Controllers/HapusBukuController.php b/Http/Controllers/HapusBukuController.php index 2f11c69..bb225d7 100644 --- a/Http/Controllers/HapusBukuController.php +++ b/Http/Controllers/HapusBukuController.php @@ -64,7 +64,6 @@ $hari_denda = 0; - foreach ($hapusbuku as $key => $value) { $nomor_pinjaman = $value->nomor_pinjaman; $tgl_wo = Carbon::parse($value->tanggal_hapus_buku); @@ -335,9 +334,10 @@ ->sum('nominal'); $rekening = Rekening::with('loan_type', 'debitur', 'branch', 'currency') - ->where('nomor_rekening', $hapusbuku->nomor_pinjaman)/*->whereHas('loan_type', function ($query) { + ->where('nomor_rekening', $hapusbuku->nomor_pinjaman) + ->whereHas('loan_type', function ($query) { $query->whereBetween('kode', [3000, 3999]); - })*/ + }) ->get() ->first(); @@ -346,8 +346,9 @@ ->get(); $bayar = DetailPembayaran::where('nomor_pinjaman', $hapusbuku->nomor_pinjaman)->get(); $penagihan = DetailPenagihan::where('nomor_pinjaman', $hapusbuku->nomor_pinjaman)->get(); + $history = InterestHistory::where('nomor_pinjaman', $hapusbuku->nomor_pinjaman)->get(); - return view('writeoff::pencatatan.hapus_buku.add', compact('branch', 'loan_type', 'facility_type', 'currency', 'rekening', 'totalbayar', 'hapusbuku', 'jaminan', 'bayar', 'penagihan')); + return view('writeoff::pencatatan.hapus_buku.add', compact('branch', 'loan_type', 'facility_type', 'currency', 'rekening', 'totalbayar', 'hapusbuku', 'jaminan', 'bayar', 'penagihan', 'history')); } else { $rekening = Rekening::with('loan_type', 'debitur', 'branch', 'currency') ->where('nomor_rekening', $request->rekening) diff --git a/Resources/views/pencatatan/hapus_buku/add.blade.php b/Resources/views/pencatatan/hapus_buku/add.blade.php index 686575d..a4bbb17 100644 --- a/Resources/views/pencatatan/hapus_buku/add.blade.php +++ b/Resources/views/pencatatan/hapus_buku/add.blade.php @@ -317,7 +317,7 @@ - + @error('bunga_non_ekstra') {{ $message }} @enderror @@ -340,7 +340,7 @@ - + @error('tagihan_lain') {{ $message }} @enderror @@ -571,6 +571,20 @@ + @foreach($history as $row) + + {{ $loop->iteration }} + {{ $row->tanggal_awal }} + {{ $row->tanggal_akhir }} + {{ $row->total_kewajiban }} + {{ $row->suku_bunga }} + {{ $row->nilai_bunga }} + {{ $row->hari_bunga }} + {{ $row->suku_bunga_denda }} + {{ $row->nilai_denda }} + {{ $row->hari_denda }} + + @endforeach