From 64de8d935cbef61bf1c16ea5797776010273a6b4 Mon Sep 17 00:00:00 2001 From: daengdeni Date: Thu, 4 Apr 2024 16:04:40 +0700 Subject: [PATCH] fix laporan debitur --- Http/Controllers/ReportController.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Http/Controllers/ReportController.php b/Http/Controllers/ReportController.php index bdd7af0..ed50a66 100644 --- a/Http/Controllers/ReportController.php +++ b/Http/Controllers/ReportController.php @@ -72,6 +72,8 @@ ->leftJoin('detail_pembayaran', 'hapus_buku.nomor_pinjaman', '=', 'detail_pembayaran.nomor_pinjaman') ->where('tanggal_hapus_buku', '<=', request()->get('start_date')) ->whereRelation('debitur', 'name', 'like', '%' . request()->get('debitur') . '%') + ->where('detail_pembayaran.deleted_at', null) + ->groupBy('detail_pembayaran.tanggal_pembayaran') ->get(); } else { $data = HapusBuku::with([ @@ -86,6 +88,8 @@ ->where('tanggal_hapus_buku', '<=', request()->get('start_date')) ->where('kode_cabang', request()->get('kode_cabang')) ->whereRelation('debitur', 'name', 'like', '%' . request()->get('debitur') . '%') + ->where('detail_pembayaran.deleted_at', null) + ->groupBy('detail_pembayaran.tanggal_pembayaran') ->get(); }