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

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
@@ -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);
@@ -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