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}
+
+ {travelData.hotel.street}
+
+ {travelData.hotel.country} {travelData.hotel.city}
+