Merge branch 'release/2019.10-08'
This commit is contained in:
commit
417b9c38ad
3 files changed
+21
-7
No files matched your search
Generated
+2
-2
@@ -1177,9 +1177,9 @@
|
|||||||
"authors": [
|
"authors": [
|
||||||
{
|
{
|
||||||
"name": "Helmut Hummel",
|
"name": "Helmut Hummel",
|
||||||
|
"role": "Developer",
|
||||||
"email": "[email protected]",
|
"email": "[email protected]",
|
||||||
"homepage": "http://helhum.io",
|
"homepage": "http://helhum.io"
|
||||||
"role": "Developer"
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"description": "A reliable and powerful command line interface for TYPO3 CMS",
|
"description": "A reliable and powerful command line interface for TYPO3 CMS",
|
||||||
|
|||||||
@@ -75,6 +75,14 @@ class Product
|
|||||||
$product['description'] = SerializationUtility::sanitizeText($entity->getTeaser());
|
$product['description'] = SerializationUtility::sanitizeText($entity->getTeaser());
|
||||||
$product['images']['image'] = SerializationUtility::preprocessImages($entity->getResellerImages(), $imageProcessingInstructions);
|
$product['images']['image'] = SerializationUtility::preprocessImages($entity->getResellerImages(), $imageProcessingInstructions);
|
||||||
$product['video'] = $entity->getVideo();
|
$product['video'] = $entity->getVideo();
|
||||||
|
$product['journey'] = null;
|
||||||
|
|
||||||
|
if ($entity->getJourney()) {
|
||||||
|
$product['journey'] = [
|
||||||
|
'byBus' => SerializationUtility::sanitizeText($entity->getJourney()->getByBus()),
|
||||||
|
'byCar' => SerializationUtility::sanitizeText($entity->getJourney()->getByCar()),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
$link = $entity->getExternalLink() ?: $entity->getDetailPage();
|
$link = $entity->getExternalLink() ?: $entity->getDetailPage();
|
||||||
$product['link'] = SerializationUtility::generateLink($link, $queryData);
|
$product['link'] = SerializationUtility::generateLink($link, $queryData);
|
||||||
|
|||||||
@@ -20,13 +20,19 @@
|
|||||||
<f:render section="CollapsibleCity" arguments="{id: 4, label: 'Ort', city: productData.city}"/>
|
<f:render section="CollapsibleCity" arguments="{id: 4, label: 'Ort', city: productData.city}"/>
|
||||||
<f:render section="CollapsibleSimple" arguments="{id: 5, label: 'Party', description: productData.city.party}"/>
|
<f:render section="CollapsibleSimple" arguments="{id: 5, label: 'Party', description: productData.city.party}"/>
|
||||||
<f:render section="CollapsibleSimple" arguments="{id: 6, label: 'Freizeitangebot', description: productData.city.leisure}"/>
|
<f:render section="CollapsibleSimple" arguments="{id: 6, label: 'Freizeitangebot', description: productData.city.leisure}"/>
|
||||||
<f:render section="CollapsibleSimple" arguments="{id: 7, label: 'Skipass', description: productData.skipass}"/>
|
<f:if condition="{productData.journey.byCar}">
|
||||||
<f:render section="CollapsibleSimple" arguments="{id: 8, label: 'Verpflegung', description: productData.board}"/>
|
<f:render section="CollapsibleSimple" arguments="{id: 7, label: 'Anreise mit dem Auto', description: productData.journey.byCar}"/>
|
||||||
<f:render section="CollapsibleSimple" arguments="{id: 9, label: 'Programm', description: productData.programme}"/>
|
</f:if>
|
||||||
|
<f:if condition="{productData.journey.byBus}">
|
||||||
|
<f:render section="CollapsibleSimple" arguments="{id: 8, label: 'Anreise mit dem Bus', description: productData.journey.byBus}"/>
|
||||||
|
</f:if>
|
||||||
|
<f:render section="CollapsibleSimple" arguments="{id: 9, label: 'Skipass', description: productData.skipass}"/>
|
||||||
|
<f:render section="CollapsibleSimple" arguments="{id: 10, label: 'Verpflegung', description: productData.board}"/>
|
||||||
|
<f:render section="CollapsibleSimple" arguments="{id: 11, label: 'Programm', description: productData.programme}"/>
|
||||||
<f:for each="{productData.hotels.hotel}" as="hotel" iteration="iteration">
|
<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, Anreise, Bilder)', hotel: hotel}"/>
|
<f:render section="CollapsibleHotel" arguments="{id: '12-{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:for>
|
||||||
<f:render section="CollapsibleImages" arguments="{id: 11, label: 'Allgemeine Bilder/Video', images: productData.images.image, video: productData.video}"/>
|
<f:render section="CollapsibleImages" arguments="{id: 13, label: 'Allgemeine Bilder/Video', images: productData.images.image, video: productData.video}"/>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-xs-12">
|
<div class="col-xs-12">
|
||||||
|
|||||||
Reference in new issue
Block a user