diff --git a/trunk/src/AppBundle/Controller/BookingController.php b/trunk/src/AppBundle/Controller/BookingController.php index 3222629a..71237ece 100644 --- a/trunk/src/AppBundle/Controller/BookingController.php +++ b/trunk/src/AppBundle/Controller/BookingController.php @@ -85,9 +85,8 @@ class BookingController extends Controller $breadcrumbEntries = Util::createBreadcrumb($travelProgramPage); $breadcrumbEntries[] = new BreadcrumbEntry('Buchen'); - if ($request->getMethod() == 'POST') // && $form->isValid()) + if ($request->getMethod() == 'POST' && $form->isValid()) { - $booking = $this->getDoctrine()->getRepository('AppBundle:TravelBooking')->createFromBookingRequest( $bookingRequest, $travelDate, $bookingPriceInfo); $em = $this->getDoctrine()->getManager(); diff --git a/trunk/src/AppBundle/Controller/CmsController.php b/trunk/src/AppBundle/Controller/CmsController.php index 03d982e6..280c091c 100644 --- a/trunk/src/AppBundle/Controller/CmsController.php +++ b/trunk/src/AppBundle/Controller/CmsController.php @@ -76,6 +76,7 @@ class CmsController extends Controller if (empty($nonMediated) && !empty($mediated)) { $childPages = $mediated; + $mediated = null; } else { diff --git a/trunk/src/AppBundle/Resources/assets/less/includes/sections_pages.less b/trunk/src/AppBundle/Resources/assets/less/includes/sections_pages.less index 31daead5..ba5fd058 100644 --- a/trunk/src/AppBundle/Resources/assets/less/includes/sections_pages.less +++ b/trunk/src/AppBundle/Resources/assets/less/includes/sections_pages.less @@ -88,7 +88,7 @@ body.modal-open { background-color: #f6f6f6; } #page-header { - background: url(images/page-header.jpg) no-repeat scroll center center / cover rgba(0, 0, 0, 0); + background: url('images/page-header.jpg') no-repeat scroll center center / cover rgba(0, 0, 0, 0); display: block; padding: 70px 0; position: relative; diff --git a/trunk/src/AppBundle/Util/DepartureUtil.php b/trunk/src/AppBundle/Util/DepartureUtil.php index edb9f5a9..a7432e51 100644 --- a/trunk/src/AppBundle/Util/DepartureUtil.php +++ b/trunk/src/AppBundle/Util/DepartureUtil.php @@ -127,7 +127,7 @@ class DepartureUtil } /** - * Limit discount for individual arrival to flight price - 30 € + * Limit discount for individual arrival to flight price * * @param TravelDeparturePoint[] $departures * @param $flightPrice @@ -148,7 +148,7 @@ class DepartureUtil } /** - * Limit discount for individual arrival to flight price - 30 € + * Limit discount for individual arrival to flight price * * @param TravelDeparturePoint $departure * @param $flightPrice @@ -159,7 +159,7 @@ class DepartureUtil { if(strtolower($departure->getName()) == 'eigenanreise') { - $limit = -$flightPrice + 30; + $limit = -$flightPrice; if ($departure->getExtraCharge() < $limit) { $departure->setExtraCharge($limit);