EP/website-typo3
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: don't hide included services unless bus or skipass is included

Browse Source 
closes #869aufg8n
This commit is contained in:
Björn Fromme
2025-10-15 08:42:29 +02:00
parent 404db8c89d
commit 26e7d65589
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_products/Classes/Controller/AjaxTableController.php
+2 -1
View File
@@ -194,7 +194,8 @@ class AjaxTableController extends ActionController
} }
$hasSurchargeOrDiscount = $this->dateService->checkSurcharcheOrDiscount($allDates); $hasSurchargeOrDiscount = $this->dateService->checkSurcharcheOrDiscount($allDates);
$hasIncludedServices = $this->dateService->hasIncludedServices($allDates); // $hasIncludedServices = $this->dateService->hasIncludedServices($allDates);
$hasIncludedServices = true;
$noInfoConceptUids = GeneralUtility::trimExplode(',', $this->settings['noInfoConceptUids']); $noInfoConceptUids = GeneralUtility::trimExplode(',', $this->settings['noInfoConceptUids']);
$isProductWithNoInfoConcept = ($product->getConcept() !== null) && \in_array($product->getConcept()->getUid(), $isProductWithNoInfoConcept = ($product->getConcept() !== null) && \in_array($product->getConcept()->getUid(),
$noInfoConceptUids, false); $noInfoConceptUids, false);
public/typo3conf/ext/ep_products/Classes/Service/DateService.php
+2 -5
View File
@@ -442,16 +442,13 @@ class DateService implements SingletonInterface
public function hasIncludedServices(array $tableData): bool public function hasIncludedServices(array $tableData): bool
{ {
$included = false;
foreach ($tableData as $row) { foreach ($tableData as $row) {
if ($row['busIncluded'] || $row['skipassIncluded']) { if ($row['busIncluded'] || $row['skipassIncluded']) {
$included = true; return true;
break;
} }
} }
return $included; return false;
} }
public function checkSurcharcheOrDiscount(array $tableData): array public function checkSurcharcheOrDiscount(array $tableData): array