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
2022-08-23 12:09:49 +02:00
parent 1d38d996b7 e7bb19f9cd
commit f4ee1dcdc9
5 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_products/Classes/Controller/ProductController.php
+8 -6
View File
@@ -161,12 +161,13 @@ class ProductController extends ActionController
$enabledDates = array_keys($availableContingents); $enabledDates = array_keys($availableContingents);
} }
$excludedConceptUids = GeneralUtility::trimExplode(',', $this->settings['excludedConceptUids']); $concept = $product->getConcept();
$isProductWithExcludedConcept = ($product->getConcept() !== null) && \in_array($product->getConcept()->getUid(), $excludedConceptUids = GeneralUtility::trimExplode(',', $this->settings['excludedConceptUids'], true);
$excludedConceptUids, false); $isProductWithExcludedConcept = ($concept !== null) && \in_array($concept->getUid(), $excludedConceptUids);
$noInfoConceptUids = GeneralUtility::trimExplode(',', $this->settings['noInfoConceptUids']); $noInfoConceptUids = GeneralUtility::trimExplode(',', $this->settings['noInfoConceptUids'], true);
$isProductWithNoInfoConcept = ($product->getConcept() !== null) && \in_array($product->getConcept()->getUid(), $isProductWithNoInfoConcept = ($concept !== null) && \in_array($concept->getUid(), $noInfoConceptUids);
$noInfoConceptUids, false); $groupInquiryFormConceptUids = GeneralUtility::trimExplode(',', $this->settings['groupInquiryFormConceptUids'], true);
$isProductWithGroupInquiryForm = ($concept !== null) && \in_array($concept->getUid(), $groupInquiryFormConceptUids);
// Assemble backlink // Assemble backlink
$backlinkUrl = GeneralUtility::_GET('ref'); $backlinkUrl = GeneralUtility::_GET('ref');
@@ -178,6 +179,7 @@ class ProductController extends ActionController
'enabledDates' => $enabledDates ?? [], 'enabledDates' => $enabledDates ?? [],
'isProductWithExcludedConcept' => $isProductWithExcludedConcept, 'isProductWithExcludedConcept' => $isProductWithExcludedConcept,
'isProductWithNoInfoConcept' => $isProductWithNoInfoConcept, 'isProductWithNoInfoConcept' => $isProductWithNoInfoConcept,
'isProductWithGroupInquiryForm' => $isProductWithGroupInquiryForm,
'currentPageUid' => $GLOBALS['TSFE']->id, 'currentPageUid' => $GLOBALS['TSFE']->id,
'dateFrom' => $dateFrom, 'dateFrom' => $dateFrom,
'dateTo' => $dateTo, 'dateTo' => $dateTo,
public/typo3conf/ext/ep_products/Configuration/TypoScript/constants.typoscript
+2
View File
@@ -50,6 +50,8 @@ plugin.tx_epproducts {
priceTableRoomTypes = 1,2,3,4,5,6,7,8,9,10 priceTableRoomTypes = 1,2,3,4,5,6,7,8,9,10
# cat=epproducts/140/110; type=string; label=Ignore following IPs in searchlog # cat=epproducts/140/110; type=string; label=Ignore following IPs in searchlog
searchLogIgnoreIps = searchLogIgnoreIps =
# cat=epproducts/140/120; type=string; label=Concept UIDs to trigger inquiry form on product detail page (CSV)
groupInquiryFormConceptUids =
} }
persistence { persistence {
# cat=epproducts/100/100; type=string; label=Default storage PID # cat=epproducts/100/100; type=string; label=Default storage PID
public/typo3conf/ext/ep_products/Configuration/TypoScript/setup.typoscript
+1
View File
@@ -49,6 +49,7 @@ plugin.tx_epproducts {
groupsPricePopupPageUid = {$plugin.tx_eptheme.settings.groupsPricePopupPageUid} groupsPricePopupPageUid = {$plugin.tx_eptheme.settings.groupsPricePopupPageUid}
groupsPriceToEmail = {$plugin.tx_epproducts.settings.groupsPriceToEmail} groupsPriceToEmail = {$plugin.tx_epproducts.settings.groupsPriceToEmail}
groupsPriceToName = {$plugin.tx_epproducts.settings.groupsPriceToName} groupsPriceToName = {$plugin.tx_epproducts.settings.groupsPriceToName}
groupInquiryFormConceptUids = {$plugin.tx_epproducts.settings.groupInquiryFormConceptUids}
logoImage = {$plugin.tx_eptheme.settings.logoImage} logoImage = {$plugin.tx_eptheme.settings.logoImage}
themekey = {$plugin.tx_eptheme.settings.themekey} themekey = {$plugin.tx_eptheme.settings.themekey}
datePickerPresets { datePickerPresets {
public/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/Details.html
+8 -6
View File
@@ -15,12 +15,14 @@
</f:else> </f:else>
</f:if> </f:if>
{hotel.description -> f:format.html()} {hotel.description -> f:format.html()}
<f:if condition="{hotel.groupsPriceConfigs}"> <f:if condition="{showInquiryForm}">
<f:else> <f:if condition="{hotel.groupsPriceConfigs}">
<f:link.typolink class="button bg-button" parameter="{settings.groupsContactFormPageUid}" additionalParams="&ref={currentPageUid}"> <f:else>
<f:translate key="tx_eptheme.label.to_inquiry_form" extensionName="ep_theme"/> <f:link.typolink class="button bg-button" parameter="{settings.groupsContactFormPageUid}" additionalParams="&ref={currentPageUid}">
</f:link.typolink> <f:translate key="tx_eptheme.label.to_inquiry_form" extensionName="ep_theme"/>
</f:else> </f:link.typolink>
</f:else>
</f:if>
</f:if> </f:if>
</div> </div>
<f:if condition="{teasers}"> <f:if condition="{teasers}">
public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Detail.html
+2 -1
View File
@@ -170,10 +170,11 @@
</f:section> </f:section>
<f:section name="Hotel"> <f:section name="Hotel">
<div class="mb-4{f:if(condition: settings.hotelOnTop, else: ' hidden')}" <div class="mb-4{f:if(condition: settings.hotelOnTop, else: ' hidden')}"
data-tabs-target="tab" data-tabs-target="tab"
data-tab="hotel"> data-tab="hotel">
<f:render partial="Hotel/Details" arguments="{hotel: hotel, bars: 1, showNonBookableHint: 0, currentPageUid: currentPageUid}"/> <f:render partial="Hotel/Details" arguments="{hotel: hotel, bars: 1, showNonBookableHint: 0, currentPageUid: currentPageUid, showInquiryForm: isProductWithGroupInquiryForm}"/>
</div> </div>
</f:section> </f:section>