fix: generate correct referring urls and code cleanup

public/typo3conf/ext/ep_products/Classes/Controller/AjaxSearchController.php

@@ -104,6 +104,7 @@ class AjaxSearchController extends ActionController
             ->uriBuilder
             ->reset()
             ->setTargetPageUid((int)$this->settings['defaultSearchPageUid'])
+            ->setCreateAbsoluteUri(true)
             ->uriFor(
                 'searchresult',
                 ['filterSettings' => $filterSettings],

public/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/ProductViewHelper.php

@@ -92,7 +92,8 @@ class ProductViewHelper extends AbstractViewHelper
 
         if ($arguments['ref']) {
             $referringPageUri = urlencode($arguments['ref']);
-            $separator = false !== strpos($uri, '?') ? '&' : '?';
+            $hasQuery = null !== parse_url($uri, PHP_URL_QUERY);
+            $separator = $hasQuery ? '&' : '?';
             $uri .= $separator . 'ref=' . $referringPageUri;
         }
 

public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Teaser.html

@@ -72,7 +72,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)}{f:if(condition: referringPageUri, then: '?ref={referringPageUri -> f:format.urlencode()}')}"
+        <a href="{ep:uri.product(forceHotelUid: forceHotelUid, product: product, hotel: hotel, dateFrom: dateFrom, dateTo: dateTo, ref: referringPageUri)}"
            title="{region.name} {product.name} Details und Buchen"
            class="flex-1 flex flex-col space-y-1 px-2 py-4 md:p-4">
             <div class="product-teaser__label-name">

public/typo3conf/ext/ep_theme/Resources/Private/Partials/Search/Result.html

@@ -37,9 +37,6 @@
             data-action="overlay-toggle#invokeToggle">
         Filter
     </button>
-    <f:if condition="{referringPageUri}">
-        <f:variable name="referrer" value="{referringPageUri}"/>
-    </f:if>
     <f:for each="{searchResult}" as="section">
         <div id="concept-{section.concept.uid}">
             <h4 class="headline headline--tertiary headline--underlined">

public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxWatchlist/List.html

@@ -9,9 +9,6 @@
             </div>
         </f:then>
         <f:else>
-            <f:if condition="{referringPageUri}">
-                <f:variable name="referrer" value="{referringPageUri}"/>
-            </f:if>
             <f:for each="{watchlist}" as="section">
                 <div id="concept-{section.concept.uid}">
                     <h4 class="headline headline--tertiary headline--underlined">