putrakuningan/Writeoff
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix laporan penagihan

Browse Source
This commit is contained in:
daengdeni 2024-04-04 16:07:02 +07:00
parent 64de8d935c
commit e48c8346bd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Http/Controllers/ReportController.php
View File

@ -73,7 +73,7 @@
->where('tanggal_hapus_buku', '<=', request()->get('start_date')) ->where('tanggal_hapus_buku', '<=', request()->get('start_date'))
->whereRelation('debitur', 'name', 'like', '%' . request()->get('debitur') . '%') ->whereRelation('debitur', 'name', 'like', '%' . request()->get('debitur') . '%')
->where('detail_pembayaran.deleted_at', null) ->where('detail_pembayaran.deleted_at', null)
->groupBy('detail_pembayaran.tanggal_pembayaran') ->groupBy('hapus_buku.nomor_pinjaman', 'detail_pembayaran.tanggal_pembayaran')
->get(); ->get();
} else { } else {
$data = HapusBuku::with([ $data = HapusBuku::with([
@ -89,7 +89,7 @@
->where('kode_cabang', request()->get('kode_cabang')) ->where('kode_cabang', request()->get('kode_cabang'))
->whereRelation('debitur', 'name', 'like', '%' . request()->get('debitur') . '%') ->whereRelation('debitur', 'name', 'like', '%' . request()->get('debitur') . '%')
->where('detail_pembayaran.deleted_at', null) ->where('detail_pembayaran.deleted_at', null)
->groupBy('detail_pembayaran.tanggal_pembayaran') ->groupBy('hapus_buku.nomor_pinjaman', 'detail_pembayaran.tanggal_pembayaran')
->get(); ->get();
} }
@ -237,7 +237,7 @@
->where('detail_penagihan.deleted_at', null) ->where('detail_penagihan.deleted_at', null)
->where('detail_pembayaran.deleted_at', null) ->where('detail_pembayaran.deleted_at', null)
->where('detail_jaminan.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(); ->get();
} else { } else {
$data = HapusBuku::with([ $data = HapusBuku::with([
@ -258,7 +258,7 @@
->where('detail_penagihan.deleted_at', null) ->where('detail_penagihan.deleted_at', null)
->where('detail_pembayaran.deleted_at', null) ->where('detail_pembayaran.deleted_at', null)
->where('detail_jaminan.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(); ->get();
} }