diff --git a/web/typo3conf/ext/ep_products/Classes/Domain/Serialization/Date.php b/web/typo3conf/ext/ep_products/Classes/Domain/Serialization/Date.php index 3845e4d1..01cfc7dd 100644 --- a/web/typo3conf/ext/ep_products/Classes/Domain/Serialization/Date.php +++ b/web/typo3conf/ext/ep_products/Classes/Domain/Serialization/Date.php @@ -67,7 +67,7 @@ class Date /** * @var array */ - public $services = []; + public $servicesoptional = []; /** * @var array @@ -99,10 +99,13 @@ class Date $date->skipassincluded = $array['dateSkipassIncluded']; $date->busincluded = $array['dateBusIncluded']; $date->servicesincluded['service'] = unserialize($array['dateServicesIncluded']); - - foreach (unserialize($array['dateServicesGeneral']) as $row) + $servicesGeneral = unserialize($array['dateServicesGeneral']); + foreach ($servicesGeneral as $category) { - $date->services['service'][] = Service::fromArray($row); + foreach ($category as $row) + { + $date->servicesoptional['service'][] = Service::fromArray($row); + } } foreach (unserialize($array['pickups']) as $row) diff --git a/web/typo3conf/ext/ep_products/Classes/Domain/Serialization/Room.php b/web/typo3conf/ext/ep_products/Classes/Domain/Serialization/Room.php index 7bf8b669..02a9592d 100644 --- a/web/typo3conf/ext/ep_products/Classes/Domain/Serialization/Room.php +++ b/web/typo3conf/ext/ep_products/Classes/Domain/Serialization/Room.php @@ -47,7 +47,7 @@ class Room /** * @var array */ - public $services; + public $servicesoptional; /** * @var string @@ -73,9 +73,13 @@ class Room $room->nights = $array['roomNights']; $room->available = $array['roomAvailable']; - foreach (unserialize($array['roomOptionalServices']) as $row) + $servicesOptional = unserialize($array['roomOptionalServices']); + foreach ($servicesOptional as $category) { - $room->services['service'][] = Service::fromArray($row); + foreach ($category as $row) + { + $room->servicesoptional['service'][] = Service::fromArray($row); + } } return $room; diff --git a/web/typo3conf/ext/ep_products/Classes/Domain/Serialization/Service.php b/web/typo3conf/ext/ep_products/Classes/Domain/Serialization/Service.php index 41bf0ca9..3ad6077c 100644 --- a/web/typo3conf/ext/ep_products/Classes/Domain/Serialization/Service.php +++ b/web/typo3conf/ext/ep_products/Classes/Domain/Serialization/Service.php @@ -47,9 +47,8 @@ class Service { $service = new self; - $data = reset($array); - $service->label = $data['label']; - $service->price = $data['price']; + $service->label = $array['label']; + $service->price = $array['price']; return $service; } diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Reseller/Copypaste.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Reseller/Copypaste.html index db361520..f4399236 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Reseller/Copypaste.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Reseller/Copypaste.html @@ -24,7 +24,7 @@ - + @@ -161,7 +161,7 @@ Zusatzleistungen - +
{service.label} {service.price} €