From 309e523a7d812c3ba76c43ca3ca0885b1294ecfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= <fromme@dreipunktnull.com>
Date: Tue, 23 Jun 2020 18:27:50 +0200
Subject: [PATCH] Fix order of services in popup for good

---
 .../Classes/Service/DateImportService.php          | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/public/typo3conf/ext/ep_products/Classes/Service/DateImportService.php b/public/typo3conf/ext/ep_products/Classes/Service/DateImportService.php
index 81fb38ae..1978cbd3 100644
--- a/public/typo3conf/ext/ep_products/Classes/Service/DateImportService.php
+++ b/public/typo3conf/ext/ep_products/Classes/Service/DateImportService.php
@@ -370,7 +370,7 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
         $skiPass = $this->parseSelectionGroup($xmlDate, 'Leistungen Skipass');
         $servicesIncluded = $this->parseSelectionGroup($xmlDate, 'Leistungen Sonstige');
 
-        $date['services_included'] = serialize($this->combineServices($servicesBoard, $skiPass, $servicesIncluded));
+        $date['services_included'] = serialize($this->combineServices($skiPass, $servicesBoard, $servicesIncluded));
 
         if ($servicesBoard) {
             $date['board'] = reset($servicesBoard);
@@ -457,13 +457,19 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
     {
         $combinedServices = [];
         if ($servicesIncluded) {
-            array_push($combinedServices, ...$servicesIncluded);
+            foreach ($servicesIncluded as $service) {
+                $combinedServices[] = $service;
+            }
         }
         if ($skiPass) {
-            array_push($combinedServices, ...$skiPass);
+            foreach ($skiPass as $service) {
+                $combinedServices[] = $service;
+            }
         }
         if ($servicesBoard) {
-            array_push($combinedServices, ...$servicesBoard);
+            foreach ($servicesBoard as $service) {
+                $combinedServices[] = $service;
+            }
         }
 
         return $combinedServices;