Merge remote-tracking branch 'origin/staging' into origin/production
This commit is contained in:
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user