EP/website-typo3
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix dates table not being filtered by date range

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_products/Classes/Domain/Repository/ProductRepository.php
+1 -1
View File
@@ -282,7 +282,7 @@ class ProductRepository extends AbstractRepository
]) ])
; ;
$this->addFiltersettingsConditions($query, $filterSettings); $this->addFiltersettingsConditions($query, $filterSettings, true);
return $query->execute()->fetchAll(); return $query->execute()->fetchAll();
} }
public/typo3conf/ext/ep_products/Classes/Service/FilterService.php
+3 -3
View File
@@ -71,14 +71,14 @@ class FilterService implements SingletonInterface
if (null !== $dateFromYmd) { if (null !== $dateFromYmd) {
$dateFrom = new \DateTime($dateFromYmd); $dateFrom = new \DateTime($dateFromYmd);
} elseif (!$respectBookableDaterange) {
$dateFrom = new \DateTime('now');
} }
if (null !== $dateToYmd) { if (null !== $dateToYmd) {
$dateTo = new \DateTime($dateToYmd); $dateTo = new \DateTime($dateToYmd);
} }
if (!$respectBookableDaterange) {
$dateFrom = new \DateTime('now');
}
$filterSettings = new FilterSettings($dateFrom, $dateTo); $filterSettings = new FilterSettings($dateFrom, $dateTo);
if ($forcedConceptUids) { if ($forcedConceptUids) {
$filterSettings->setConceptUids($forcedConceptUids); $filterSettings->setConceptUids($forcedConceptUids);