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

Merge branch 'develop'

Browse Source
This commit is contained in:
Björn Fromme
2020-10-01 17:16:16 +02:00
parent d5c1a110d3 1668869b6a
commit 1184f60e5f
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_products/Classes/Service/DateService.php
+1 -1
View File
@@ -420,7 +420,7 @@ class DateService implements SingletonInterface
if (!$row['hotelShowAsTeaser']) { if (!$row['hotelShowAsTeaser']) {
continue; continue;
} }
$categoryUid = $row['hotelCategory']; $categoryUid = $row['hotelCategory'] ?? Hotel::CATEGORY_STANDARD;
$hotelUid = $row['hotelUid']; $hotelUid = $row['hotelUid'];
$hotelUri = $this->uriBuilder $hotelUri = $this->uriBuilder
->reset() ->reset()
public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Details.html
+3 -3
View File
@@ -1,12 +1,12 @@
<div class="ep-headbar">Konzept</div> <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}"> <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)}"> <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 Preisberechnung
</a> </a>
</f:if> </f:if>
<div class="product-details product-details--concept">
{product.conceptDescription -> f:format.html()}
</div>
<div class="ep-headbar">Verpflegung</div> <div class="ep-headbar">Verpflegung</div>
<div class="product-details product-details--board"> <div class="product-details product-details--board">
{product.boardDescription -> f:format.html()} {product.boardDescription -> f:format.html()}
public/typo3conf/ext/ep_theme/Resources/Private/Templates/Concept/Detail.html
+1 -1
View File
@@ -25,7 +25,7 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-8"> <div class="col-md-8" data-rte-content>
{concept.description -> f:format.html()} {concept.description -> f:format.html()}
<f:if condition="{teasers}"> <f:if condition="{teasers}">
<a id="teasers" class="anchor"></a> <a id="teasers" class="anchor"></a>