Merge branch 'master' into develop

This commit is contained in:
Björn Fromme
2020-03-03 12:21:06 +01:00
2 changed files with 2 additions and 1 deletions
@@ -165,6 +165,7 @@ class ProductRepository extends AbstractRepository
->addGroupBy('date.hotel')
->addGroupBy('date.date_start')
->addGroupBy('date.nights')
->having('available > 0')
->orderBy('important', 'DESC')
->addOrderBy('concept_sorting')
->addOrderBy('date_start')
@@ -561,7 +561,7 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
$pax = (int) $roomXml->attributes()['MaxPax'];
$availableTotal += $available * $pax;
if ($code !== static::CODE_BABYROOM && ($minPrice === 0 || $price < $minPrice)) {
if ($code !== static::CODE_BABYROOM && $available > 0 && ($minPrice === 0 || $price < $minPrice)) {
$minPrice = $price;
}