From e4f45b646e6479b586c6d60d24123213014b03b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= <mail@bjo3rn.com>
Date: Wed, 1 Aug 2018 15:28:06 +0200
Subject: [PATCH] Fix services not being listed in full

---
 .../ep_products/Classes/Domain/Serialization/Date.php | 11 +++++++----
 .../ep_products/Classes/Domain/Serialization/Room.php | 10 +++++++---
 .../Classes/Domain/Serialization/Service.php          |  5 ++---
 .../Private/Templates/Reseller/Copypaste.html         |  4 ++--
 4 files changed, 18 insertions(+), 12 deletions(-)

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 @@
                 <f:render section="CollapsibleSimple" arguments="{id: 8, label: 'Verpflegung', description: productData.board}"/>
                 <f:render section="CollapsibleSimple" arguments="{id: 9, label: 'Programm', description: productData.programme}"/>
                 <f:for each="{productData.hotels.hotel}" as="hotel" iteration="iteration">
-                    <f:render section="CollapsibleHotel" arguments="{id: '10-{iteration.cycle}', label: 'Unterkunft{f:if(condition: \'{productData.hotels.hotel -> f:count()} > 1\', then: \' {iteration.cycle}\')} (Termine, Zimmer, Leistungen, Bilder)', hotel: hotel}"/>
+                    <f:render section="CollapsibleHotel" arguments="{id: '10-{iteration.cycle}', label: 'Unterkunft{f:if(condition: \'{productData.hotels.hotel -> f:count()} > 1\', then: \' {iteration.cycle}\')} (Termine, Zimmer, Leistungen, Anreise, Bilder)', hotel: hotel}"/>
                 </f:for>
                 <f:render section="CollapsibleImages" arguments="{id: 11, label: 'Allgemeine Bilder/Video', images: productData.images.image, video: productData.video}"/>
             </div>
@@ -161,7 +161,7 @@
                                         <th>Zusatzleistungen</th>
                                         <td>
                                             <table class="table table-condesed">
-                                                <f:for each="{date.services.service}" as="service">
+                                                <f:for each="{date.servicesoptional.service}" as="service">
                                                     <tr>
                                                         <td>{service.label}</td>
                                                         <td>{service.price} €</td>