|
@@ -61,7 +61,9 @@ public function cities(): JsonResponse
|
|
|
|
|
|
|
|
public function units(): JsonResponse
|
|
public function units(): JsonResponse
|
|
|
{
|
|
{
|
|
|
- return $this->items(UnitSelectResource::collection(Unit::orderBy('fantasy_name')->get()));
|
|
|
|
|
|
|
+ $items = Unit::orderByRaw("COALESCE(NULLIF(name, ''), fantasy_name)")->get();
|
|
|
|
|
+
|
|
|
|
|
+ return $this->items(UnitSelectResource::collection($items));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public function groups(): JsonResponse
|
|
public function groups(): JsonResponse
|