EP/website-typo3
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/services-order-2' into develop

Browse Source
This commit is contained in:
Björn Fromme
2020-06-23 18:27:54 +02:00
parent 45ba003b5c 309e523a7d
commit 6ace9cd121
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_products/Classes/Service/DateImportService.php
+10 -4
View File
@@ -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;