diff --git a/app/Http/Controllers/Reports/LelonganController.php b/app/Http/Controllers/Reports/LelonganController.php index 2ad4cac..2d1259d 100644 --- a/app/Http/Controllers/Reports/LelonganController.php +++ b/app/Http/Controllers/Reports/LelonganController.php @@ -126,7 +126,10 @@ public function getSummaryLaporanBakiLelongBelumTuntut(Request $request) sum(lelong.cajlelong) as sum_cajlelong, sum(lelong.hargajual) as sum_hargajual, sum(lelong.baki) as sum_baki')) - ->whereNull('lelong.trkhtuntut') + ->where(function ($query) use ($request) { + $query->whereNull('lelong.trkhtuntut') + ->orWhere('lelong.trkhtuntut', '>', $request->endDate); // or use a specific date: '2025-06-01' + }) ->where('lelong.baki', '>', 0.00); diff --git a/app/Services/Reports/LelonganService.php b/app/Services/Reports/LelonganService.php index d6f1645..c5dbabe 100644 --- a/app/Services/Reports/LelonganService.php +++ b/app/Services/Reports/LelonganService.php @@ -256,7 +256,7 @@ class LelonganService public function getCawanganReportBakiLelongBelumTuntut() { $cawangan_connection = Cawangan::where('kodcaw', $this->kod_cawangan)->first()->mysql; - + $endDate = $this->endDate; $query_total_lelongan = Lelong::on($cawangan_connection) ->join('gadai', 'gadai.norujukan', '=', 'lelong.norujukan') // Joining gadai table ->select( @@ -272,7 +272,10 @@ class LelonganService 'gadai.bakipjm', // Fetch pinjaman from gadai 'gadai.marhun' // Fetch marhun from gadai ) - ->whereNull('lelong.trkhtuntut') + ->where(function ($query) use ($endDate) { + $query->whereNull('lelong.trkhtuntut') + ->orWhere('lelong.trkhtuntut', '>', $endDate); // or use a specific date: '2025-06-01' + }) ->where('lelong.baki', '>', 0.00); $query_total_lelongan->when(!empty($this->startDate) and !empty($this->endDate), function ($q) {