Merge remote-tracking branch 'origin/staging' into origin/production

This commit is contained in:
Linksehat Staging Server
2024-01-31 10:34:24 +07:00
20 changed files with 2379 additions and 11 deletions

View File

@@ -63,8 +63,8 @@ class RequestLogController extends Controller
});
})
->when($request->orderBy, function ($q, $orderBy) use ($request) {
if (in_array($orderBy, ['submission_date', 'code'])) {
$q->orderBy($orderBy, $request->orderBy);
if (in_array($orderBy, ['submission_date', 'code', 'service_code', 'status'])) {
$q->orderBy($orderBy, $request->order);
}
})
->when(empty($request->orderBy), function ($q) {