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

Anpassung ID zum v2 backend

Browse source 
git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3471 f459cee4-fb09-11de-96c3-f9c5f16c3c76
This commit is contained in:
adametz 2018-10-15 14:57:27 +00:00
parent e9cafbf426
commit 3dec64587e
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -371,6 +371,7 @@ class TravelPeriodRepository extends \Doctrine\ORM\EntityRepository
\DateTime $startDate = null, \DateTime $endDate = null) \DateTime $startDate = null, \DateTime $endDate = null)
{ {
$currencyFactor = $travelProgram->getNettoPricesInEuro() ? 1 : $this->getCurrencyFactor(); $currencyFactor = $travelProgram->getNettoPricesInEuro() ? 1 : $this->getCurrencyFactor();
$counters = array();
// #TODO Consider adding travelPeriods to travelProgram in the search algorithm // #TODO Consider adding travelPeriods to travelProgram in the search algorithm
//foreach ($travelProgram->getPeriods() as $travelPeriod) //foreach ($travelProgram->getPeriods() as $travelPeriod)
@ -378,9 +379,13 @@ class TravelPeriodRepository extends \Doctrine\ORM\EntityRepository
{ {
if ($travelPeriod->getIsSeason()) if ($travelPeriod->getIsSeason())
{ {
$i = 1;
foreach ($travelPeriod->getDates() as $travelPeriodDate) foreach ($travelPeriod->getDates() as $travelPeriodDate)
{ {
$cn = $travelPeriodDate->getId().$travelPeriod->getName();
if(empty($counters[$cn])){
$counters[$cn] = 1;
}
$seasonEndDate = clone $travelPeriodDate->getEndDate(); $seasonEndDate = clone $travelPeriodDate->getEndDate();
$seasonEndDate->modify('+'.$travelProgram->getProgramDuration().' day'); $seasonEndDate->modify('+'.$travelProgram->getProgramDuration().' day');
if ($endDate != null && $seasonEndDate > $endDate) if ($endDate != null && $seasonEndDate > $endDate)
@ -413,6 +418,7 @@ class TravelPeriodRepository extends \Doctrine\ORM\EntityRepository
// #TODO Do we need the travel date key? // #TODO Do we need the travel date key?
$travelDateEnd = (clone $date)->modify('+'.$travelProgram->getProgramDuration().' day'); $travelDateEnd = (clone $date)->modify('+'.$travelProgram->getProgramDuration().' day');
$travelDateKey = $this->createTravelDateKey($date, $travelDateEnd); $travelDateKey = $this->createTravelDateKey($date, $travelDateEnd);
if (!$travelProgram->hasTravelDate($travelDateKey)) if (!$travelProgram->hasTravelDate($travelDateKey))
{ {
$flightPeriod = null; $flightPeriod = null;
@ -425,7 +431,7 @@ class TravelPeriodRepository extends \Doctrine\ORM\EntityRepository
$travelProgram->addTravelDateFromSeasonTravelPeriod( $travelProgram->addTravelDateFromSeasonTravelPeriod(
$travelDateKey, $travelDateKey,
$travelPeriod, $travelPeriod,
$travelPeriodDate->getId() . $travelPeriod->getName() . $i, $travelPeriodDate->getId() . $travelPeriod->getName() . $counters[$cn],
$date, $date,
$travelDateEnd, $travelDateEnd,
$flightPeriod, $flightPeriod,
@ -437,7 +443,7 @@ class TravelPeriodRepository extends \Doctrine\ORM\EntityRepository
// Also increment $i if the date is theoretically possible but excluded from the search request // Also increment $i if the date is theoretically possible but excluded from the search request
if ($isPossibleDate) if ($isPossibleDate)
{ {
++$i; ++ $counters[$cn];
} }
} }
} }