From ee9e012b6bbf5a86f434e5273065ced123834ff4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= <fromme@dreipunktnull.com>
Date: Thu, 14 Nov 2024 11:07:15 +0100
Subject: [PATCH] fix: don't open teaser popup on target page

---
 .../ext/ep_products/Configuration/TypoScript/setup.typoscript | 1 +
 .../ep_theme/Configuration/TypoScript/constants.typoscript    | 2 ++
 .../ext/ep_theme/Configuration/TypoScript/setup.typoscript    | 1 +
 .../ep_theme/Resources/Private/Partials/Product/Teaser.html   | 4 ++--
 .../Resources/Private/Templates/Product/Teasergroup.html      | 3 ++-
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/public/typo3conf/ext/ep_products/Configuration/TypoScript/setup.typoscript b/public/typo3conf/ext/ep_products/Configuration/TypoScript/setup.typoscript
index a3d4585b..f367eeaf 100644
--- a/public/typo3conf/ext/ep_products/Configuration/TypoScript/setup.typoscript
+++ b/public/typo3conf/ext/ep_products/Configuration/TypoScript/setup.typoscript
@@ -53,6 +53,7 @@ plugin.tx_epproducts {
         groupInquiryFormConceptUids = {$plugin.tx_epproducts.settings.groupInquiryFormConceptUids}
         logoImage = {$plugin.tx_eptheme.settings.logoImage}
         themekey = {$plugin.tx_eptheme.settings.themekey}
+        globalConceptCode = {$plugin.tx_eptheme.settings.globalConceptCode}
         datePickerPresets {
             1 {
                label = Silvester
diff --git a/public/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.typoscript b/public/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.typoscript
index 79112136..2a3b33cf 100644
--- a/public/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.typoscript
+++ b/public/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.typoscript
@@ -132,6 +132,8 @@ plugin.tx_eptheme {
 		hideAreaNavigation = 0
 		# cat=eptheme/500/170; type=boolean; label=Hide searchbar
 		hideSearchbar = 0
+		# cat=eptheme/500/180; type=string; label=Global concept code
+		globalConceptCode =
 
 		# cat=eptheme/800/100; type=boolean; label=Show 'skipass inklusive' badge
 		showSkipassBadge = 1
diff --git a/public/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.typoscript b/public/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.typoscript
index 969f8348..244a5894 100644
--- a/public/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.typoscript
+++ b/public/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.typoscript
@@ -73,6 +73,7 @@ plugin.tx_eptheme {
         englishPageUid = {$plugin.tx_eptheme.settings.englishPageUid}
         germanPageUid = {$plugin.tx_eptheme.settings.germanPageUid}
         conceptsPageUid = {$plugin.tx_eptheme.settings.conceptsPageUid}
+        globalConceptCode = {$plugin.tx_eptheme.settings.globalConceptCode}
         travelAlertPageUid = {$plugin.tx_eptheme.settings.travelAlertPageUid}
         myEpPageUid = {$plugin.tx_eptheme.settings.myEpPageUid}
         myEpApiEndpointUrl = {$plugin.tx_eptheme.settings.myEpApiEndpointUrl}
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Teaser.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Teaser.html
index c2d803f5..ea6d0857 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Teaser.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Teaser.html
@@ -14,7 +14,7 @@
     <f:section name="TeaserImage">
         <div class="relative{f:if(condition: landscape, then: ' sm:w-2/5')}">
             <a href="{ep:uri.product(forceHotelUid: forceHotelUid, product: product, hotel: hotel, dateFrom: dateFrom, dateTo: dateTo, ref: referringPageUri)}"
-               <f:if condition="{concept.popupText}">
+               <f:if condition="{concept.popupText} && {settings.globalConceptCode} != {concept.code}">
                data-controller="teaser-popup"
                data-teaser-popup-text-value="{concept.popupText}"
                data-teaser-popup-teaser-popup-modal-outlet="#teaser-popup-modal"
@@ -79,7 +79,7 @@
     <f:section name="TeaserContent">
         {f:variable(name: 'including', value: '{f:render(section: \'Including\', arguments: \'{_all}\') -> v:format.trim()}')}
         <a href="{ep:uri.product(forceHotelUid: forceHotelUid, product: product, hotel: hotel, dateFrom: dateFrom, dateTo: dateTo, ref: referringPageUri)}"
-            <f:if condition="{concept.popupText}">
+            <f:if condition="{concept.popupText} && {globalConceptCode} != {concept.code}">
                 data-controller="teaser-popup"
                 data-teaser-popup-text-value="{concept.popupText}"
                 data-teaser-popup-teaser-popup-modal-outlet="#teaser-popup-modal"
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Teasergroup.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Teasergroup.html
index b6e958f4..cad2f37f 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Teasergroup.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Teasergroup.html
@@ -52,7 +52,8 @@
                                 dateFrom: dateFrom,
                                 dateTo: dateTo,
                                 new: teaser.new,
-                                index: iteration.index
+                                index: iteration.index,
+                                globalConceptCode: settings.globalConceptCode
                             }"/>
                             </f:for>
                         </div>