feat: sort services

2025-01-16 14:55:07 +01:00
parent 6473ec8ec4
commit bac3f1f3d7
1 changed files with 14 additions and 2 deletions
@@ -74,18 +74,30 @@ class Travel
    {
        $group = (array) $group;

-        return array_filter($this->additionalServices, function (Service $service) use ($group, $availableOnly) {
+        $services = array_filter($this->additionalServices, function (Service $service) use ($group, $availableOnly) {
            return in_array($service->subType, $group) && (false === $availableOnly || $service->available > 0);
        });
+
+        usort($services, function (Service $a, Service $b) {
+            return $a->label <=> $b->label;
+        });
+
+        return $services;
    }

    public function getTransportationServicesByDirection(string $direction, bool $availableOnly = true): array
    {
-        return array_filter($this->transportationServices, function (Service $service) use ($direction, $availableOnly) {
+        $services = array_filter($this->transportationServices, function (Service $service) use ($direction, $availableOnly) {
            return $direction === $service->direction
                && $service->price >= 0
                && (false === $availableOnly || $service->available > 0);
        });
+
+        usort($services, function (Service $a, Service $b) {
+            return $a->subType <=> $b->subType;
+        });
+
+        return $services;
    }

    public function getIncludedServices(): array