Fix dates table not being filtered by date range
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user