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

fix: ensure correct sorting of rooms in pricetables

Browse Source
This commit is contained in:
Björn Fromme
2024-05-29 11:05:29 +02:00
parent 51a1dba6df
commit 0c910c4713
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_products/Classes/Domain/Repository/ProductRepository.php
+6 -4
View File
@@ -187,7 +187,7 @@ class ProductRepository extends AbstractRepository
; ;
} }
public function getPricetable(Product $product, Hotel $hotel, array $filterSettings, Date $date = null, bool $sortByRoom = false): array public function getPricetable(Product $product, Hotel $hotel, array $filterSettings, Date $date = null, bool $sortByRoom = true): array
{ {
$qb = $this->getDbConnection()->createQueryBuilder(); $qb = $this->getDbConnection()->createQueryBuilder();
@@ -207,12 +207,14 @@ class ProductRepository extends AbstractRepository
if (true === $sortByRoom) { if (true === $sortByRoom) {
$qb->addOrderBy('room.name', 'ASC'); $qb->addOrderBy('room.name', 'ASC');
} else {
$qb
->addOrderBy('room.pax', 'ASC')
->addOrderBy('room.price', 'ASC')
;
} }
$qb $qb
->addOrderBy('date.date_start', 'ASC')
->addOrderBy('room.pax', 'ASC')
->addOrderBy('room.price', 'ASC')
->where('date.date_start >= NOW()') ->where('date.date_start >= NOW()')
->andWhere($qb->expr()->eq( ->andWhere($qb->expr()->eq(
'date.product', 'date.product',
public/typo3conf/ext/ep_products/Classes/Service/DateService.php
+1 -1
View File
@@ -134,7 +134,7 @@ class DateService implements SingletonInterface
$resolver->setDefaults([ $resolver->setDefaults([
'template' => 'base', 'template' => 'base',
'date' => null, 'date' => null,
'sortByRoom' => false, 'sortByRoom' => true,
]); ]);
$resolver->setAllowedTypes('product', Product::class); $resolver->setAllowedTypes('product', Product::class);
$resolver->setAllowedTypes('hotel', Hotel::class); $resolver->setAllowedTypes('hotel', Hotel::class);