gitmedia/sterntours
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Preis ab xxx Ausgebuchte nicht mit auswerten

Browse source 
git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3470 f459cee4-fb09-11de-96c3-f9c5f16c3c76
This commit is contained in:
adametz 2018-10-11 13:08:46 +00:00
parent 0096fc88d6
commit e9cafbf426
3 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
trunk/src/AppBundle/Entity/TravelDate.php
View file

@ -299,15 +299,16 @@ final class TravelDate
$lowest = -1; $lowest = -1;
foreach ($this->getPrices() as $price) foreach ($this->getPrices() as $price)
{ {
if ($price->getPriceTypeId() == 3) if ($price->getPriceTypeId() == 3)
{ {
// Use double room if available (#1076) // Use double room if available (#1076)
return $price->getEffectiveDiscountPrice() ?? $price->getEffectivePrice(); return $price->getEffectiveDiscountPrice() ?? $price->getEffectivePrice();
} }
if ($lowest < 0 || $price->getEffectivePrice() < 0) if ($lowest < 0 || $price->getEffectivePrice() < 0)
{ {
$lowest = $price->getEffectivePrice(); $lowest = $price->getEffectivePrice();
} }
} }
return $lowest == -1 ? null : $lowest; return $lowest == -1 ? null : $lowest;
} }

2
trunk/src/AppBundle/Entity/TravelPeriodRepository.php
View file

@ -57,7 +57,7 @@ class TravelPeriodRepository extends \Doctrine\ORM\EntityRepository
$qb->addSelect('d'); $qb->addSelect('d');
$qb->where("((p.isSeason = 0 AND d.startDate >= '$startDateStr' AND d.endDate <= '$endDateStr') OR". $qb->where("((p.isSeason = 0 AND d.startDate >= '$startDateStr' AND d.endDate <= '$endDateStr') OR".
" (p.isSeason = 1 AND d.endDate >= '$startDateStr' AND". " (p.isSeason = 1 AND d.endDate >= '$startDateStr' AND".
" DATE_ADD(d.startDate, tp.programDuration, 'DAY') <= '$endDateStr' AND p.status >= 0))"); " DATE_ADD(d.startDate, tp.programDuration, 'DAY') <= '$endDateStr' AND p.status > 0))");
// Prices // Prices
// Instead of a single join to prices we add one join per price type. This reduces the execution time by // Instead of a single join to prices we add one join per price type. This reduces the execution time by

3
trunk/src/AppBundle/Entity/TravelProgram.php
View file

@ -1685,6 +1685,9 @@ class TravelProgram
$lowestPrice = -1; $lowestPrice = -1;
foreach ($this->getTravelDates() as $travelDate) foreach ($this->getTravelDates() as $travelDate)
{ {
if($travelDate->getStatus() == 0){
continue;
}
$curLowestPrice = $travelDate->getLowestPrice(); $curLowestPrice = $travelDate->getLowestPrice();
if ($lowestPrice < 0 || $curLowestPrice < $lowestPrice) if ($lowestPrice < 0 || $curLowestPrice < $lowestPrice)
{ {