fix laporan penagihan
This commit is contained in:
parent
64de8d935c
commit
e48c8346bd
@ -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();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user