gitmedia/sterntours
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#1352

Browse source 
git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3358 f459cee4-fb09-11de-96c3-f9c5f16c3c76
This commit is contained in:
valentin.wacker 2017-11-02 12:29:09 +00:00
parent fd01254e8f
commit 45977fd4de
15 changed files with 86 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/app/Resources/views/default/admin/lodgingsEdit.html.twig
View file

@ -91,7 +91,7 @@
<th>Bis</th>
<th>Mindestbelegung</th>
<th>Preis pro Nacht</th>
<th>Pauschalpreis</th>
<th>Service-Gebühr</th>
<th></th>
</tr>
</thead>

2
trunk/app/Resources/views/default/admin/pricesEdit.html.twig
View file

@ -15,7 +15,7 @@
<div class="form-box">
{{ form_row(form.season, {label: 'Saison'}) }}
{{ form_row(form.perNight, {label: 'Preis pro Nacht'}) }}
{{ form_row(form.flatPrice, {label: 'Pauschalpreis'}) }}
{{ form_row(form.flatPrice, {label: 'Service-Gebühr'}) }}
<div class="col-md-12 col-sm-12 col-xs-12">
<button type="submit" value="SEND" id="submit"
class="btn btn-primary btn-lg border-radius"

2
trunk/app/Resources/views/default/admin/pricesNew.html.twig
View file

@ -15,7 +15,7 @@
<div class="form-box">
{{ form_row(form.season, {label: 'Saison'}) }}
{{ form_row(form.perNight, {label: 'Preis pro Nacht'}) }}
{{ form_row(form.flatPrice, {label: 'Pauschalpreis'}) }}
{{ form_row(form.flatPrice, {label: 'Service-Gebühr'}) }}
<div class="col-md-12 col-sm-12 col-xs-12">
<button type="submit" value="SEND" id="submit"
class="btn btn-primary btn-lg border-radius"

2
trunk/app/Resources/views/default/admin/reservationsEdit.html.twig
View file

@ -15,7 +15,7 @@
<th>Von</th>
<th>Bis</th>
<th>Preis pro Nacht</th>
<th>Pauschalpreis</th>
<th>Service-Gebühr</th>
</tr>
</thead>
<tbody>

2
trunk/app/Resources/views/default/admin/reservationsNew.html.twig
View file

@ -15,7 +15,7 @@
<th>Von</th>
<th>Bis</th>
<th>Preis pro Nacht</th>
<th>Pauschalpreis</th>
<th>Service-Gebühr</th>
</tr>
</thead>
<tbody>

2
trunk/app/Resources/views/default/admin/seasons.html.twig
View file

@ -13,6 +13,7 @@
<th>Name</th>
<th>Von</th>
<th>Bis</th>
<th>Mindestbelegung in Nächte</th>
<th></th>
<th></th>
</tr>
@ -24,6 +25,7 @@
<td>{{ season.name }}</td>
<td>{{ season.fromDate|date('d.m.y') }}</td>
<td>{{ season.toDate|date('d.m.y') }}</td>
<td>{{ season.minimumStay }}</td>
<td>
<a href="{{ '/admin/fewo/seasons/' ~ season.id }}"
class="btn btn-primary"

10
trunk/app/Resources/views/default/components/booking/fewoSummary.html.twig
View file

@ -2,10 +2,10 @@
<tbody>
<tr>
<td class="st-position-price-col">
+ {{ fewo_lodging.deposit|number_format(2) }} €
+ {{ total_price_per_night|number_format(2) }} €
</td>
<td class="st-position-name-col">
Kaution
({{ fewo_booking_request.numberDays }} {{ fewo_price.season.minimumStay < 2 ? 'Nacht' : 'Nächte' }} x {{ fewo_price.perNight|number_format(2) }} €)
</td>
</tr>
<tr>
@ -13,15 +13,15 @@
+ {{ fewo_price.flatPrice|number_format(2) }} €
</td>
<td class="st-position-name-col">
Pauschalpreis
Service-Gebühr
</td>
</tr>
<tr>
<td class="st-position-price-col">
+ {{ total_price_per_night|number_format(2) }} €
+ {{ fewo_lodging.deposit|number_format(2) }} €
</td>
<td class="st-position-name-col">
({{ fewo_booking_request.numberDays }} x {{ fewo_price.perNight|number_format(2) }} €)
Kaution
</td>
</tr>
<tr class="st-total-tr">

