From cb9d36ba7965c46c6eee1dc2943bacccf511d9b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= <fromme@dreipunktnull.com>
Date: Fri, 25 Oct 2019 12:57:18 +0200
Subject: [PATCH 1/2] Add journey information to copy and paste for resellers

---
 .../Classes/Domain/Serialization/Product.php     |  8 ++++++++
 .../Private/Templates/Reseller/Copypaste.html    | 16 +++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/public/typo3conf/ext/ep_products/Classes/Domain/Serialization/Product.php b/public/typo3conf/ext/ep_products/Classes/Domain/Serialization/Product.php
index 58a4e9b2..7b689901 100644
--- a/public/typo3conf/ext/ep_products/Classes/Domain/Serialization/Product.php
+++ b/public/typo3conf/ext/ep_products/Classes/Domain/Serialization/Product.php
@@ -75,6 +75,14 @@ class Product
         $product['description'] = SerializationUtility::sanitizeText($entity->getTeaser());
         $product['images']['image'] = SerializationUtility::preprocessImages($entity->getResellerImages(), $imageProcessingInstructions);
         $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();
         $product['link'] = SerializationUtility::generateLink($link, $queryData);
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Reseller/Copypaste.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Reseller/Copypaste.html
index fe617902..1dcca06f 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Reseller/Copypaste.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Reseller/Copypaste.html
@@ -20,13 +20,19 @@
                 <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: 6, label: 'Freizeitangebot', description: productData.city.leisure}"/>
-                <f:render section="CollapsibleSimple" arguments="{id: 7, label: 'Skipass', description: productData.skipass}"/>
-                <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:if condition="{productData.journey.byCar}">
+                    <f:render section="CollapsibleSimple" arguments="{id: 7, label: 'Anreise mit dem Auto', description: productData.journey.byCar}"/>
+                </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: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: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 class="row">
                 <div class="col-xs-12">

From 87d650deb8a9c27d6a44bea680d7f2af73ff46ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= <fromme@dreipunktnull.com>
Date: Fri, 25 Oct 2019 12:59:36 +0200
Subject: [PATCH 2/2] Update project dependencies

---
 composer.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.lock b/composer.lock
index e1744a0c..3e1674ad 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1177,9 +1177,9 @@
             "authors": [
                 {
                     "name": "Helmut Hummel",
+                    "role": "Developer",
                     "email": "info@helhum.io",
-                    "homepage": "http://helhum.io",
-                    "role": "Developer"
+                    "homepage": "http://helhum.io"
                 }
             ],
             "description": "A reliable and powerful command line interface for TYPO3 CMS",