From 3a534c64d69b806ee89716cb7d0a5b8fe21398aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= <fromme@dreipunktnull.com>
Date: Sat, 15 Feb 2020 18:26:13 +0100
Subject: [PATCH] Fix dates table not being filtered by date range

---
 .../Classes/Domain/Repository/ProductRepository.php         | 2 +-
 .../ext/ep_products/Classes/Service/FilterService.php       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/typo3conf/ext/ep_products/Classes/Domain/Repository/ProductRepository.php b/public/typo3conf/ext/ep_products/Classes/Domain/Repository/ProductRepository.php
index b6adee38..b3c7b967 100644
--- a/public/typo3conf/ext/ep_products/Classes/Domain/Repository/ProductRepository.php
+++ b/public/typo3conf/ext/ep_products/Classes/Domain/Repository/ProductRepository.php
@@ -282,7 +282,7 @@ class ProductRepository extends AbstractRepository
             ])
         ;
 
-        $this->addFiltersettingsConditions($query, $filterSettings);
+        $this->addFiltersettingsConditions($query, $filterSettings, true);
 
         return $query->execute()->fetchAll();
     }
diff --git a/public/typo3conf/ext/ep_products/Classes/Service/FilterService.php b/public/typo3conf/ext/ep_products/Classes/Service/FilterService.php
index e1ae2912..55a55136 100644
--- a/public/typo3conf/ext/ep_products/Classes/Service/FilterService.php
+++ b/public/typo3conf/ext/ep_products/Classes/Service/FilterService.php
@@ -71,14 +71,14 @@ class FilterService implements SingletonInterface
 
         if (null !== $dateFromYmd) {
             $dateFrom = new \DateTime($dateFromYmd);
+        } elseif (!$respectBookableDaterange) {
+            $dateFrom = new \DateTime('now');
         }
+
         if (null !== $dateToYmd) {
             $dateTo = new \DateTime($dateToYmd);
         }
 
-        if (!$respectBookableDaterange) {
-            $dateFrom = new \DateTime('now');
-        }
         $filterSettings = new FilterSettings($dateFrom, $dateTo);
         if ($forcedConceptUids) {
             $filterSettings->setConceptUids($forcedConceptUids);