2
trunk/app/Resources/views/default/pages/cms/calendarLodgingProgram.html.twig
View file

@ -44,7 +44,7 @@
<td class="{{ cell_class }}">
{% if dayState.isBookable and not is_past_date %}
<a href="{{ page.urlPath }}/buchen?pnr={{ dayState.price.id }}&fd={{ dayState.day < 10 ? '0':'' }}{{dayState.day}}{{ calendar[monthIndex]['monthNumber'] < 10 ? '0':'' }}{{calendar[monthIndex]['monthNumber']}}{{calendar[monthIndex]['year']}}"
style="color: #5a5a5a;"
style="color: #80B176;"
rel="nofollow"
>
{{ dayState.day }}

17
trunk/app/Resources/views/default/pages/cms/fewoTravelProgram.html.twig
View file

@ -31,11 +31,13 @@
<!-- Wrapper for Slides -->
<div class="carousel-inner">
{% for lodging_image in fewo_lodging.images %}
{# @var image \AppBundle\Entity\FewoLodgingImage #}
{# @var lodging_image \AppBundle\Entity\FewoLodgingImage #}
<div class="item{% if loop.first %} active{% endif %}">
<!-- Set the first background image using inline CSS below. -->
{# TODO #}
<div class="fill" style="background-image:url({{ asset('uploads/images/' ~ lodging_image.file) }});"></div>
<div class="fill" style="background-image:url({{ asset('uploads/images/' ~ lodging_image.file) }});">
<span class="image-title">{{ lodging_image.fileName }}</span>
</div>
</div>
{% endfor %}
</div>
@ -88,7 +90,6 @@
#}
<div role="tabpanel" class="tab-pane active" id="travel-description-content-tab">
{#TODO alles wirklich hier? wo bilder?#}
<h3>Allgemeines</h3>
@ -171,8 +172,9 @@
<th>Name</th>
<th>Beginn</th>
<th>Ende</th>
<th>Preis p.P. pro Nacht</th>
<th>Pauschalpreis</th>
<th>Mindestbelegung</th>
<th>Preis pro Nacht</th>
<th>Service-Gebühr</th>
<th>Kaution</th>
</tr>
</thead>
@ -190,10 +192,13 @@
<td data-title="Ende">
{{ price.season.toDate|date }}
</td>
<td data-title="Mindestbelegung">
{{ price.season.minimumStay }} {{ price.season.minimumStay < 2 ? 'Nacht' : 'Nächte' }}
</td>
<td data-title="Preis p.P pro Nacht">
{{ price.perNight|number_format(2, ',', '.') }} €
</td>
<td data-title="Pauschalpreis">
<td data-title="Service-Gebühr">
{{ price.flatPrice|number_format(2, ',', '.') }} €
</td>
<td data-title="Kaution">

10
trunk/app/Resources/views/default/pages/fewoBooking.html.twig
View file

@ -22,12 +22,12 @@
<h1>Buchungsformular FeWo</h1>
{#
<div class="pull-right">
<a href="{{ page.urlPath }}" class="btn btn-primary btn-sm"><< zurück zu Termine und Preise</a>
</div>
<div class="clearfix"></div>
#}
<h2 style="margin-top:10px">{{ lodging.name }}</h2>
@ -67,6 +67,12 @@
{{ form_errors(form.toDate) }}
</td>
</tr>
<tr>
<td>Mindestbelegung</td>
<td>
{{ fewo_price.season.minimumStay }} {{ fewo_price.season.minimumStay < 2 ? 'Nacht' : 'Nächte' }}
</td>
</tr>
<tr>
<td>{{ form_label(form.travelerCount, 'Reiseteilnehmer') }}</td>
<td>