Merge branch 'hotfix/remove-dates-filtering'

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

@@ -94,11 +94,10 @@ class AjaxDateController extends ActionController
     /**
      * @param Product $product
      * @param Hotel $hotel
-     * @param FilterSettings $filterSettings
      *
      * @return string
      */
-    public function datesAction(Product $product, Hotel $hotel = null, FilterSettings $filterSettings = null)
+    public function datesAction(Product $product, Hotel $hotel = null)
     {
         if ($hotel === null) {
             return json_encode([
@@ -108,10 +107,10 @@ class AjaxDateController extends ActionController
                 'altLabel' => null,
             ]);
         }
-        if ($filterSettings === null) {
+
-            $forcedConceptUids = GeneralUtility::trimExplode(',', $this->settings['forcedConceptUids'], true);
+        $forcedConceptUids = GeneralUtility::trimExplode(',', $this->settings['forcedConceptUids'], true);
-            $filterSettings = $this->filterService->getDefaultFilterSettings($forcedConceptUids, false);
+        $filterSettings = $this->filterService->getDefaultFilterSettings($forcedConceptUids, false);
-        }
+
         $altProductLink = null;
         $altLabel = null;
         if ($product->getAltProduct()) {

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

@@ -28,7 +28,6 @@ namespace EP\EpProducts\Controller;
  ***************************************************************/
 
 use EP\EpProducts\Domain\Model\Date;
-use EP\EpProducts\Domain\Model\FilterSettings;
 use EP\EpProducts\Domain\Model\Hotel;
 use EP\EpProducts\Domain\Model\Product;
 use EP\EpProducts\Service\DateService;
@@ -85,7 +84,6 @@ class AjaxTableController extends ActionController
     /**
      * @param Product $product
      * @param Hotel $hotel
-     * @param FilterSettings $filterSettings
      * @param Date $date
      *
      * @return string
@@ -95,14 +93,12 @@ class AjaxTableController extends ActionController
     (
         Product $product,
         Hotel $hotel,
-        FilterSettings $filterSettings = null,
         Date $date = null
     )
     {
-        if ($filterSettings === null) {
+        $forcedConceptUids = GeneralUtility::trimExplode(',', $this->settings['forcedConceptUids'], true);
-            $forcedConceptUids = GeneralUtility::trimExplode(',', $this->settings['forcedConceptUids'], true);
+        $filterSettings = $this->filterService->getDefaultFilterSettings($forcedConceptUids, false);
-            $filterSettings = $this->filterService->getDefaultFilterSettings($forcedConceptUids, false);
+
-        }
         if ($reseller = $this->resellerDataService->getResellerForCurrentDomain()) {
             $paCode = $reseller['paCode'];
         } else {

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

@@ -79,9 +79,6 @@ class AjaxViewHelper extends ActionViewHelper
         // Force absolute urls
         $arguments['absolute'] = true;
 
-        // Add timestamp as additional argument to prevent caching
-        $arguments['additionalParams'] = ['t' => time()];
-
         return parent::renderStatic(
             $arguments,
             $renderChildrenClosure,

public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/ProductDetail.vue

@@ -17,8 +17,6 @@
     import dayjs from 'dayjs'
     import 'dayjs/locale/de'
 
-    import defaultFilterSettings from '../_filtersettings'
-
     export default {
         components: {
             DatesTable,
@@ -51,7 +49,6 @@
                 loading: false,
                 activeSection: null,
                 singleDate: false,
-                filterSettings: defaultFilterSettings,
                 referringPage: null
             }
         },
@@ -92,12 +89,9 @@
                 this.datesShow = true;
                 this.priceTableShow = false;
                 this.detailShow = false;
-                let query = {};
-                query[this.argumentPrefix + '[filterSettings]'] = this.filterSettings;
                 axios({
                     url: this.uris['dates'],
-                    method: 'post',
+                    method: 'post'
-                    data: $.param(query)
                 }).then(response => {
                     const json = response.data;
                     if (json.dates.length === 1) {
@@ -116,33 +110,6 @@
                     EventBus.$emit('tableLoaded');
                 });
             },
-            loadSelectableDates () {
-                this.loading = true;
-                this.datesShow = true;
-                this.priceTableShow = false;
-                this.detailShow = false;
-                let query = {};
-                query[this.argumentPrefix + '[product]'] = this.filterSettings;
-                axios({
-                    url: this.uris['dateslist'],
-                    method: 'post',
-                    data: $.param(query)
-                }).then(response => {
-                    const json = response.data;
-                    if (json.dates.length === 1) {
-                        this.singleDate = true;
-                        let dateRow = json.dates[0];
-                        this.loadPriceTableView(dateRow.dateUid);
-                    } else {
-                        this.singleDate = false;
-                        this.datesRows = json.dates;
-                        this.bookable = json.bookable;
-                        this.altLabel = json.altLabel;
-                        this.altProductLink = json.altProductLink;
-                        this.loading = false;
-                    }
-                });
-            },
             loadDatesView (scroll = true) {
                 if (this.daytrip) {
                     this.loading = false;
@@ -161,7 +128,6 @@
                 this.priceTableShow = true;
                 this.detailShow = false;
                 let query = {};
-                query[this.argumentPrefix + '[filterSettings]'] = this.filterSettings;
                 query[this.argumentPrefix + '[date]'] = dateUid;
                 axios({
                     url: this.uris['pricetable'],
@@ -225,9 +191,6 @@
             }
         },
         created () {
-            if (sessionStorage.getItem('filterSettings')) {
-                this.filterSettings = JSON.parse(sessionStorage.getItem('filterSettings'));
-            }
             if (sessionStorage.getItem('referringPage')) {
                 this.referringPage = JSON.parse(sessionStorage.getItem('referringPage'));
                 sessionStorage.removeItem('referringPage');