Fix dates table not being filtered by date range

This commit is contained in:
Björn Fromme
2020-02-15 18:26:13 +01:00
parent f58d503529
commit 3a534c64d6
2 changed files with 4 additions and 4 deletions
@@ -282,7 +282,7 @@ class ProductRepository extends AbstractRepository
])
;
$this->addFiltersettingsConditions($query, $filterSettings);
$this->addFiltersettingsConditions($query, $filterSettings, true);
return $query->execute()->fetchAll();
}
@@ -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);