diff --git a/trunk/src/AppBundle/Controller/BookingController.php b/trunk/src/AppBundle/Controller/BookingController.php index 584221f4..131e82f4 100644 --- a/trunk/src/AppBundle/Controller/BookingController.php +++ b/trunk/src/AppBundle/Controller/BookingController.php @@ -70,8 +70,6 @@ class BookingController extends Controller // #TODO Consider changing key of travel dates foreach ($travelProgram->getTravelDates() as $curTravelDate) { - - if($curTravelDate->getStatus() != 0){ if ($curTravelDate->getName() == $request->query->get('nr')) { @@ -81,10 +79,17 @@ class BookingController extends Controller } } + if (!isset($travelDate)) { throw $this->createNotFoundException(); } + $now = new \DateTime(); + if ($travelDate->getStart() <= $now) + { + throw $this->createNotFoundException(); + } + /** @var BookingRequest $bookingRequest */ $bookingRequest = new BookingRequest(); diff --git a/trunk/src/AppBundle/Entity/TravelProgram.php b/trunk/src/AppBundle/Entity/TravelProgram.php index 3bd88ded..5c9975ae 100644 --- a/trunk/src/AppBundle/Entity/TravelProgram.php +++ b/trunk/src/AppBundle/Entity/TravelProgram.php @@ -1614,6 +1614,13 @@ class TravelProgram public function addTravelDateFromNonSeasonTravelPeriod($key, TravelPeriod $travelPeriod, FlightPeriod $flightPeriod = null, $currencyFactor) { + + $now = new \DateTime(); + + if($travelPeriod->getStartDate() <= $now){ + return false; + } + $this->assertTravelDateNotDefinedYet($key); $this->travelDateByKey[$key] = TravelDate::createForNonSeasonTravelPeriod($key, $travelPeriod, $flightPeriod, $currencyFactor); @@ -1624,6 +1631,8 @@ class TravelProgram public function addTravelDateFromSeasonTravelPeriod($key, TravelPeriod $travelPeriod, $index, \DateTime $start, \DateTime $end = null, FlightPeriod $flightPeriod = null, $currencyFactor) { + var_dump($start); + $this->assertTravelDateNotDefinedYet($key); $this->isTravelDateMapTainted = true; $this->travelDateByKey[$key] = TravelDate::createForSeasonTravelPeriod($key, $travelPeriod, $index, $start, @@ -1633,6 +1642,7 @@ class TravelProgram public function addTravelDate($key, TravelPeriod $travelPeriod, FlightPeriod $flightPeriod = null, $currencyFactor, \DateTime $start = null, \DateTime $end = null, $index = null) { + var_dump($start); $this->assertTravelDateNotDefinedYet($key); $this->isTravelDateMapTainted = true; $this->travelDateByKey[$key] = new TravelDate($key, $travelPeriod, $flightPeriod, $currencyFactor, $start, $end,