From e21b52c6a8bccef9d8d4bc578a5d9c0cd3f7f5d0 Mon Sep 17 00:00:00 2001 From: BTMS2 Date: Wed, 11 Jun 2025 15:34:21 +0800 Subject: [PATCH] sort by norujukan --- app/Http/Controllers/Reports/LelonganController.php | 3 ++- app/Services/Reports/LelonganService.php | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Reports/LelonganController.php b/app/Http/Controllers/Reports/LelonganController.php index 2d1259d..27a4b7f 100644 --- a/app/Http/Controllers/Reports/LelonganController.php +++ b/app/Http/Controllers/Reports/LelonganController.php @@ -130,7 +130,8 @@ public function getSummaryLaporanBakiLelongBelumTuntut(Request $request) $query->whereNull('lelong.trkhtuntut') ->orWhere('lelong.trkhtuntut', '>', $request->endDate); // or use a specific date: '2025-06-01' }) - ->where('lelong.baki', '>', 0.00); + ->where('lelong.baki', '>', 0.00) + ->orderBy('lelong.norujukan', 'asc'); if ($request->filled('startDate') && $request->filled('endDate')) { diff --git a/app/Services/Reports/LelonganService.php b/app/Services/Reports/LelonganService.php index c5dbabe..caf3f6c 100644 --- a/app/Services/Reports/LelonganService.php +++ b/app/Services/Reports/LelonganService.php @@ -276,7 +276,9 @@ class LelonganService $query->whereNull('lelong.trkhtuntut') ->orWhere('lelong.trkhtuntut', '>', $endDate); // or use a specific date: '2025-06-01' }) - ->where('lelong.baki', '>', 0.00); + ->where('lelong.baki', '>', 0.00) + ->orderBy('lelong.norujukan', 'asc'); + $query_total_lelongan->when(!empty($this->startDate) and !empty($this->endDate), function ($q) { return $q->where('lelong.t_lelong', '>=', $this->startDate)