feat: hide included services column in tables when not applicable

public/typo3conf/ext/ep_products/Classes/Controller/AjaxTableController.php

@@ -194,6 +194,7 @@ class AjaxTableController extends ActionController
         }
 
         $hasSurchargeOrDiscount = $this->dateService->checkSurcharcheOrDiscount($allDates);
+        $hasIncludedServices = $this->dateService->hasIncludedServices($allDates);
         $noInfoConceptUids = GeneralUtility::trimExplode(',', $this->settings['noInfoConceptUids']);
         $isProductWithNoInfoConcept = ($product->getConcept() !== null) && \in_array($product->getConcept()->getUid(),
                 $noInfoConceptUids, false);
@@ -209,6 +210,7 @@ class AjaxTableController extends ActionController
             'hotel' => $hotel,
             'altProductLink' => $altProductLink,
             'altLabel' => $altLabel,
+            'hasIncludedServices' => $hasIncludedServices,
             'hasSurcharge' => $hasSurchargeOrDiscount['surcharge'],
             'hasDiscount' => $hasSurchargeOrDiscount['discount'],
             'isProductWithNoInfoConcept' => $isProductWithNoInfoConcept,
@@ -244,14 +246,14 @@ class AjaxTableController extends ActionController
             'paCode' => GeneralUtility::_GET('pa'),
         ]);
         $hasSurchargeOrDiscount = $this->dateService->checkSurcharcheOrDiscount($priceTable);
+        $hasIncludedServices = $this->dateService->hasIncludedServices($priceTable);
 
         $dateStart = $date ? $date->getDateStart()->format('d.m.y') : '';
         $dateEnd = $date ? $date->getDateEnd()->format('d.m.y') : '';
         $dateRange = sprintf('%s - %s', $dateStart, $dateEnd);
 
         $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);
-                $noInfoConceptUids, false);
 
         $nonBookableInfo = $this->getNonBookableInfobox($product);
 
@@ -262,6 +264,7 @@ class AjaxTableController extends ActionController
             'servicesIncluded' => $date->getServicesIncluded(),
             'prices' => $priceTable,
             'unavailable' => count($priceTable) === 0,
+            'hasIncludedServices' => $hasIncludedServices,
             'hasSurcharge' => $hasSurchargeOrDiscount['surcharge'],
             'hasDiscount' => $hasSurchargeOrDiscount['discount'],
             'isProductWithNoInfoConcept' => $isProductWithNoInfoConcept,
@@ -286,7 +289,7 @@ class AjaxTableController extends ActionController
 
         $nonBookableInfo = $this->getNonBookableInfobox($product);
 
