Diverse ticketlose Änderungen
- E-Mail-Link im Header - Raumnummer und -typ sowie Aufteilung der Reisenden für die Bestätigungsmail - Es werden nur noch die Raumtypen zur Auswahl angeboten, die für die gewählte Reise verfügbar sind - PDF-Herunterladen an entsprechenden Stellen angefügt - Vorauswahl von Räumen und Abflugort entfernt - Geburtstage werden nicht mehr validiert git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3344 f459cee4-fb09-11de-96c3-f9c5f16c3c76
This commit is contained in:
valentin.wacker
parent
dc0a69413f
commit
0246f5b2ff
15 changed files with 207 additions and 94 deletions
|
|
@ -101,7 +101,7 @@
|
|||
|
||||
<div id="navbar-collapse" class="navbar-right">
|
||||
<div class="navbar-times hidden-xs">
|
||||
<span style="float:left; margin-top: 30pt; margin-right: 5pt">E-Mail: <a href="mailto:stern@sterntours.de">stern@sterntours.de</a></span>
|
||||
<span style="float:left; margin-top: 30pt; margin-right: 5pt; color: #e5aa30; font-size: 15px">E-Mail: <a href="mailto:stern@sterntours.de" style="font-size: 15px; color: #777777" >stern@sterntours.de</a></span>
|
||||
<i class="fa fa-phone "></i>
|
||||
<span>Mo-Fr: 09:00 - 23:00 Uhr<br>Sa: 10:00 - 23:00 Uhr<br>So: 11:00 - 23:00 Uhr</span>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -57,11 +57,24 @@ E-Mail: {{ booking_request.email ?? 'keine Angabe' }}
|
|||
|
||||
=====================================================================================
|
||||
Reiseteilnehmer:
|
||||
#) Geschlecht, Vorname, Nachname, Geburtsdatum
|
||||
Zimmernummer, Zimmertyp, Geschlecht, Vorname, Nachname, Geburtsdatum
|
||||
=====================================================================================
|
||||
{% for traveler in booking_request.travelers|slice(0, booking_request.travelerCount) %}
|
||||
{{ loop.index }}) {{ traveler.sex == 1 ? 'männlich' : 'weiblich' }}, {{ traveler.firstName }}, {{ traveler.lastName -}}
|
||||
, {{ traveler.birthDate|date }}
|
||||
{% set travelerIndex = 0 %}
|
||||
{% set travelerCollection = booking_request.travelers|slice(0, booking_request.travelerCount) %}
|
||||
{% for room in booking_request.occupiedRooms %}
|
||||
{% if(room.type == 1) %}
|
||||
{{ loop.index }}. Einzelzimmer, {{ travelerCollection[travelerIndex].sex == 1 ? 'männlich' : 'weiblich' }}, {{ travelerCollection[travelerIndex].firstName }}, {{ travelerCollection[travelerIndex].lastName -}}, {{ travelerCollection[travelerIndex].birthDate }}
|
||||
{% set travelerIndex = travelerIndex + 1 %}
|
||||
{% elseif (room.type == 2) %}
|
||||
{{ loop.index }}. Doppelzimmer, {{ travelerCollection[travelerIndex].sex == 1 ? 'männlich' : 'weiblich' }}, {{ travelerCollection[travelerIndex].firstName }}, {{ travelerCollection[travelerIndex].lastName -}}, {{ travelerCollection[travelerIndex].birthDate }}
|
||||
{{ loop.index }}. Doppelzimmer, {{ travelerCollection[travelerIndex+1].sex == 1 ? 'männlich' : 'weiblich' }}, {{ travelerCollection[travelerIndex+1].firstName }}, {{ travelerCollection[travelerIndex+1].lastName -}}, {{ travelerCollection[travelerIndex+1].birthDate }}
|
||||
{% set travelerIndex = travelerIndex + 2 %}
|
||||
{% elseif (room.type == 3) %}
|
||||
{{ loop.index }}. Dreibettzimmer, {{ travelerCollection[travelerIndex].sex == 1 ? 'männlich' : 'weiblich' }}, {{ travelerCollection[travelerIndex].firstName }}, {{ travelerCollection[travelerIndex].lastName -}}, {{ travelerCollection[travelerIndex].birthDate }}
|
||||
{{ loop.index }}. Dreibettzimmer, {{ travelerCollection[travelerIndex+1].sex == 1 ? 'männlich' : 'weiblich' }}, {{ travelerCollection[travelerIndex+1].firstName }}, {{ travelerCollection[travelerIndex+1].lastName -}}, {{ travelerCollection[travelerIndex+1].birthDate }}
|
||||
{{ loop.index }}. Dreibettzimmer, {{ travelerCollection[travelerIndex+2].sex == 1 ? 'männlich' : 'weiblich' }}, {{ travelerCollection[travelerIndex+2].firstName }}, {{ travelerCollection[travelerIndex+2].lastName -}}, {{ travelerCollection[travelerIndex+2].birthDate }}
|
||||
{% set travelerIndex = travelerIndex + 3 %}
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
|
||||
=====================================================================================
|
||||
|
|
|
|||
|
|
@ -70,22 +70,40 @@
|
|||
{{ form_errors(form.departure) }}
|
||||
</td>
|
||||
</tr>
|
||||
{# TODO folgendes evtl noch weiter verallgemeinern #}
|
||||
{% set priceTypeIds = [] %}
|
||||
{% for price in travel_date.prices %}
|
||||
{% set priceTypeIds = priceTypeIds|merge([price.priceTypeId]) %}
|
||||
{% endfor %}
|
||||
|
||||
{% if "1" in priceTypeIds %}
|
||||
<tr>
|
||||
{% else %}
|
||||
<tr style="display:none">
|
||||
{% endif %}
|
||||
<td>{{ form_label(form.singleRoomCount, 'Einzelzimmer') }}</td>
|
||||
<td>
|
||||
{{ form_widget(form.singleRoomCount) }}
|
||||
{{ form_errors(form.singleRoomCount) }}
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
{% if "3" in priceTypeIds %}
|
||||
<tr>
|
||||
{% else %}
|
||||
<tr style="display:none">
|
||||
{% endif %}
|
||||
<td>{{ form_label(form.doubleRoomCount, 'Doppelzimmer') }}</td>
|
||||
<td>
|
||||
{{ form_widget(form.doubleRoomCount) }}
|
||||
{{ form_errors(form.doubleRoomCount) }}
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
{% if "5" in priceTypeIds %}
|
||||
<tr>
|
||||
{% else %}
|
||||
<tr style="display:none">
|
||||
{% endif %}
|
||||
<td>{{ form_label(form.tripleRoomCount, 'Dreibettzimmer') }}</td>
|
||||
<td>
|
||||
{{ form_widget(form.tripleRoomCount) }}
|
||||
|
|
@ -274,11 +292,11 @@
|
|||
<table class="table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Raum-Nr.</th>
|
||||
<th>Zimmertyp</th>
|
||||
<th>Geschlecht</th>
|
||||
<th>Vorname</th>
|
||||
<th>Nachname</th>
|
||||
<th>Geburtsdatum (TT.MM.JJJJ)</th>
|
||||
<th>Geburtsdatum</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody class="st-travelers">
|
||||
|
|
@ -297,7 +315,17 @@
|
|||
<button class="btn btn-primary btn-sm border-radius st-traveller-index"
|
||||
type="button"
|
||||
>
|
||||
{{ loop.parent.loop.index ?? '' }} <!-- TODO -->
|
||||
{% set roomType = " " %}
|
||||
{% if loop.parent.loop.index is not null %}
|
||||
{% if room.vars.value.type == "1" %}
|
||||
{% set roomType = "Einzelzimmer" %}
|
||||
{% elseif room.vars.value.type == "2" %}
|
||||
{% set roomType = "Doppelzimmer" %}
|
||||
{% elseif room.vars.value.type == "3" %}
|
||||
{% set roomType = "Dreibettzimmer" %}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{{ roomType }}
|
||||
</button>
|
||||
</td>
|
||||
<td>
|
||||
|
|
|
|||
|
|
@ -121,7 +121,13 @@
|
|||
<tbody>
|
||||
<tr>
|
||||
<td>Anrede</td>
|
||||
<td>{{ booking.salutation }}</td>
|
||||
<td>
|
||||
{% if booking.salutation == 1 %}
|
||||
Herr
|
||||
{% elseif booking.salutation == 2 %}
|
||||
Frau
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Vorname</td>
|
||||
|
|
@ -203,7 +209,11 @@
|
|||
</button>
|
||||
</td>
|
||||
<td style="text-align: left;">
|
||||
{{ participant.sex }}
|
||||
{% if participant.sex == 1 %}
|
||||
männlich
|
||||
{% elseif participant.sex == 2 %}
|
||||
weiblich
|
||||
{% endif %}
|
||||
</td>
|
||||
<td style="text-align: left;">
|
||||
{{ participant.firstName }}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
</div>
|
||||
{% endif %}
|
||||
|
||||
<div class="pull-right btn-over-slider">
|
||||
<div class="pull-right btn-over-slider">
|
||||
<button type="button"
|
||||
class="btn btn-primary btn-lg border-radius st-slider-booking-btn"
|
||||
onclick=
|
||||
|
|
@ -33,6 +33,12 @@
|
|||
Jetzt Buchen
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div class="pull-right btn-over-slider btn-over-slider-bottom">
|
||||
<a href="{{ page.slug }}/pdf" title="Reisebeschreibung als PDF herunterladen" class="btn btn-primary btn-lg border-radius st-slider-booking-btn st-slider-booking-btn-bottom" >
|
||||
PDF herunterladen
|
||||
</a>
|
||||
</div>
|
||||
<section class="section fullscreen background padding-0 margin-bottom-20">
|
||||
<div id="myCarousel" class="carousel slide">
|
||||
<!-- Indicators -->
|
||||
|
|
@ -121,11 +127,6 @@
|
|||
#}
|
||||
|
||||
<div role="tabpanel" class="tab-pane active" id="travel-description-content-tab">
|
||||
|
||||
<a href="{{ page.slug }}/pdf" title="Reisebeschreibung als PDF herunterladen" style="position: relative; float: right; z-index: 1;">
|
||||
<span>PDF herunterladen</span>
|
||||
</a>
|
||||
|
||||
{{ travel_program.htmlDescription|raw|keywords }}
|
||||
|
||||
{% if travel_program.advices is not empty %}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue