From 28a7ef76d1f82ba7b5020021103aee0da8dc44a5 Mon Sep 17 00:00:00 2001
From: uli <uli@f459cee4-fb09-11de-96c3-f9c5f16c3c76>
Date: Sat, 25 Mar 2017 11:31:15 +0000
Subject: [PATCH] =?UTF-8?q?*=20"Kombination=20mit"=20im=20Suchfilter=20aus?=
 =?UTF-8?q?blenden=20*=20Behoben:=20Fehlermeldung=20wenn=20im=20TT-Suchfil?=
 =?UTF-8?q?ter=20keine=20Reisezeitraum=20angegeben=20wird=20*=20Reiseprogr?=
 =?UTF-8?q?ammseite:=20Komfort-Optionen=20=C3=BCber=20ausgeschlossenen=20L?=
 =?UTF-8?q?eistungen=20*=20=C3=84nderung=20Angebotsdaten=20im=20Buchungfor?=
 =?UTF-8?q?mular=20(Formatierung=20der=20Posten)=20*=20Such-=20und=20Angeb?=
 =?UTF-8?q?otsboxen=20auf=20"sunstar"-Seiten=20ausblenden=20in=20der=20Sid?=
 =?UTF-8?q?ebar=20*=20Behoben:=20Oberer=20Teil=20der=20Boxen=20(pageBox)?=
 =?UTF-8?q?=20nicht=20mehr=20klickbar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3321 f459cee4-fb09-11de-96c3-f9c5f16c3c76
---
 .../sidebar/searchSidebarWidget.html.twig     |  3 ++
 .../default/pages/cms/travelProgram.html.twig |  7 +++--
 .../Controller/BookingController.php          | 28 +++++++++----------
 .../AppBundle/Controller/CmsController.php    |  4 ++-
 .../Controller/DefaultController.php          |  8 ++++++
 .../AppBundle/Entity/TravelDeparturePoint.php |  2 +-
 .../AppBundle/Resources/public/js/custom.js   |  5 ++--
 7 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/trunk/app/Resources/views/default/components/sidebar/searchSidebarWidget.html.twig b/trunk/app/Resources/views/default/components/sidebar/searchSidebarWidget.html.twig
index f07081f8..888ddf59 100644
--- a/trunk/app/Resources/views/default/components/sidebar/searchSidebarWidget.html.twig
+++ b/trunk/app/Resources/views/default/components/sidebar/searchSidebarWidget.html.twig
@@ -17,6 +17,7 @@
                 {{ form_field_pho(search_form.e, 'Abreise') }}
             </div>
 
+            {#
             <div class="form-group col-md-12">
                 Kombinieren mit
                 <div class="pull-right">
@@ -24,9 +25,11 @@
                 </div>
             </div>
 
+
             <div class="form-group col-md-12">
                 {{ form_field_pho(search_form.c2, 'Kombinieren mit') }}
             </div>
+            #}
 
             <div class="form-group col-md-12 col-sm-12 col-xs-12 text-center form-bottom">
                 <button type="submit" class="btn btn-primary btn-block">Angebote suchen</button>
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 %}
                     </ul>
 
-                    {% if travel_program.excluded is not empty or travel_program.classDescription is not empty %}
-                        <h2>Nicht eingeschlossene Leistungen</h2>
+                    {% if travel_program.classDescription is not empty %}
                         {{ travel_program.classDescription|replace({'*': '<img src="/bundles/app/images/star-mini.png" >'})|raw }}
+                    {% endif %}
+
+                    {% if travel_program.excluded is not empty %}
+                        <h2>Nicht eingeschlossene Leistungen</h2>
                         <ul>
                             {% for travel_program_service in travel_program.excluded|replace({'*': '<img src="/bundles/app/images/star-mini.png" >'})|split('\n') %}
                                 <li>{{ travel_program_service|raw }}</li>
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() .'" <strong>'.
-                        Util::formatPrice($departure->getExtraCharge()) .'</strong>'
+                    'label' => ($departure->getExtraCharge() > 0 ? 'Aufschlag' : 'Abzug') .
+                        ' für Abfahrts-/Abflugort "'. $departure->getName() .'" <strong>['. $travelerCount .' x '.
+                        Util::formatPrice($departure->getExtraCharge()) .' pro Person]</strong>'
                 ];
             }
         }
@@ -231,8 +231,8 @@ class BookingController extends Controller
             {
                 $outHtmlSummary[] = [
                     'value' => $a,
-                    'label' => $travelerCount .'x zugebuchte Leistung: '. $travelOption->getName() .' <strong>'.
-                        Util::formatPrice($travelOption->getPrice()) .'</strong>'
+                    'label' => $travelOption->getName() .' <strong>['. $travelerCount .' x '.
+                        Util::formatPrice($travelOption->getPrice()) .' pro Person]</strong>'
                 ];
             }
             if (isset($outPriceInfo))
@@ -271,8 +271,8 @@ class BookingController extends Controller
                 {
                     $outHtmlSummary[] = [
                         'value' => $a,
-                        'label' => $room['persons']['total'] .'x zugebuchte Leistung: Komfort-Kategorie <strong>'.
-                            Util::formatPrice($room['price']->getEffectiveComfortPrice()) .'</strong>'
+                        'label' => 'Komfort-Kategorie <strong>['. $travelerCount .' x '.
+                            Util::formatPrice($room['price']->getEffectiveComfortPrice()) .' pro Person]</strong>'
                     ];
                 }
                 if (isset($outPriceInfo))
@@ -312,8 +312,8 @@ class BookingController extends Controller
 
             if (isset($outHtmlSummary))
             {
-                $label =  '1x '. $room['priceType']->getName() .' [Personen: '. $adultCount .' x <strong>'.
-                    Util::formatPrice($singleFullPrice) .'</strong>';
+                $label =  $room['priceType']->getName() .' <strong>['. $adultCount .' x '.
+                    Util::formatPrice($singleFullPrice) .' pro Person]</strong>';
                 if ($room['persons']['children'] != 0)
                 {
                     $label .= ', Kinder: '. $room['persons']['children'] .' x <strong>'.
@@ -328,8 +328,8 @@ class BookingController extends Controller
                 {
                     $outHtmlSummary[] = [
                         'value' => $discount,
-                        'label' => $adultCount .'x '.
-                            Util::formatPrice($singleFullPrice - $singleDiscountPrice) .' Rabatt'
+                        'label' => 'Rabatt <strong>['. $adultCount .'x '.
+                            Util::formatPrice($singleFullPrice - $singleDiscountPrice) .' pro Person]</strong>'
                     ];
                 }
                 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() .') <strong>'. Util::formatPrice($insurancePriceValue) .
-                                '</strong>'
+                            'label' => 'RV '. $bookingRequest->getInsurance()->getName() .' ('.
+                                $insurancePrice->getCode() .') <strong>['. $adultCount .' x '.
+                                Util::formatPrice($insurancePriceValue) . ' pro Person]</strong>'
                         ];
                     }
                     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);