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

Add ids to services, add pax to rooms in export

Browse Source
This commit is contained in:
Björn Fromme
2018-08-13 13:23:19 +02:00
parent c778e8bf11
commit ef28d0daf2
5 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/typo3conf/ext/ep_products/Classes/Domain/Repository/ProductRepository.php
+1 -1
View File
@@ -259,7 +259,7 @@ class ProductRepository extends AbstractRepository
'date.services_general dateServicesGeneral', 'date.skipass_included dateSkipassIncluded', 'date.services_general dateServicesGeneral', 'date.skipass_included dateSkipassIncluded',
'date.bus_pro_id dateBusProId', 'date.hotel_bus_pro_id hotelBusProId', 'date.pickups pickups', '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.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' 'room.services roomOptionalServices', 'room.nights roomNights', 'room.available roomAvailable'
) )
->from('tx_epproducts_domain_model_date', 'date') ->from('tx_epproducts_domain_model_date', 'date')
web/typo3conf/ext/ep_products/Classes/Domain/Serialization/Room.php
+1
View File
@@ -37,6 +37,7 @@ class Room
$room = []; $room = [];
$room['@id'] = $array['roomBusProId']; $room['@id'] = $array['roomBusProId'];
$room['@pax'] = $array['roomPax'];
$room['@code'] = $array['roomCode']; $room['@code'] = $array['roomCode'];
$room['name'] = $array['roomName']; $room['name'] = $array['roomName'];
$room['price'] = $array['roomPrice']; $room['price'] = $array['roomPrice'];
web/typo3conf/ext/ep_products/Classes/Domain/Serialization/Services.php
+6 -1
View File
@@ -58,7 +58,12 @@ class Services
]; ];
foreach ($categoryData as $row) foreach ($categoryData as $row)
{ {
$category['service'][] = $row; $service = [
'@id' => $row['idBusPro'],
'label' => $row['label'],
'price' => $row['price'],
];
$category['service'][] = $service;
} }
$services['category'][] = $category; $services['category'][] = $category;
} }
web/typo3conf/ext/ep_products/Classes/Service/ImportService.php
+1
View File
@@ -627,6 +627,7 @@ class ImportService implements SingletonInterface
} }
$data[$type][] = [ $data[$type][] = [
'idBusPro' => (int) $service->attributes()['idbuspro'],
'label' => $label, 'label' => $label,
'price' => number_format($price, 2, ',', '.'), 'price' => number_format($price, 2, ',', '.'),
]; ];
web/typo3conf/ext/ep_theme/Resources/Private/Templates/Reseller/Copypaste.html
+2
View File
@@ -135,6 +135,7 @@
<thead> <thead>
<tr> <tr>
<th>Bezeichnung</th> <th>Bezeichnung</th>
<th>Personen</th>
<th>Preis</th> <th>Preis</th>
<th>verfügbar</th> <th>verfügbar</th>
</tr> </tr>
@@ -143,6 +144,7 @@
<f:for each="{date.rooms.room}" as="room"> <f:for each="{date.rooms.room}" as="room">
<tr> <tr>
<td>{room.name}</td> <td>{room.name}</td>
<td>{v:variable.get(name: 'room.@pax')}</td>
<td>{room.price} €</td> <td>{room.price} €</td>
<td>{room.available}</td> <td>{room.available}</td>
</tr> </tr>