From 26e7d6558976a23078c6bc69431c896ff7cc81cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= Date: Wed, 15 Oct 2025 08:42:29 +0200 Subject: [PATCH] fix: don't hide included services unless bus or skipass is included closes #869aufg8n --- .../ep_products/Classes/Controller/AjaxTableController.php | 3 ++- .../ext/ep_products/Classes/Service/DateService.php | 7 ++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/public/typo3conf/ext/ep_products/Classes/Controller/AjaxTableController.php b/public/typo3conf/ext/ep_products/Classes/Controller/AjaxTableController.php index a3baad66..e06980fc 100644 --- a/public/typo3conf/ext/ep_products/Classes/Controller/AjaxTableController.php +++ b/public/typo3conf/ext/ep_products/Classes/Controller/AjaxTableController.php @@ -194,7 +194,8 @@ class AjaxTableController extends ActionController } $hasSurchargeOrDiscount = $this->dateService->checkSurcharcheOrDiscount($allDates); - $hasIncludedServices = $this->dateService->hasIncludedServices($allDates); +// $hasIncludedServices = $this->dateService->hasIncludedServices($allDates); + $hasIncludedServices = true; $noInfoConceptUids = GeneralUtility::trimExplode(',', $this->settings['noInfoConceptUids']); $isProductWithNoInfoConcept = ($product->getConcept() !== null) && \in_array($product->getConcept()->getUid(), $noInfoConceptUids, false); diff --git a/public/typo3conf/ext/ep_products/Classes/Service/DateService.php b/public/typo3conf/ext/ep_products/Classes/Service/DateService.php index bc9ef121..4b04aa5a 100644 --- a/public/typo3conf/ext/ep_products/Classes/Service/DateService.php +++ b/public/typo3conf/ext/ep_products/Classes/Service/DateService.php @@ -442,16 +442,13 @@ class DateService implements SingletonInterface public function hasIncludedServices(array $tableData): bool { - $included = false; - foreach ($tableData as $row) { if ($row['busIncluded'] || $row['skipassIncluded']) { - $included = true; - break; + return true; } } - return $included; + return false; } public function checkSurcharcheOrDiscount(array $tableData): array