#1342
#1343
#1345
#1346
#1349

git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3340 f459cee4-fb09-11de-96c3-f9c5f16c3c76
This commit is contained in:
valentin.wacker 2017-07-20 09:59:11 +00:00
parent 27d2713283
commit 652eeb16cb
27 changed files with 994 additions and 204 deletions

View file

@ -18,6 +18,7 @@ class AppKernel extends Kernel
new Symfony\Bundle\AsseticBundle\AsseticBundle(),
new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
new AppBundle\AppBundle(),
new WhiteOctober\TCPDFBundle\WhiteOctoberTCPDFBundle(),
];
if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {

View file

@ -32,7 +32,9 @@
<div id="navbar-collapse" class="navbar-left navbar-collapse collapse clearfix">
<ul class="nav navbar-nav">
<li itemprop="name"><a href="#" title="" itemprop="">Kulturreisen</a></li>
<li itemprop="name">
<a href="/" title="Kulturreisen" itemprop="">Kulturreisen</a>
</li>
<li itemprop="name">
<a href="https://www.stern-usedom.de" title="Usedom Ferienwohnungen" itemprop="url"
target="_blank" rel="nofollow"
@ -97,9 +99,9 @@
</div>
</div><!-- end navbar-header -->
<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>
<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>

View file

@ -20,7 +20,7 @@ Abfahrts-/Abflugort: {{ booking_request.departure.name }} {{ booking_request.
{% endfor %}
{% for option in booking_request.travelOptions %}
{{ booking_request.travelerCount }}x zugebuchte Leistung (Erwachsener): {{ option.name }} {{ option.price|number_format(2) -}}
€: {{ (booking_request.travelerCount * option.price|number_format(2)) }}
€: {{ (booking_request.travelerCount * option.price)|number_format(2) }}
{% endfor %}
{% for classOption in booking_price_info['classOptions'] %}
{{ classOption['count'] }}x {{ classOption['name'] }} {{ classOption['price']|number_format(2) }} €: {{
@ -53,6 +53,7 @@ PLZ: {{ booking_request.zipCode }}
Ort: {{ booking_request.city }}
Telefonnummer: {{ booking_request.phone }}
Fax: {{ booking_request.fax ?? 'keine Angabe' }}
E-Mail: {{ booking_request.email ?? 'keine Angabe' }}
=====================================================================================
Reiseteilnehmer:

View file

@ -24,6 +24,12 @@
</div>
{%- endblock %}
{% block st_plain_date_widget -%}
<div class="input-group">
{{- block('form_widget_simple') -}}
</div>
{%- endblock %}
{% block checkbox_widget -%}
{{- block('base_checkbox_widget') -}}
{%- endblock checkbox_widget %}

View file

@ -71,11 +71,25 @@
</td>
</tr>
<tr>
<td>{{ form_label(form.travelerCount, 'Reiseteilnehmer') }}</td>
<td>{{ form_label(form.singleRoomCount, 'Einzelzimmer') }}</td>
<td>
Erwachsene<br>
{{ form_widget(form.travelerCount) }}
{{ form_errors(form.travelerCount) }}
{{ form_widget(form.singleRoomCount) }}
{{ form_errors(form.singleRoomCount) }}
</td>
</tr>
<tr>
<td>{{ form_label(form.doubleRoomCount, 'Doppelzimmer') }}</td>
<td>
{{ form_widget(form.doubleRoomCount) }}
{{ form_errors(form.doubleRoomCount) }}
</td>
</tr>
<tr>
<td>{{ form_label(form.tripleRoomCount, 'Dreibettzimmer') }}</td>
<td>
{{ form_widget(form.tripleRoomCount) }}
{{ form_errors(form.tripleRoomCount) }}
</td>
</tr>
<tr>
@ -259,48 +273,55 @@
<div class="table-responsive" id="no-more-tables">
<table class="table">
<thead>
<tr>
<th>Nr.</th>
<th>Geschlecht</th>
<th>Vorname</th>
<th>Nachname</th>
<th>Geburtsdatum (TT.MM.JJJJ)</th>
</tr>
<tr>
<th>Raum-Nr.</th>
<th>Geschlecht</th>
<th>Vorname</th>
<th>Nachname</th>
<th>Geburtsdatum (TT.MM.JJJJ)</th>
</tr>
</thead>
<tbody class="st-travelers">
{% for traveler_form in form.travelers %}
<tr class="st-traveler st-traveler-{{ loop.index }}"
data-st-traveler-index="{{ loop.index }}"
style="display: none;"
>
<td>
<button class="btn btn-primary btn-sm border-radius st-traveller-index"
type="button"
{% set currentIndex = 0 %}
{% for room in form.rooms %}
{% for traveler in room.travelers %}
{#{{ dump(room.vars.value.roomType) }}#}
{% set currentIndex = currentIndex + 1 %}
<tr class="st-traveler st-traveler-{{ currentIndex }}"
data-st-traveler-index="{{ currentIndex }}"
data-room-index="{{ loop.parent.loop.index }}"
data-room-type="{{ room.vars.value.type }}"
style="display: none;"
>
{{ loop.index ?? '' }}
</button>
</td>
<td>
{{ form_field_pho(traveler_form.sex, 'Geschlecht', {
required: false
}) }}
</td>
<td>
{{ form_field_pho(traveler_form.firstName, 'Vorname') }}
</td>
<td>
{{ form_field_pho(traveler_form.lastName, 'Nachname') }}
</td>
<td>
{{ form_field_pho(traveler_form.birthDate, 'Geburtsdatum') }}
</td>
</tr>
{% endfor %}
<td>
<button class="btn btn-primary btn-sm border-radius st-traveller-index"
type="button"
>
{{ loop.parent.loop.index ?? '' }} <!-- TODO -->
</button>
</td>
<td>
{{ form_field_pho(traveler.sex, 'Geschlecht', {
required: false
}) }}
</td>
<td>
{{ form_field_pho(traveler.firstName, 'Vorname') }}
</td>
<td>
{{ form_field_pho(traveler.lastName, 'Nachname') }}
</td>
<td>
{{ form_field_pho(traveler.birthDate, 'Geburtsdatum') }}
</td>
</tr>
{% endfor %}
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
</div><!-- end form-box -->

View file

@ -122,6 +122,10 @@
<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 %}

View file

@ -0,0 +1,33 @@
<h1>{{ travel_program.title|default(page.pagetitle)|default(page.title) }}</h1>
<h2 style="color: #666">{{ travel_program.subtitle }}</h2>
{{ travel_program.htmlDescription|raw|keywords }}
<h2>Eingeschlossene Leistungen</h2>
<ul>
{% for travel_program_service in travel_program.included|split('\n') %}
<li>{{ travel_program_service|raw }}</li>
{% endfor %}
</ul>
{% if travel_program.classDescription is not empty %}
{{ travel_program.classDescription|raw }}
{% endif %}
{% if travel_program.excluded is not empty %}
<h2>Nicht eingeschlossene / zubuchbare Leistungen</h2>
<ul>
{% for travel_program_service in travel_program.excluded|split('\n') %}
<li>{{ travel_program_service|raw }}</li>
{% endfor %}
</ul>
{% endif %}
{% if travel_program.advices is not empty %}
<h3>Hinweise</h3>
<ul>
{% for travel_program_advice in travel_program.advices|trim|split('\n') %}
<li>{{ travel_program_advice|raw }}</li>
{% endfor %}
</ul>
{% endif %}

View file

@ -27,11 +27,9 @@
</div>
<div class="description col-md-9">
<span class="pull-right">
{# #TODO
<a href="https://www.sterntours.de/travel_program/pdf/22/" class="btn btn-default btn-sm border-radius">
<a href="{{ travel_program.page.urlPath }}/pdf" class="btn btn-default btn-sm border-radius">
<i class="fa fa-file-pdf-o"></i> Druckversion
</a>
#}
</span>
<div class="title clearfix">{{ travel_program.title }}</div>

View file

@ -86,9 +86,18 @@ assetic:
use_controller: '%kernel.debug%'
filters:
cssrewrite: ~
assets:
headerLogo:
inputs:
- '@AppBundle/Resources/public/images/wlogo.png'
footerText:
inputs:
- '@AppBundle/Resources/public/images/footer.svg'
stof_doctrine_extensions:
default_locale: de_DE
orm:
default:
tree: true
tree: true
white_october_tcpdf:
class: 'AppBundle\Pdf'

View file

@ -44,4 +44,10 @@ services:
app.keyword_service:
class: AppBundle\Service\KeywordService
arguments:
- '@doctrine.orm.entity_manager'
- '@doctrine.orm.entity_manager'
app.pdf:
class: AppBundle\Pdf
arguments:
- '%kernel.root_dir%'
- '@assetic.asset_manager'