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

dublicate Booking Perido Names

Browse source 
sort out where Status = 0

git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3461 f459cee4-fb09-11de-96c3-f9c5f16c3c76
This commit is contained in:
adametz 2018-09-05 11:25:01 +00:00
parent 5c99472ef5
commit 002f60e735
4 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
trunk/src/AppBundle/Controller/BookingController.php
View file

@ -70,12 +70,17 @@ class BookingController extends Controller
// #TODO Consider changing key of travel dates
foreach ($travelProgram->getTravelDates() as $curTravelDate)
{
if ($curTravelDate->getName() == $request->query->get('nr'))
{
$travelDate = $curTravelDate;
break;
if($curTravelDate->getStatus() != 0){
if ($curTravelDate->getName() == $request->query->get('nr'))
{
$travelDate = $curTravelDate;
break;
}
}
}
if (!isset($travelDate))
{
throw $this->createNotFoundException();

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

@ -105,6 +105,7 @@ final class TravelDate
$this->travelProgram = $travelPeriod->getProgram();
$this->key = $key;
$this->travelPeriod = $travelPeriod;
if ($end === null)
{
$this->end = clone $this->start;

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

@ -225,6 +225,7 @@ class TravelPeriodRepository extends \Doctrine\ORM\EntityRepository
$doQueryVirtualAndNonVirtual = $flags & self::TD_QUERY_VIRTUAL_AND_NON_VIRTUAL ==
self::TD_QUERY_VIRTUAL_AND_NON_VIRTUAL;
/** @var TravelPeriod[] $periods */
$qb = $this->createQueryBuilder('p');
$qb
@ -257,8 +258,7 @@ class TravelPeriodRepository extends \Doctrine\ORM\EntityRepository
if (!($flags & self::TD_QUERY_OUTDATED))
{
$startDate = new \DateTime('tomorrow');
$qb->andWhere("((p.isSeason = 0 AND d.startDate >= CURRENT_TIMESTAMP()) OR".
" (p.isSeason = 1 AND d.endDate >= CURRENT_TIMESTAMP()))");
}
if ($class)
{
@ -292,7 +292,7 @@ class TravelPeriodRepository extends \Doctrine\ORM\EntityRepository
$entities = $qb->getQuery()->execute();
$flightPeriodByKey = null;
$flightPeriodByKey = null;
if (!$program->getIsMediated())
{
if (!$program->getTravelArrivalPoint())
@ -337,7 +337,6 @@ class TravelPeriodRepository extends \Doctrine\ORM\EntityRepository
}
}
}
$this->addTravelDatesToProgram($program, $entities, $flightPeriodByKey, $startDate, null);
return $program->getTravelDates();
}
@ -410,6 +409,7 @@ class TravelPeriodRepository extends \Doctrine\ORM\EntityRepository
$doTestStartDate = false;
if ($isPossibleDate)
{
// #TODO Do we need the travel date key?
$travelDateEnd = (clone $date)->modify('+'.$travelProgram->getProgramDuration().' day');
$travelDateKey = $this->createTravelDateKey($date, $travelDateEnd);
@ -463,8 +463,10 @@ class TravelPeriodRepository extends \Doctrine\ORM\EntityRepository
}
else
{
$travelProgram->addTravelDateFromNonSeasonTravelPeriod($travelDateKey, $travelPeriod, $flightPeriod,
$TravelDate = $travelProgram->addTravelDateFromNonSeasonTravelPeriod($travelDateKey, $travelPeriod, $flightPeriod,
$currencyFactor);
}
}
}

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

@ -1583,6 +1583,8 @@ class TravelProgram
$this->assertTravelDateNotDefinedYet($key);
$this->travelDateByKey[$key] = TravelDate::createForNonSeasonTravelPeriod($key, $travelPeriod, $flightPeriod,
$currencyFactor);
return $this->travelDateByKey[$key];
}
public function addTravelDateFromSeasonTravelPeriod($key, TravelPeriod $travelPeriod, $index, \DateTime $start,