Merge branch 'main' into #90-user-profile
# Conflicts: # app/Infrastructure/Http/Controllers/VacationRequestController.php
This commit is contained in:
commit
8840c61289
@ -107,7 +107,6 @@ class VacationRequestController extends Controller
|
|||||||
->paginate();
|
->paginate();
|
||||||
|
|
||||||
$users = User::query()
|
$users = User::query()
|
||||||
->withVacationLimitIn($yearPeriod)
|
|
||||||
->orderByProfileField("last_name")
|
->orderByProfileField("last_name")
|
||||||
->orderByProfileField("first_name")
|
->orderByProfileField("first_name")
|
||||||
->get();
|
->get();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user