diff --git a/config/sites/ep-reisen/config.yaml b/config/sites/ep-reisen/config.yaml index 20cd46ae..8e140cc3 100644 --- a/config/sites/ep-reisen/config.yaml +++ b/config/sites/ep-reisen/config.yaml @@ -260,11 +260,6 @@ routeEnhancers: _arguments: travel_info: travelinfo travel_date: travelDate - - - routePath: '/{buspro_id}' - _controller: 'Travelinfo::myep' - _arguments: - buspro_id: busProId - routePath: '/{travel_code}' _controller: 'Travelinfo::travelCode' @@ -278,13 +273,10 @@ routeEnhancers: routeFieldName: path_segment travel_date: type: PassthroughMapper - buspro_id: - type: PassthroughMapper travel_code: type: PassthroughMapper requirements: travel_date: '\d{4}\-\d{2}\-\d{2}|\d{2}\d{2}\d{4}' - buspro_id: '\d+' PageTypeSuffix: type: PageType default: / diff --git a/public/typo3conf/ext/ep_products/Classes/Controller/TravelinfoController.php b/public/typo3conf/ext/ep_products/Classes/Controller/TravelinfoController.php index a161caf6..416464ba 100644 --- a/public/typo3conf/ext/ep_products/Classes/Controller/TravelinfoController.php +++ b/public/typo3conf/ext/ep_products/Classes/Controller/TravelinfoController.php @@ -72,34 +72,7 @@ class TravelinfoController extends ActionController $this->view->assign('date', $date); } - public function myepAction(int $busProId) - { - /** @var Date $date */ - $date = $this->dateRepository->findOneByBusProId($busProId); - - if (null === $date) { - $response = GeneralUtility::makeInstance(ErrorController::class)->pageNotFoundAction( - $GLOBALS['TYPO3_REQUEST'], - 'Reisedaten nicht gefunden' - ); - throw new ImmediateResponseException($response, 1731071856); - } - - $travelinfo = $this->travelInfoRepository->findOneByProduct($date->getProduct()); - - if (null === $travelinfo) { - $response = GeneralUtility::makeInstance(ErrorController::class)->pageNotFoundAction( - $GLOBALS['TYPO3_REQUEST'], - 'Reiseinformationen nicht gefunden' - ); - throw new ImmediateResponseException($response, 1731071856); - } - - $this->view->assign('travelinfo', $travelinfo); - $this->view->assign('date', $date); - } - - public function indexAction(Travelinfo $travelinfo, string $travelDate = null) + public function indexAction(Travelinfo $travelinfo, string $travelDate) { $product = $travelinfo->getProduct(); @@ -107,12 +80,8 @@ class TravelinfoController extends ActionController $travelDate = (\DateTimeImmutable::createFromFormat('dmY', $travelDate))->format('Y-m-d'); } - if (null === $travelDate) { - $date = null; - } else { - /** @var Date $date */ - $date = $this->dateRepository->findForProductAndDate($product, $travelDate)->getFirst(); - } + /** @var Date $date */ + $date = $this->dateRepository->findForProductAndDate($product, $travelDate)->getFirst(); $this->view->assign('travelinfo', $travelinfo); $this->view->assign('date', $date); diff --git a/public/typo3conf/ext/ep_products/ext_localconf.php b/public/typo3conf/ext/ep_products/ext_localconf.php index 5eafb957..c35b3d7d 100644 --- a/public/typo3conf/ext/ep_products/ext_localconf.php +++ b/public/typo3conf/ext/ep_products/ext_localconf.php @@ -252,7 +252,7 @@ $boot = function () { 'EP.ep_products', 'travelinfo', [ - 'Travelinfo' => 'index,myep,travelCode', + 'Travelinfo' => 'index,travelCode', ] ); diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Travelinfo/MyEp.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Travelinfo/MyEp.html deleted file mode 100644 index 816f3889..00000000 --- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Travelinfo/MyEp.html +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - -