Merge branch 'develop'

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()

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()}

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>