From e48c8346bd793dbeafb46f3e78aac83e711f5a81 Mon Sep 17 00:00:00 2001 From: daengdeni Date: Thu, 4 Apr 2024 16:07:02 +0700 Subject: [PATCH] fix laporan penagihan --- Http/Controllers/ReportController.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Http/Controllers/ReportController.php b/Http/Controllers/ReportController.php index ed50a66..67e4d89 100644 --- a/Http/Controllers/ReportController.php +++ b/Http/Controllers/ReportController.php @@ -73,7 +73,7 @@ ->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') + ->groupBy('hapus_buku.nomor_pinjaman', 'detail_pembayaran.tanggal_pembayaran') ->get(); } else { $data = HapusBuku::with([ @@ -89,7 +89,7 @@ ->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') + ->groupBy('hapus_buku.nomor_pinjaman', 'detail_pembayaran.tanggal_pembayaran') ->get(); } @@ -237,7 +237,7 @@ ->where('detail_penagihan.deleted_at', null) ->where('detail_pembayaran.deleted_at', null) ->where('detail_jaminan.deleted_at', null) - ->groupBy('detail_penagihan.pic_penagihan', 'detail_penagihan.tanggal_penagihan') + ->groupBy('hapus_buku.nomor_pinjaman', 'detail_penagihan.pic_penagihan', 'detail_penagihan.tanggal_penagihan') ->get(); } else { $data = HapusBuku::with([ @@ -258,7 +258,7 @@ ->where('detail_penagihan.deleted_at', null) ->where('detail_pembayaran.deleted_at', null) ->where('detail_jaminan.deleted_at', null) - ->groupBy('detail_penagihan.pic_penagihan', 'detail_penagihan.tanggal_penagihan') + ->groupBy('hapus_buku.nomor_pinjaman', 'detail_penagihan.pic_penagihan', 'detail_penagihan.tanggal_penagihan') ->get(); }