Merge branch 'hotfix/services-order'

2020-06-23 17:43:48 +02:00
parent 1788aea3d3 62d22075c0
commit fea5ad753a
1 changed files with 3 additions and 3 deletions
@@ -456,15 +456,15 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
    protected function combineServices(array $skiPass, array $servicesBoard, array $servicesIncluded)
    {
        $combinedServices = [];
+        if ($servicesIncluded) {
+            array_push($combinedServices, ...$servicesIncluded);
+        }
        if ($skiPass) {
            array_push($combinedServices, ...$skiPass);
        }
        if ($servicesBoard) {
            array_push($combinedServices, ...$servicesBoard);
        }
-        if ($servicesIncluded) {
-            array_push($combinedServices, ...$servicesIncluded);
-        }

        return $combinedServices;
    }