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

* #1346 / Validierung funktioniert nicht mehr

Browse source 
* #1336
* #1348

git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3339 f459cee4-fb09-11de-96c3-f9c5f16c3c76
This commit is contained in:
uli 2017-07-05 06:31:52 +00:00
parent ec10f42fc8
commit 27d2713283
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -85,9 +85,8 @@ class BookingController extends Controller
$breadcrumbEntries = Util::createBreadcrumb($travelProgramPage); $breadcrumbEntries = Util::createBreadcrumb($travelProgramPage);
$breadcrumbEntries[] = new BreadcrumbEntry('Buchen'); $breadcrumbEntries[] = new BreadcrumbEntry('Buchen');
if ($request->getMethod() == 'POST') // && $form->isValid()) if ($request->getMethod() == 'POST' && $form->isValid())
{ {
$booking = $this->getDoctrine()->getRepository('AppBundle:TravelBooking')->createFromBookingRequest( $booking = $this->getDoctrine()->getRepository('AppBundle:TravelBooking')->createFromBookingRequest(
$bookingRequest, $travelDate, $bookingPriceInfo); $bookingRequest, $travelDate, $bookingPriceInfo);
$em = $this->getDoctrine()->getManager(); $em = $this->getDoctrine()->getManager();

1
trunk/src/AppBundle/Controller/CmsController.php
View file

@ -76,6 +76,7 @@ class CmsController extends Controller
if (empty($nonMediated) && !empty($mediated)) if (empty($nonMediated) && !empty($mediated))
{ {
$childPages = $mediated; $childPages = $mediated;
$mediated = null;
} }
else else
{ {

2
trunk/src/AppBundle/Resources/assets/less/includes/sections_pages.less
View file

@ -88,7 +88,7 @@ body.modal-open {
background-color: #f6f6f6; background-color: #f6f6f6;
} }
#page-header { #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; display: block;
padding: 70px 0; padding: 70px 0;
position: relative; position: relative;

6
trunk/src/AppBundle/Util/DepartureUtil.php
View file

@ -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 TravelDeparturePoint[] $departures
* @param $flightPrice * @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 TravelDeparturePoint $departure
* @param $flightPrice * @param $flightPrice
@ -159,7 +159,7 @@ class DepartureUtil
{ {
if(strtolower($departure->getName()) == 'eigenanreise') if(strtolower($departure->getName()) == 'eigenanreise')
{ {
$limit = -$flightPrice + 30; $limit = -$flightPrice;
if ($departure->getExtraCharge() < $limit) if ($departure->getExtraCharge() < $limit)
{ {
$departure->setExtraCharge($limit); $departure->setExtraCharge($limit);