-        $pricetable = $this->dateService->getPriceTable([
+        $priceTable = $this->dateService->getPriceTable([
             'product' => $product,
             'hotel' => $hotel,
             'filterSettings' => $this->filterService->getNormalizedFilterSettings(),
@@ -294,10 +297,14 @@ class AjaxTableController extends ActionController
             'paCode' => $paCode,
             'sortByRoom' => true,
         ]);
+        $hasIncludedServices = $this->dateService->hasIncludedServices($priceTable);
 
-        $this->view->assign('pricetable', $pricetable);
+        $this->view->assignMultiple([
-        $this->view->assign('nonBookableInfo', $nonBookableInfo);
+            'pricetable' => $priceTable,
-        $this->view->assign('bpnBookingUrlTemplateCode', $bpnBookingUrlTemplateCode ?? $this->settings['bpnBookingUrlTemplateCode']);
+            'hasIncludedServices' => $hasIncludedServices,
+            'nonBookableInfo' => $nonBookableInfo,
+            'bpnBookingUrlTemplateCode' => $bpnBookingUrlTemplateCode ?? $this->settings['bpnBookingUrlTemplateCode'],
+        ]);
     }
 
     /**
@@ -319,7 +326,8 @@ class AjaxTableController extends ActionController
         }, $roomTypes);
         $maxPax = max($roomTypesPax);
         $template = $this->settings['bpnBookingUrlTemplateCode'];
-        $pricetable = $this->dateService->getEventPriceTable($product, $maxPax, $template);
+        $priceTable = $this->dateService->getEventPriceTable($product, $maxPax, $template);
+        $hasIncludedServices = $this->dateService->hasIncludedServices($priceTable);
         $nonBookableInfo = $this->getNonBookableInfobox($product);
         $categories = [
             Hotel::CATEGORY_STANDARD => 'Standard',
@@ -330,7 +338,8 @@ class AjaxTableController extends ActionController
         $this->view->assignMultiple([
             'roomTypesPax' => $roomTypesPax,
             'roomTypesLabels' => $roomTypesLabels,
-            'pricetable' => $pricetable,
+            'pricetable' => $priceTable,
+            'hasIncludedServices' => $hasIncludedServices,
             'categories' => $categories,
             'themekey' => $this->settings['themekey'],
             'nonBookableInfo' => $nonBookableInfo,

public/typo3conf/ext/ep_products/Classes/Service/DateService.php

@@ -410,6 +410,20 @@ class DateService implements SingletonInterface
         return $priceTable;
     }
 
+    public function hasIncludedServices(array $tableData): bool
+    {
+        $included = false;
+
+        foreach ($tableData as $row) {
+            if ($row['busIncluded'] || $row['skipassIncluded']) {
+                $included = true;
+                break;
+            }
+        }
+
+        return $included;
+    }
+
     public function checkSurcharcheOrDiscount(array $tableData): array
     {
         $data = [

public/typo3conf/ext/ep_theme/Resources/Private/Partials/Pricetable.html

@@ -22,9 +22,11 @@
                         <th class="text-left">
                             Preis/Pers.
                         </th>
+                        <f:if condition="{hasIncludedServices}">
                             <th class="text-left">
                                 inkl.
                             </th>
+                        </f:if>
                         <th></th>
                         <th class="hidden lg:table-cell"></th>
                     </tr>
@@ -58,6 +60,7 @@
                                         </f:else>
                                     </f:if>
                                 </td>
+                                <f:if condition="{hasIncludedServices}">
                                     <td class="px-2 py-1 border border-zinc-200">
                                         <f:if condition="{row.busIncluded}">
                                             <span data-cooltipz-dir="top"
@@ -77,6 +80,7 @@
                                             </span>
                                         </f:if>
                                     </td>
+                                </f:if>
                                 <td class="px-2 py-1 border border-zinc-200">
                                     <f:if condition="{row.optionalServices} && {row.available}">
                                         <button type="button"

public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/Datestable.html

@@ -35,9 +35,11 @@
                             <th class="border-r border-white/50 px-2 py-1 md:p-2 text-sm md:text-base">
                                 Nächte
                             </th>
+                            <f:if condition="{hasIncludedServices}">
                                 <th class="border-r border-white/50 px-2 py-1 md:p-2 text-sm md:text-base">
                                     inklusive
                                 </th>
+                            </f:if>
                             <th class="border-r border-white/50 px-2 py-1 md:p-2 text-sm md:text-base">
                                 ab
                             </th>
@@ -76,6 +78,7 @@
                                     {row.nights}
                                 </span>
                             </td>
+                            <f:if condition="{hasIncludedServices}">
                                 <td class="border-r border-zinc-200 px-2 p-1">
                                     <div class="flex flex-wrap items-center">
                                         <div class="grid grid-cols-2">
@@ -124,6 +127,7 @@
                                         </button>
                                     </div>
                                 </td>
+                            </f:if>
                             <td class="border-r border-zinc-200 px-2 py-1 md:p-2 text-center">
                                 <f:if condition="{row.pseudoPrice}">
                                     <span class="block text-sm line-through">

public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/Pricetable.html

@@ -28,6 +28,7 @@
                         <th class="border-r border-white/50 px-2 py-1 md:p-2 text-left text-sm md:text-base">
                             Zimmertyp {dateRange}
                         </th>
+                        <f:if condition="{hasIncludedServices}">
                             <th class="border-r border-white/50 px-2 py-1 md:p-2 text-sm md:text-base">
                                 <span class="lg:hidden">
                                     inkl.
@@ -36,6 +37,7 @@
                                     inklusive
                                 </span>
                             </th>
+                        </f:if>
                         <th class="border-r border-white/50 px-2 py-1 md:p-2 text-sm md:text-base">
                             optional
                         </th>
@@ -71,6 +73,7 @@
                                 </f:else>
                             </f:if>
                         </td>
+                        <f:if condition="{hasIncludedServices}">
                             <td class="border-r border-zinc-200 px-2 py-1 md:p-2">
                                 <div class="flex items-center justify-around space-x-1">
                                     <div class="grid grid-cols-2">
@@ -110,6 +113,7 @@
                                     </div>
                                 </div>
                             </td>
+                        </f:if>
                         <td class="border-r border-zinc-200 px-2 py-1 md:p-2 text-center">
                             <f:if condition="{row.hasOptionalServices} && {row.available}">
                                 <button type="button"