fix report penagihan
This commit is contained in:
parent
9f3b4f634c
commit
db990b3964
@ -94,9 +94,9 @@
|
|||||||
$date = Carbon::create($row->tanggal_hapus_buku);
|
$date = Carbon::create($row->tanggal_hapus_buku);
|
||||||
return $date->locale('id')->translatedFormat('d F Y');
|
return $date->locale('id')->translatedFormat('d F Y');
|
||||||
})->editColumn('branch', function ($row) {
|
})->editColumn('branch', function ($row) {
|
||||||
if(isset($row->branch->kode) && isset($row->branch->name)){
|
if (isset($row->branch->kode) && isset($row->branch->name)) {
|
||||||
return $row->branch->kode . ' - ' . $row->branch->name;
|
return $row->branch->kode . ' - ' . $row->branch->name;
|
||||||
}else{
|
} else {
|
||||||
return '-';
|
return '-';
|
||||||
}
|
}
|
||||||
})->editColumn('debitur', function ($row) {
|
})->editColumn('debitur', function ($row) {
|
||||||
@ -118,7 +118,7 @@
|
|||||||
return '-';
|
return '-';
|
||||||
}
|
}
|
||||||
})->editColumn('loan_type', function ($row) {
|
})->editColumn('loan_type', function ($row) {
|
||||||
if (isset($row->loan_type->kode) && isset($row->loan_type->name)) {
|
if (isset($row->loan_type->kode) && isset($row->loan_type->name)) {
|
||||||
return $row->loan_type->kode . ' - ' . $row->loan_type->name;
|
return $row->loan_type->kode . ' - ' . $row->loan_type->name;
|
||||||
} else {
|
} else {
|
||||||
return '-';
|
return '-';
|
||||||
@ -149,7 +149,7 @@
|
|||||||
})->editColumn('total_all_kewajiban', function ($row) {
|
})->editColumn('total_all_kewajiban', function ($row) {
|
||||||
return Number::currency($row->total_all_kewajiban ?? 0, 'IDR', 'id_ID');
|
return Number::currency($row->total_all_kewajiban ?? 0, 'IDR', 'id_ID');
|
||||||
})->editColumn('nominal', function ($row) {
|
})->editColumn('nominal', function ($row) {
|
||||||
return Number::currency($row->nominal ?? 0, 'IDR', 'id_ID');
|
return Number::currency($row->nominal ?? 0, 'IDR', 'id_ID');
|
||||||
})->editColumn('sisa_kewajiban', function ($row) {
|
})->editColumn('sisa_kewajiban', function ($row) {
|
||||||
$sisa = $row->total_all_kewajiban - $row->nominal;
|
$sisa = $row->total_all_kewajiban - $row->nominal;
|
||||||
return Number::currency($row->sisa ?? 0, 'IDR', 'id_ID');
|
return Number::currency($row->sisa ?? 0, 'IDR', 'id_ID');
|
||||||
@ -230,6 +230,10 @@
|
|||||||
->whereMonth('tanggal_hapus_buku', '<=', request()->get('bulan'))
|
->whereMonth('tanggal_hapus_buku', '<=', request()->get('bulan'))
|
||||||
->whereYear('tanggal_hapus_buku', '<=', request()->get('tahun'))
|
->whereYear('tanggal_hapus_buku', '<=', request()->get('tahun'))
|
||||||
->whereRelation('debitur', 'name', 'like', '%' . request()->get('debitur') . '%')
|
->whereRelation('debitur', 'name', 'like', '%' . request()->get('debitur') . '%')
|
||||||
|
->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')
|
||||||
->get();
|
->get();
|
||||||
} else {
|
} else {
|
||||||
$data = HapusBuku::with([
|
$data = HapusBuku::with([
|
||||||
@ -247,6 +251,10 @@
|
|||||||
->whereYear('tanggal_hapus_buku', '<=', request()->get('tahun'))
|
->whereYear('tanggal_hapus_buku', '<=', request()->get('tahun'))
|
||||||
->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_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')
|
||||||
->get();
|
->get();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -256,9 +264,9 @@
|
|||||||
$date = Carbon::create($row->tanggal_hapus_buku);
|
$date = Carbon::create($row->tanggal_hapus_buku);
|
||||||
return $date->locale('id')->translatedFormat('d F Y');
|
return $date->locale('id')->translatedFormat('d F Y');
|
||||||
})->editColumn('branch', function ($row) {
|
})->editColumn('branch', function ($row) {
|
||||||
if(isset($row->branch->kode) && isset($row->branch->name)){
|
if (isset($row->branch->kode) && isset($row->branch->name)) {
|
||||||
return $row->branch->kode . ' - ' . $row->branch->name;
|
return $row->branch->kode . ' - ' . $row->branch->name;
|
||||||
}else{
|
} else {
|
||||||
return '-';
|
return '-';
|
||||||
}
|
}
|
||||||
})->editColumn('debitur', function ($row) {
|
})->editColumn('debitur', function ($row) {
|
||||||
@ -280,7 +288,7 @@
|
|||||||
return '-';
|
return '-';
|
||||||
}
|
}
|
||||||
})->editColumn('loan_type', function ($row) {
|
})->editColumn('loan_type', function ($row) {
|
||||||
if (isset($row->loan_type->kode) && isset($row->loan_type->name)) {
|
if (isset($row->loan_type->kode) && isset($row->loan_type->name)) {
|
||||||
return $row->loan_type->kode . ' - ' . $row->loan_type->name;
|
return $row->loan_type->kode . ' - ' . $row->loan_type->name;
|
||||||
} else {
|
} else {
|
||||||
return '-';
|
return '-';
|
||||||
|
Loading…
Reference in New Issue
Block a user