sort by norujukan
This commit is contained in:
@@ -130,7 +130,8 @@ public function getSummaryLaporanBakiLelongBelumTuntut(Request $request)
|
|||||||
$query->whereNull('lelong.trkhtuntut')
|
$query->whereNull('lelong.trkhtuntut')
|
||||||
->orWhere('lelong.trkhtuntut', '>', $request->endDate); // or use a specific date: '2025-06-01'
|
->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')) {
|
if ($request->filled('startDate') && $request->filled('endDate')) {
|
||||||
|
|||||||
@@ -276,7 +276,9 @@ class LelonganService
|
|||||||
$query->whereNull('lelong.trkhtuntut')
|
$query->whereNull('lelong.trkhtuntut')
|
||||||
->orWhere('lelong.trkhtuntut', '>', $endDate); // or use a specific date: '2025-06-01'
|
->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) {
|
$query_total_lelongan->when(!empty($this->startDate) and !empty($this->endDate), function ($q) {
|
||||||
return $q->where('lelong.t_lelong', '>=', $this->startDate)
|
return $q->where('lelong.t_lelong', '>=', $this->startDate)
|
||||||
|
|||||||
Reference in New Issue
Block a user