add history bunga pada detail hapus buku

This commit is contained in:
daengdeni 2024-06-04 15:36:58 +07:00
parent a88f23de68
commit 31129602b1
2 changed files with 21 additions and 6 deletions

View File

@ -64,7 +64,6 @@
$hari_denda = 0; $hari_denda = 0;
foreach ($hapusbuku as $key => $value) { foreach ($hapusbuku as $key => $value) {
$nomor_pinjaman = $value->nomor_pinjaman; $nomor_pinjaman = $value->nomor_pinjaman;
$tgl_wo = Carbon::parse($value->tanggal_hapus_buku); $tgl_wo = Carbon::parse($value->tanggal_hapus_buku);
@ -335,9 +334,10 @@
->sum('nominal'); ->sum('nominal');
$rekening = Rekening::with('loan_type', 'debitur', 'branch', 'currency') $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]); $query->whereBetween('kode', [3000, 3999]);
})*/ })
->get() ->get()
->first(); ->first();
@ -346,8 +346,9 @@
->get(); ->get();
$bayar = DetailPembayaran::where('nomor_pinjaman', $hapusbuku->nomor_pinjaman)->get(); $bayar = DetailPembayaran::where('nomor_pinjaman', $hapusbuku->nomor_pinjaman)->get();
$penagihan = DetailPenagihan::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 { } else {
$rekening = Rekening::with('loan_type', 'debitur', 'branch', 'currency') $rekening = Rekening::with('loan_type', 'debitur', 'branch', 'currency')
->where('nomor_rekening', $request->rekening) ->where('nomor_rekening', $request->rekening)

View File

@ -317,7 +317,7 @@
<label class="fw-semibold fs-6 mb-2">Amount Due</label> <label class="fw-semibold fs-6 mb-2">Amount Due</label>
<!--end::Label--> <!--end::Label-->
<!--begin::Input--> <!--begin::Input-->
<input type="text" data-inputmask="'alias': 'currency'" id="bunga_non_ekstra" name="bunga_non_ekstra" class="form-control form-control-solid mb-3 mb-lg-0" placeholder="Bunga Non Extra" value="{{ $hapusbuku->bunga_non_ekstra ?? "" }}"/> <input style="color:red" type="text" data-inputmask="'alias': 'currency'" id="bunga_non_ekstra" name="bunga_non_ekstra" class="form-control form-control-solid mb-3 mb-lg-0" placeholder="Bunga Non Extra" value="{{ $hapusbuku->bunga_non_ekstra ?? "" }}"/>
<!--end::Input--> <!--end::Input-->
@error('bunga_non_ekstra') @error('bunga_non_ekstra')
<span class="text-danger">{{ $message }}</span> @enderror <span class="text-danger">{{ $message }}</span> @enderror
@ -340,7 +340,7 @@
<label class="fw-semibold fs-6 mb-2">Bunga Berjalan</label> <label class="fw-semibold fs-6 mb-2">Bunga Berjalan</label>
<!--end::Label--> <!--end::Label-->
<!--begin::Input--> <!--begin::Input-->
<input type="text" data-inputmask="'alias': 'currency'" id="tagihan_lain" name="tagihan_lain" class="form-control form-control-solid mb-3 mb-lg-0" placeholder="Tagihan Lain" value="{{ $hapusbuku->tagihan_lain ?? "" }}"/> <input style="color:red" type="text" data-inputmask="'alias': 'currency'" id="tagihan_lain" name="tagihan_lain" class="form-control form-control-solid mb-3 mb-lg-0" placeholder="Tagihan Lain" value="{{ $hapusbuku->tagihan_lain ?? "" }}"/>
<!--end::Input--> <!--end::Input-->
@error('tagihan_lain') @error('tagihan_lain')
<span class="text-danger">{{ $message }}</span> @enderror <span class="text-danger">{{ $message }}</span> @enderror
@ -571,6 +571,20 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach($history as $row)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $row->tanggal_awal }}</td>
<td>{{ $row->tanggal_akhir }}</td>
<td>{{ $row->total_kewajiban }}</td>
<td>{{ $row->suku_bunga }}</td>
<td>{{ $row->nilai_bunga }}</td>
<td>{{ $row->hari_bunga }}</td>
<td>{{ $row->suku_bunga_denda }}</td>
<td>{{ $row->nilai_denda }}</td>
<td>{{ $row->hari_denda }}</td>
</tr>
@endforeach
</tbody> </tbody>
</table> </table>
</div> </div>