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

Fehler #1478 disable Dates before now

Browse source 
git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3467 f459cee4-fb09-11de-96c3-f9c5f16c3c76
This commit is contained in:
adametz 2018-09-25 11:37:05 +00:00
parent 96ccad563d
commit 6f00076948
2 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -70,8 +70,6 @@ class BookingController extends Controller
// #TODO Consider changing key of travel dates // #TODO Consider changing key of travel dates
foreach ($travelProgram->getTravelDates() as $curTravelDate) foreach ($travelProgram->getTravelDates() as $curTravelDate)
{ {
if($curTravelDate->getStatus() != 0){ if($curTravelDate->getStatus() != 0){
if ($curTravelDate->getName() == $request->query->get('nr')) if ($curTravelDate->getName() == $request->query->get('nr'))
{ {
@ -81,10 +79,17 @@ class BookingController extends Controller
} }
} }
if (!isset($travelDate)) if (!isset($travelDate))
{ {
throw $this->createNotFoundException(); throw $this->createNotFoundException();
} }
$now = new \DateTime();
if ($travelDate->getStart() <= $now)
{
throw $this->createNotFoundException();
}
/** @var BookingRequest $bookingRequest */ /** @var BookingRequest $bookingRequest */
$bookingRequest = new BookingRequest(); $bookingRequest = new BookingRequest();

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

@ -1614,6 +1614,13 @@ class TravelProgram
public function addTravelDateFromNonSeasonTravelPeriod($key, TravelPeriod $travelPeriod, public function addTravelDateFromNonSeasonTravelPeriod($key, TravelPeriod $travelPeriod,
FlightPeriod $flightPeriod = null, $currencyFactor) FlightPeriod $flightPeriod = null, $currencyFactor)
{ {
$now = new \DateTime();
if($travelPeriod->getStartDate() <= $now){
return false;
}
$this->assertTravelDateNotDefinedYet($key); $this->assertTravelDateNotDefinedYet($key);
$this->travelDateByKey[$key] = TravelDate::createForNonSeasonTravelPeriod($key, $travelPeriod, $flightPeriod, $this->travelDateByKey[$key] = TravelDate::createForNonSeasonTravelPeriod($key, $travelPeriod, $flightPeriod,
$currencyFactor); $currencyFactor);
@ -1624,6 +1631,8 @@ class TravelProgram
public function addTravelDateFromSeasonTravelPeriod($key, TravelPeriod $travelPeriod, $index, \DateTime $start, public function addTravelDateFromSeasonTravelPeriod($key, TravelPeriod $travelPeriod, $index, \DateTime $start,
\DateTime $end = null, FlightPeriod $flightPeriod = null, $currencyFactor) \DateTime $end = null, FlightPeriod $flightPeriod = null, $currencyFactor)
{ {
var_dump($start);
$this->assertTravelDateNotDefinedYet($key); $this->assertTravelDateNotDefinedYet($key);
$this->isTravelDateMapTainted = true; $this->isTravelDateMapTainted = true;
$this->travelDateByKey[$key] = TravelDate::createForSeasonTravelPeriod($key, $travelPeriod, $index, $start, $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, public function addTravelDate($key, TravelPeriod $travelPeriod, FlightPeriod $flightPeriod = null, $currencyFactor,
\DateTime $start = null, \DateTime $end = null, $index = null) \DateTime $start = null, \DateTime $end = null, $index = null)
{ {
var_dump($start);
$this->assertTravelDateNotDefinedYet($key); $this->assertTravelDateNotDefinedYet($key);
$this->isTravelDateMapTainted = true; $this->isTravelDateMapTainted = true;
$this->travelDateByKey[$key] = new TravelDate($key, $travelPeriod, $flightPeriod, $currencyFactor, $start, $end, $this->travelDateByKey[$key] = new TravelDate($key, $travelPeriod, $flightPeriod, $currencyFactor, $start, $end,