* "Kombination mit" im Suchfilter ausblenden
* Behoben: Fehlermeldung wenn im TT-Suchfilter keine Reisezeitraum angegeben wird * Reiseprogrammseite: Komfort-Optionen über ausgeschlossenen Leistungen * Änderung Angebotsdaten im Buchungformular (Formatierung der Posten) * Such- und Angebotsboxen auf "sunstar"-Seiten ausblenden in der Sidebar * Behoben: Oberer Teil der Boxen (pageBox) nicht mehr klickbar git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3321 f459cee4-fb09-11de-96c3-f9c5f16c3c76
This commit is contained in:
uli
parent
077163634e
commit
28a7ef76d1
7 changed files with 37 additions and 20 deletions
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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))
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
|
@ -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())
|
||||
|
|
|
|||
|
|
@ -347,6 +347,6 @@ class TravelDeparturePoint
|
|||
|
||||
public function __toString()
|
||||
{
|
||||
return $this->getName();
|
||||
return $this->getName() .' ('. number_format($this->getExtraCharge(), 2, ',', '.') .' €)';
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue