From c3b127ada9f9ca8dff39c6db9fd03a3e20e382c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= <fromme@dreipunktnull.com>
Date: Thu, 1 Oct 2020 10:44:20 +0200
Subject: [PATCH 1/2] Avoid empty hotel categories

---
 .../typo3conf/ext/ep_products/Classes/Service/DateService.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/typo3conf/ext/ep_products/Classes/Service/DateService.php b/public/typo3conf/ext/ep_products/Classes/Service/DateService.php
index c780863f..fe64ba45 100644
--- a/public/typo3conf/ext/ep_products/Classes/Service/DateService.php
+++ b/public/typo3conf/ext/ep_products/Classes/Service/DateService.php
@@ -420,7 +420,7 @@ class DateService implements SingletonInterface
             if (!$row['hotelShowAsTeaser']) {
                 continue;
             }
-            $categoryUid = $row['hotelCategory'];
+            $categoryUid = $row['hotelCategory'] ?? Hotel::CATEGORY_STANDARD;
             $hotelUid = $row['hotelUid'];
             $hotelUri = $this->uriBuilder
                 ->reset()

From 1668869b6a2f8cc5fa43182c10f639d618e2af0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= <fromme@dreipunktnull.com>
Date: Thu, 1 Oct 2020 17:13:09 +0200
Subject: [PATCH 2/2] Adjust more templates for rte content

---
 .../Resources/Private/Partials/Product/Details.html         | 6 +++---
 .../Resources/Private/Templates/Concept/Detail.html         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Details.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Details.html
index d9d6e973..b4970e31 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Details.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Details.html
@@ -1,12 +1,12 @@
 <div class="ep-headbar">Konzept</div>
+<div class="product-details product-details--concept">
+    {product.conceptDescription -> f:format.html()}
+</div>
 <f:if condition="{product.calendarHotel} && {hotel.groupsPriceConfigs}">
     <a class="button button--full" data-fancybox data-type="iframe" href="{f:uri.action(action: 'index', controller: 'GroupsPrice', arguments: '{hotel: hotel}', pageUid: settings.groupsPricePopupPageUid)}">
         Preisberechnung
     </a>
 </f:if>
-<div class="product-details product-details--concept">
-    {product.conceptDescription -> f:format.html()}
-</div>
 <div class="ep-headbar">Verpflegung</div>
 <div class="product-details product-details--board">
     {product.boardDescription -> f:format.html()}
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Concept/Detail.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Concept/Detail.html
index b8d1daf6..fdd30673 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Concept/Detail.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Concept/Detail.html
@@ -25,7 +25,7 @@
                 </div>
             </div>
             <div class="row">
-                <div class="col-md-8">
+                <div class="col-md-8" data-rte-content>
                     {concept.description -> f:format.html()}
                     <f:if condition="{teasers}">
                         <a id="teasers" class="anchor"></a>