KoPKB/api_arrahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in izzati-feat-uum (pull request #385)

Browse Source 
update code status aktif pelanggan
This commit is contained in:
izzati zulkifli
2026-01-14 07:36:27 +00:00
parent 5ac3484199 133d508625
commit f30cdc4d14
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Reports/AnalisaController.php
+15 -3
View File
@@ -283,13 +283,25 @@ public function getSummaryLaporanPelangganAktif(Request $request)
$tujuangadai = $row->tujuangadai ?: '-';
// Status aktif: ada transaksi dalam tahun tu
$statusAktif = $tempohData->contains(function ($trx) use ($year) {
$now = Carbon::now();
$endOfYear = Carbon::create($year, 12, 31)->endOfDay();
$startOfYear = Carbon::create($year, 1, 1)->startOfDay();
$statusAktif = $tempohData->contains(function ($trx) use ($startOfYear, $endOfYear) {
if (!$trx->t_gadai) return false;
$tGadai = Carbon::parse($trx->t_gadai);
$tTebus = $trx->t_tebus ? Carbon::parse($trx->t_tebus) : null;
return $tGadai->lte(Carbon::create($year,12,31)->endOfDay())
&& (is_null($tTebus) || $tTebus->gt(Carbon::create($year,12,31)->endOfDay()));
// SAG wujud dalam tahun laporan
return
$tGadai->lte($endOfYear) &&
(
is_null($tTebus) || // belum ditebus
$tTebus->gte($startOfYear) // ditebus dalam / selepas tahun
);
});
// Umur