From ef28d0daf275877939a8c36db8ce68916a9f1035 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= <mail@bjo3rn.com>
Date: Mon, 13 Aug 2018 13:23:19 +0200
Subject: [PATCH] Add ids to services, add pax to rooms in export

---
 .../Classes/Domain/Repository/ProductRepository.php        | 2 +-
 .../ext/ep_products/Classes/Domain/Serialization/Room.php  | 1 +
 .../ep_products/Classes/Domain/Serialization/Services.php  | 7 ++++++-
 .../ext/ep_products/Classes/Service/ImportService.php      | 1 +
 .../Resources/Private/Templates/Reseller/Copypaste.html    | 2 ++
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/web/typo3conf/ext/ep_products/Classes/Domain/Repository/ProductRepository.php b/web/typo3conf/ext/ep_products/Classes/Domain/Repository/ProductRepository.php
index 3eb5ead1..8298b885 100644
--- a/web/typo3conf/ext/ep_products/Classes/Domain/Repository/ProductRepository.php
+++ b/web/typo3conf/ext/ep_products/Classes/Domain/Repository/ProductRepository.php
@@ -259,7 +259,7 @@ class ProductRepository extends AbstractRepository
                 'date.services_general dateServicesGeneral', 'date.skipass_included dateSkipassIncluded',
                 'date.bus_pro_id dateBusProId', 'date.hotel_bus_pro_id hotelBusProId', 'date.pickups pickups',
                 'room.uid as roomUid', 'room.bus_pro_id roomBusProId', 'room.code roomCode', 'room.name roomName',
-                'room.price roomPrice', 'date.discount roomDiscount', 'date.bus_price busPrice',
+                'room.price roomPrice', 'room.pax roomPax', 'date.discount roomDiscount', 'date.bus_price busPrice',
                 'room.services roomOptionalServices', 'room.nights roomNights', 'room.available roomAvailable'
             )
             ->from('tx_epproducts_domain_model_date', 'date')
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 44627403..f9a9c90e 100644
--- a/web/typo3conf/ext/ep_products/Classes/Domain/Serialization/Room.php
+++ b/web/typo3conf/ext/ep_products/Classes/Domain/Serialization/Room.php
@@ -37,6 +37,7 @@ class Room
         $room = [];
 
         $room['@id'] = $array['roomBusProId'];
+        $room['@pax'] = $array['roomPax'];
         $room['@code'] = $array['roomCode'];
         $room['name'] = $array['roomName'];
         $room['price'] = $array['roomPrice'];
diff --git a/web/typo3conf/ext/ep_products/Classes/Domain/Serialization/Services.php b/web/typo3conf/ext/ep_products/Classes/Domain/Serialization/Services.php
index aca0d325..2ee2a8fd 100644
--- a/web/typo3conf/ext/ep_products/Classes/Domain/Serialization/Services.php
+++ b/web/typo3conf/ext/ep_products/Classes/Domain/Serialization/Services.php
@@ -58,7 +58,12 @@ class Services
             ];
             foreach ($categoryData as $row)
             {
-                $category['service'][] = $row;
+                $service = [
+                    '@id' => $row['idBusPro'],
+                    'label' => $row['label'],
+                    'price' => $row['price'],
+                ];
+                $category['service'][] = $service;
             }
             $services['category'][] = $category;
         }
diff --git a/web/typo3conf/ext/ep_products/Classes/Service/ImportService.php b/web/typo3conf/ext/ep_products/Classes/Service/ImportService.php
index 18edb358..bfa501f9 100644
--- a/web/typo3conf/ext/ep_products/Classes/Service/ImportService.php
+++ b/web/typo3conf/ext/ep_products/Classes/Service/ImportService.php
@@ -627,6 +627,7 @@ class ImportService implements SingletonInterface
             }
 
             $data[$type][] = [
+                'idBusPro' => (int) $service->attributes()['idbuspro'],
                 'label' => $label,
                 'price' => number_format($price, 2, ',', '.'),
             ];
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 e53815e9..962ac8e2 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
@@ -135,6 +135,7 @@
                                                 <thead>
                                                 <tr>
                                                     <th>Bezeichnung</th>
+                                                    <th>Personen</th>
                                                     <th>Preis</th>
                                                     <th>verfügbar</th>
                                                 </tr>
@@ -143,6 +144,7 @@
                                                 <f:for each="{date.rooms.room}" as="room">
                                                     <tr>
                                                         <td>{room.name}</td>
+                                                        <td>{v:variable.get(name: 'room.@pax')}</td>
                                                         <td>{room.price} €</td>
                                                         <td>{room.available}</td>
                                                     </tr>