diff --git a/trunk/app/Resources/views/default/pages/cms/travelProgram.html.twig b/trunk/app/Resources/views/default/pages/cms/travelProgram.html.twig
index af88fed4..5f5e3280 100644
--- a/trunk/app/Resources/views/default/pages/cms/travelProgram.html.twig
+++ b/trunk/app/Resources/views/default/pages/cms/travelProgram.html.twig
@@ -148,9 +148,12 @@
{% endfor %}
- {% if travel_program.excluded is not empty or travel_program.classDescription is not empty %}
-
Nicht eingeschlossene Leistungen
+ {% if travel_program.classDescription is not empty %}
{{ travel_program.classDescription|replace({'*': ''})|raw }}
+ {% endif %}
+
+ {% if travel_program.excluded is not empty %}
+
Nicht eingeschlossene Leistungen
{% for travel_program_service in travel_program.excluded|replace({'*': ''})|split('\n') %}
{{ travel_program_service|raw }}
diff --git a/trunk/src/AppBundle/Controller/BookingController.php b/trunk/src/AppBundle/Controller/BookingController.php
index 263e9419..344dd905 100644
--- a/trunk/src/AppBundle/Controller/BookingController.php
+++ b/trunk/src/AppBundle/Controller/BookingController.php
@@ -215,9 +215,9 @@ class BookingController extends Controller
{
$outHtmlSummary[] = [
'value' => $a,
- 'label' => $travelerCount .'x '. ($departure->getExtraCharge() > 0 ? 'Aufschlag' : 'Abzug') .
- ' für Abfahrts-/Abflugort "'. $departure->getName() .'" '.
- Util::formatPrice($departure->getExtraCharge()) .''
+ 'label' => ($departure->getExtraCharge() > 0 ? 'Aufschlag' : 'Abzug') .
+ ' für Abfahrts-/Abflugort "'. $departure->getName() .'" ['. $travelerCount .' x '.
+ Util::formatPrice($departure->getExtraCharge()) .' pro Person]'
];
}
}
@@ -231,8 +231,8 @@ class BookingController extends Controller
{
$outHtmlSummary[] = [
'value' => $a,
- 'label' => $travelerCount .'x zugebuchte Leistung: '. $travelOption->getName() .' '.
- Util::formatPrice($travelOption->getPrice()) .''
+ 'label' => $travelOption->getName() .' ['. $travelerCount .' x '.
+ Util::formatPrice($travelOption->getPrice()) .' pro Person]'
];
}
if (isset($outPriceInfo))
@@ -271,8 +271,8 @@ class BookingController extends Controller
{
$outHtmlSummary[] = [
'value' => $a,
- 'label' => $room['persons']['total'] .'x zugebuchte Leistung: Komfort-Kategorie '.
- Util::formatPrice($room['price']->getEffectiveComfortPrice()) .''
+ 'label' => 'Komfort-Kategorie ['. $travelerCount .' x '.
+ Util::formatPrice($room['price']->getEffectiveComfortPrice()) .' pro Person]'
];
}
if (isset($outPriceInfo))
@@ -312,8 +312,8 @@ class BookingController extends Controller
if (isset($outHtmlSummary))
{
- $label = '1x '. $room['priceType']->getName() .' [Personen: '. $adultCount .' x '.
- Util::formatPrice($singleFullPrice) .'';
+ $label = $room['priceType']->getName() .' ['. $adultCount .' x '.
+ Util::formatPrice($singleFullPrice) .' pro Person]';
if ($room['persons']['children'] != 0)
{
$label .= ', Kinder: '. $room['persons']['children'] .' x '.
@@ -328,8 +328,8 @@ class BookingController extends Controller
{
$outHtmlSummary[] = [
'value' => $discount,
- 'label' => $adultCount .'x '.
- Util::formatPrice($singleFullPrice - $singleDiscountPrice) .' Rabatt'
+ 'label' => 'Rabatt ['. $adultCount .'x '.
+ Util::formatPrice($singleFullPrice - $singleDiscountPrice) .' pro Person]'
];
}
if ($bookingRequest->getInsurance() && $adultCount > 0)
@@ -347,9 +347,9 @@ class BookingController extends Controller
{
$insuranceHtmlSummary[] = [
'value' => $a,
- 'label' => $adultCount .'x RV '. $bookingRequest->getInsurance()->getName() .' ('.
- $insurancePrice->getCode() .') '. Util::formatPrice($insurancePriceValue) .
- ''
+ 'label' => 'RV '. $bookingRequest->getInsurance()->getName() .' ('.
+ $insurancePrice->getCode() .') ['. $adultCount .' x '.
+ Util::formatPrice($insurancePriceValue) . ' pro Person]'
];
}
if (isset($outPriceInfo))
diff --git a/trunk/src/AppBundle/Controller/CmsController.php b/trunk/src/AppBundle/Controller/CmsController.php
index 2087152d..c08b1d29 100644
--- a/trunk/src/AppBundle/Controller/CmsController.php
+++ b/trunk/src/AppBundle/Controller/CmsController.php
@@ -131,7 +131,9 @@ class CmsController extends Controller
return $this->render('default/pages/cms/sunstar.html.twig', [
'page' => $page,
- 'sunstar_travel_programs' => $sunstarTravelPrograms
+ 'show_search_sidebar_widget' => false,
+ 'show_offers_sidebar_widget' => false,
+ 'sunstar_travel_programs' => $sunstarTravelPrograms,
]);
}
}
\ No newline at end of file
diff --git a/trunk/src/AppBundle/Controller/DefaultController.php b/trunk/src/AppBundle/Controller/DefaultController.php
index 50d5a41c..250313f2 100644
--- a/trunk/src/AppBundle/Controller/DefaultController.php
+++ b/trunk/src/AppBundle/Controller/DefaultController.php
@@ -98,6 +98,14 @@ class DefaultController extends Controller
public function ttSearchAction(Request $request)
{
$form = $this->createForm(TtSearchRequestType::class);
+ if (empty($request->query->get('termin')))
+ {
+ $request->query->set('termin', (new \DateTime('+5 day'))->format('d.m.Y'));
+ }
+ if (empty($request->query->get('ruecktermin')))
+ {
+ $request->query->set('ruecktermin', (new \DateTime('+19 day'))->format('d.m.Y'));
+ }
$form->handleRequest($request);
if ($form->isValid())
diff --git a/trunk/src/AppBundle/Entity/TravelDeparturePoint.php b/trunk/src/AppBundle/Entity/TravelDeparturePoint.php
index 66d07818..ca562947 100644
--- a/trunk/src/AppBundle/Entity/TravelDeparturePoint.php
+++ b/trunk/src/AppBundle/Entity/TravelDeparturePoint.php
@@ -347,6 +347,6 @@ class TravelDeparturePoint
public function __toString()
{
- return $this->getName();
+ return $this->getName() .' ('. number_format($this->getExtraCharge(), 2, ',', '.') .' €)';
}
}
diff --git a/trunk/src/AppBundle/Resources/public/js/custom.js b/trunk/src/AppBundle/Resources/public/js/custom.js
index acc12f3c..935526ae 100644
--- a/trunk/src/AppBundle/Resources/public/js/custom.js
+++ b/trunk/src/AppBundle/Resources/public/js/custom.js
@@ -427,8 +427,9 @@ jQuery(document).ready(function($) {
BOX LINK -->
=============================================== */
- $('.get-box-link').click(function(){
- var url = $(this).find('.is-box-link').attr('href');
+ $('.get-box-link').click(function() {
+ var el$ = $(this);
+ var url = el$.find('.is-box-link').attr('href');
if (el$.attr('target') === '_blank')
{
window.open(url);