From 133d508625ef05a94ab7445a3f8b6ae6fd458716 Mon Sep 17 00:00:00 2001 From: Nur Izzati Date: Wed, 14 Jan 2026 15:35:29 +0800 Subject: [PATCH] update code status aktif pelanggan --- .../Controllers/Reports/AnalisaController.php | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Reports/AnalisaController.php b/app/Http/Controllers/Reports/AnalisaController.php index c538f83..9ab1afc 100644 --- a/app/Http/Controllers/Reports/AnalisaController.php +++ b/app/Http/Controllers/Reports/AnalisaController.php @@ -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