From 54567d7d7964d8833fcfcdefad5c891ce3b6ee24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= Date: Thu, 5 Nov 2026 18:16:07 +0100 Subject: [PATCH] feat: travel info shows the hotel address maintained in TYPO3 The address MyEP returns for a travel is meant for the bus driver (e.g. a parking spot near the hotel), so guests were shown a technical location instead of the hotel's postal address. The hotel from MyEP is now matched to its TYPO3 record by code or additional code, and the editorial "Anschrift" is shown with its line breaks. If no hotel matches, it is hidden or its address is empty, the MyEP address is still shown as before, so no travel info loses its address block. Co-Authored-By: Claude Opus 5.5 --- .../Classes/Controller/TravelinfoController.php | 12 ++++++++++++ .../Domain/Repository/HotelRepository.php | 13 +++++++++++++ .../Resources/Private/Partials/Travelinfo.html | 17 ++++++++++++----- 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/packages/ep_products/Classes/Controller/TravelinfoController.php b/packages/ep_products/Classes/Controller/TravelinfoController.php index 1b4517e..2bf953f 100644 --- a/packages/ep_products/Classes/Controller/TravelinfoController.php +++ b/packages/ep_products/Classes/Controller/TravelinfoController.php @@ -3,7 +3,9 @@ namespace EP\EpProducts\Controller; use Psr\Http\Message\ResponseInterface; +use EP\EpProducts\Domain\Model\Hotel; use EP\EpProducts\Domain\Model\Travelinfo; +use EP\EpProducts\Domain\Repository\HotelRepository; use EP\EpProducts\Domain\Repository\TravelinfoRepository; use EP\EpProducts\MyEP\ApiClient; use EP\EpProducts\MyEP\ApiException; @@ -19,6 +21,7 @@ class TravelinfoController extends ActionController public function __construct( private readonly ApiClient $apiClient, private readonly TravelinfoRepository $travelinfoRepository, + private readonly HotelRepository $hotelRepository, ) { } @@ -94,11 +97,20 @@ class TravelinfoController extends ActionController $departureDayTime = $serviceDetail['dayTime']; } + // MyEP's hotel address is meant for the bus driver, so the editorial one is preferred + $hotel = null; + $hotelCode = $travelData['hotel']['code'] ?? null; + if (null !== $hotelCode && '' !== $hotelCode) { + $hotel = $this->hotelRepository->findOneByCodeOrAdditionalCode($hotelCode); + } + $hotelAddress = $hotel instanceof Hotel ? trim((string)$hotel->getAddress()) : ''; + $this->view->assign('travelInfo', $travelInfo); $this->view->assign('travelData', $travelData); $this->view->assign('pickupsPlanning', $pickupsPlanning); $this->view->assign('courses', $courses); $this->view->assign('board', $board); $this->view->assign('departureDayTime', $departureDayTime); + $this->view->assign('hotelAddress', $hotelAddress); } } diff --git a/packages/ep_products/Classes/Domain/Repository/HotelRepository.php b/packages/ep_products/Classes/Domain/Repository/HotelRepository.php index f9ed82a..9e1683f 100644 --- a/packages/ep_products/Classes/Domain/Repository/HotelRepository.php +++ b/packages/ep_products/Classes/Domain/Repository/HotelRepository.php @@ -243,4 +243,17 @@ class HotelRepository extends AbstractRepository return $query->execute(); } + public function findOneByCodeOrAdditionalCode(string $code): ?Hotel + { + $query = $this->createQuery(); + $query->matching( + $query->logicalOr( + $query->equals('code', $code), + $query->equals('additionalCodes.code', $code) + ) + ); + + return $query->execute()->getFirst(); + } + } diff --git a/packages/ep_theme/Resources/Private/Partials/Travelinfo.html b/packages/ep_theme/Resources/Private/Partials/Travelinfo.html index 39924d3..d4dfcef 100644 --- a/packages/ep_theme/Resources/Private/Partials/Travelinfo.html +++ b/packages/ep_theme/Resources/Private/Partials/Travelinfo.html @@ -69,11 +69,18 @@ Adresse

- {travelData.hotel.name} -
- {travelData.hotel.street} -
- {travelData.hotel.country} {travelData.hotel.city} + + + {hotelAddress} + + + {travelData.hotel.name} +
+ {travelData.hotel.street} +
+ {travelData.hotel.country} {travelData.hotel.city} +
+