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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -2,10 +2,10 @@
<tbody> <tbody>
<tr> <tr>
<td class="st-position-price-col"> <td class="st-position-price-col">
+ {{ fewo_lodging.deposit|number_format(2) }} + {{ total_price_per_night|number_format(2) }}
</td> </td>
<td class="st-position-name-col"> <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> </td>
</tr> </tr>
<tr> <tr>
@ -13,15 +13,15 @@
+ {{ fewo_price.flatPrice|number_format(2) }} + {{ fewo_price.flatPrice|number_format(2) }}
</td> </td>
<td class="st-position-name-col"> <td class="st-position-name-col">
Pauschalpreis Service-Gebühr
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="st-position-price-col"> <td class="st-position-price-col">
+ {{ total_price_per_night|number_format(2) }} + {{ fewo_lodging.deposit|number_format(2) }}
</td> </td>
<td class="st-position-name-col"> <td class="st-position-name-col">
({{ fewo_booking_request.numberDays }} x {{ fewo_price.perNight|number_format(2) }} €) Kaution
</td> </td>
</tr> </tr>
<tr class="st-total-tr"> <tr class="st-total-tr">

View file

@ -44,7 +44,7 @@
<td class="{{ cell_class }}"> <td class="{{ cell_class }}">
{% if dayState.isBookable and not is_past_date %} {% 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']}}" <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" rel="nofollow"
> >
{{ dayState.day }} {{ dayState.day }}

View file

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

View file

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

View file

@ -52,6 +52,7 @@ class CmsController extends Controller
return $this->render('default/pages/cms/overview.html.twig', [ return $this->render('default/pages/cms/overview.html.twig', [
'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..').DIRECTORY_SEPARATOR, 'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..').DIRECTORY_SEPARATOR,
'page' => $page, 'page' => $page,
// TODO
]); ]);
} }
@ -145,7 +146,8 @@ class CmsController extends Controller
'page' => $page, 'page' => $page,
'fewo_lodging' => $lodging, 'fewo_lodging' => $lodging,
//'lodging' => $lodging, //so wurde es im AdminController aufgerufen //'lodging' => $lodging, //so wurde es im AdminController aufgerufen
'calendar' => $calendar 'calendar' => $calendar,
'show_search_sidebar_widget' => false,
]); ]);
} }

View file

@ -194,6 +194,7 @@ class FewoBookingController extends Controller
'fewo_price' => $price, 'fewo_price' => $price,
'total_price' => $totalPrice, 'total_price' => $totalPrice,
'total_price_per_night' => $perDayTotalPrice, 'total_price_per_night' => $perDayTotalPrice,
'show_search_sidebar_widget' => false,
]); ]);
} }
@ -207,6 +208,8 @@ class FewoBookingController extends Controller
'fewo_price' => $price, 'fewo_price' => $price,
'total_price' => $totalPrice, 'total_price' => $totalPrice,
'total_price_per_night' => $perDayTotalPrice, 'total_price_per_night' => $perDayTotalPrice,
'page' => $fewoTravelProgramPage,
'show_search_sidebar_widget' => false,
]); ]);

View file

@ -509,7 +509,7 @@
} }
.table > tbody > tr > .calendar-day-disabled { .table > tbody > tr > .calendar-day-disabled {
background-color: darkgrey; background-color: @background-red;
} }
.table > tbody > tr > .admin-calendar-day-reservation { .table > tbody > tr > .admin-calendar-day-reservation {
background-color: @background-red; background-color: @background-red;
@ -530,11 +530,11 @@
} }
.table > tbody > tr > .calendar-day-reservation-begin { .table > tbody > tr > .calendar-day-reservation-begin {
.calendar-day-dual-state(#f2f2f2, darkgrey); .calendar-day-dual-state(#f2f2f2, @background-red);
} }
.table > tbody > tr > .calendar-day-reservation-end { .table > tbody > tr > .calendar-day-reservation-end {
.calendar-day-dual-state(darkgrey, #f2f2f2); .calendar-day-dual-state(@background-red, #f2f2f2);
} }
.table > tbody > tr > .admin-calendar-day-reservation-begin { .table > tbody > tr > .admin-calendar-day-reservation-begin {
@ -544,3 +544,11 @@
.table > tbody > tr > .admin-calendar-day-reservation-end { .table > tbody > tr > .admin-calendar-day-reservation-end {
.calendar-day-dual-state(@background-red, @background-green); .calendar-day-dual-state(@background-red, @background-green);
} }
.image-title {
padding: 4px 6px;
color: white;
font-size: 16px;
font-weight: 600;
background-color: rgba(0, 0, 0, 0.66)
}

View file

@ -34,6 +34,7 @@
@font-size-def-h6: ceil((@font-size-alternative-base * 0.85)); @font-size-def-h6: ceil((@font-size-alternative-base * 0.85));
@background-green: #648859; @background-green: #648859;
@background-red: #d9534f; @background-red: #f0bcbc;
@font-green: #80B176;
@btn-color-all: @background-green; @btn-color-all: @background-green;

View file

@ -1058,74 +1058,81 @@ a[id^="video_"]:before,
color: #ffffff !important; color: #ffffff !important;
} }
.table > tbody > tr > .calendar-day-disabled { .table > tbody > tr > .calendar-day-disabled {
background-color: darkgrey; background-color: #f0bcbc;
} }
.table > tbody > tr > .admin-calendar-day-reservation { .table > tbody > tr > .admin-calendar-day-reservation {
background-color: #d9534f; background-color: #f0bcbc;
} }
.table > tbody > tr > .admin-calendar-day-free { .table > tbody > tr > .admin-calendar-day-free {
background-color: #648859; background-color: #648859;
} }
.table > tbody > tr > .calendar-day-reservation-begin { .table > tbody > tr > .calendar-day-reservation-begin {
background-color: #a9a9a9; background-color: #f0bcbc;
background: -moz-linear-gradient(to bottom right, #f2f2f2 0%, #f2f2f2 49%, #a9a9a9 50%, #a9a9a9 100%); background: -moz-linear-gradient(to bottom right, #f2f2f2 0%, #f2f2f2 49%, #f0bcbc 50%, #f0bcbc 100%);
/* ff3.6+ */ /* ff3.6+ */
background: -webkit-gradient(linear, left top, right bottom, color-stop(0%, #f2f2f2), color-stop(49%, #f2f2f2), color-stop(50%, #a9a9a9), color-stop(100%, #a9a9a9)); background: -webkit-gradient(linear, left top, right bottom, color-stop(0%, #f2f2f2), color-stop(49%, #f2f2f2), color-stop(50%, #f0bcbc), color-stop(100%, #f0bcbc));
/* safari4+,chrome */ /* safari4+,chrome */
background: -webkit-linear-gradient(to bottom right, #f2f2f2 0%, #f2f2f2 49%, #a9a9a9 50%, #a9a9a9 100%); background: -webkit-linear-gradient(to bottom right, #f2f2f2 0%, #f2f2f2 49%, #f0bcbc 50%, #f0bcbc 100%);
/* safari5.1+,chrome10+ */ /* safari5.1+,chrome10+ */
background: -o-linear-gradient(to bottom right, #f2f2f2 0%, #f2f2f2 49%, #a9a9a9 50%, #a9a9a9 100%); background: -o-linear-gradient(to bottom right, #f2f2f2 0%, #f2f2f2 49%, #f0bcbc 50%, #f0bcbc 100%);
/* opera 11.10+ */ /* opera 11.10+ */
background: -ms-linear-gradient(to bottom right, #f2f2f2 0%, #f2f2f2 49%, #a9a9a9 50%, #a9a9a9 100%); background: -ms-linear-gradient(to bottom right, #f2f2f2 0%, #f2f2f2 49%, #f0bcbc 50%, #f0bcbc 100%);
/* ie10+ */ /* ie10+ */
background: linear-gradient(to bottom right, #f2f2f2 0%, #f2f2f2 49%, #a9a9a9 50%, #a9a9a9 100%); background: linear-gradient(to bottom right, #f2f2f2 0%, #f2f2f2 49%, #f0bcbc 50%, #f0bcbc 100%);
/* w3c */ /* w3c */
} }
.table > tbody > tr > .calendar-day-reservation-end { .table > tbody > tr > .calendar-day-reservation-end {
background-color: #f2f2f2; background-color: #f2f2f2;
background: -moz-linear-gradient(to bottom right, #a9a9a9 0%, #a9a9a9 49%, #f2f2f2 50%, #f2f2f2 100%); background: -moz-linear-gradient(to bottom right, #f0bcbc 0%, #f0bcbc 49%, #f2f2f2 50%, #f2f2f2 100%);
/* ff3.6+ */ /* ff3.6+ */
background: -webkit-gradient(linear, left top, right bottom, color-stop(0%, #a9a9a9), color-stop(49%, #a9a9a9), color-stop(50%, #f2f2f2), color-stop(100%, #f2f2f2)); background: -webkit-gradient(linear, left top, right bottom, color-stop(0%, #f0bcbc), color-stop(49%, #f0bcbc), color-stop(50%, #f2f2f2), color-stop(100%, #f2f2f2));
/* safari4+,chrome */ /* safari4+,chrome */
background: -webkit-linear-gradient(to bottom right, #a9a9a9 0%, #a9a9a9 49%, #f2f2f2 50%, #f2f2f2 100%); background: -webkit-linear-gradient(to bottom right, #f0bcbc 0%, #f0bcbc 49%, #f2f2f2 50%, #f2f2f2 100%);
/* safari5.1+,chrome10+ */ /* safari5.1+,chrome10+ */
background: -o-linear-gradient(to bottom right, #a9a9a9 0%, #a9a9a9 49%, #f2f2f2 50%, #f2f2f2 100%); background: -o-linear-gradient(to bottom right, #f0bcbc 0%, #f0bcbc 49%, #f2f2f2 50%, #f2f2f2 100%);
/* opera 11.10+ */ /* opera 11.10+ */
background: -ms-linear-gradient(to bottom right, #a9a9a9 0%, #a9a9a9 49%, #f2f2f2 50%, #f2f2f2 100%); background: -ms-linear-gradient(to bottom right, #f0bcbc 0%, #f0bcbc 49%, #f2f2f2 50%, #f2f2f2 100%);
/* ie10+ */ /* ie10+ */
background: linear-gradient(to bottom right, #a9a9a9 0%, #a9a9a9 49%, #f2f2f2 50%, #f2f2f2 100%); background: linear-gradient(to bottom right, #f0bcbc 0%, #f0bcbc 49%, #f2f2f2 50%, #f2f2f2 100%);
/* w3c */ /* w3c */
} }
.table > tbody > tr > .admin-calendar-day-reservation-begin { .table > tbody > tr > .admin-calendar-day-reservation-begin {
background-color: #d9534f; background-color: #f0bcbc;
background: -moz-linear-gradient(to bottom right, #648859 0%, #648859 49%, #d9534f 50%, #d9534f 100%); background: -moz-linear-gradient(to bottom right, #648859 0%, #648859 49%, #f0bcbc 50%, #f0bcbc 100%);
/* ff3.6+ */ /* ff3.6+ */
background: -webkit-gradient(linear, left top, right bottom, color-stop(0%, #648859), color-stop(49%, #648859), color-stop(50%, #d9534f), color-stop(100%, #d9534f)); background: -webkit-gradient(linear, left top, right bottom, color-stop(0%, #648859), color-stop(49%, #648859), color-stop(50%, #f0bcbc), color-stop(100%, #f0bcbc));
/* safari4+,chrome */ /* safari4+,chrome */
background: -webkit-linear-gradient(to bottom right, #648859 0%, #648859 49%, #d9534f 50%, #d9534f 100%); background: -webkit-linear-gradient(to bottom right, #648859 0%, #648859 49%, #f0bcbc 50%, #f0bcbc 100%);
/* safari5.1+,chrome10+ */ /* safari5.1+,chrome10+ */
background: -o-linear-gradient(to bottom right, #648859 0%, #648859 49%, #d9534f 50%, #d9534f 100%); background: -o-linear-gradient(to bottom right, #648859 0%, #648859 49%, #f0bcbc 50%, #f0bcbc 100%);
/* opera 11.10+ */ /* opera 11.10+ */
background: -ms-linear-gradient(to bottom right, #648859 0%, #648859 49%, #d9534f 50%, #d9534f 100%); background: -ms-linear-gradient(to bottom right, #648859 0%, #648859 49%, #f0bcbc 50%, #f0bcbc 100%);
/* ie10+ */ /* ie10+ */
background: linear-gradient(to bottom right, #648859 0%, #648859 49%, #d9534f 50%, #d9534f 100%); background: linear-gradient(to bottom right, #648859 0%, #648859 49%, #f0bcbc 50%, #f0bcbc 100%);
/* w3c */ /* w3c */
} }
.table > tbody > tr > .admin-calendar-day-reservation-end { .table > tbody > tr > .admin-calendar-day-reservation-end {
background-color: #648859; background-color: #648859;
background: -moz-linear-gradient(to bottom right, #d9534f 0%, #d9534f 49%, #648859 50%, #648859 100%); background: -moz-linear-gradient(to bottom right, #f0bcbc 0%, #f0bcbc 49%, #648859 50%, #648859 100%);
/* ff3.6+ */ /* ff3.6+ */
background: -webkit-gradient(linear, left top, right bottom, color-stop(0%, #d9534f), color-stop(49%, #d9534f), color-stop(50%, #648859), color-stop(100%, #648859)); background: -webkit-gradient(linear, left top, right bottom, color-stop(0%, #f0bcbc), color-stop(49%, #f0bcbc), color-stop(50%, #648859), color-stop(100%, #648859));
/* safari4+,chrome */ /* safari4+,chrome */
background: -webkit-linear-gradient(to bottom right, #d9534f 0%, #d9534f 49%, #648859 50%, #648859 100%); background: -webkit-linear-gradient(to bottom right, #f0bcbc 0%, #f0bcbc 49%, #648859 50%, #648859 100%);
/* safari5.1+,chrome10+ */ /* safari5.1+,chrome10+ */
background: -o-linear-gradient(to bottom right, #d9534f 0%, #d9534f 49%, #648859 50%, #648859 100%); background: -o-linear-gradient(to bottom right, #f0bcbc 0%, #f0bcbc 49%, #648859 50%, #648859 100%);
/* opera 11.10+ */ /* opera 11.10+ */
background: -ms-linear-gradient(to bottom right, #d9534f 0%, #d9534f 49%, #648859 50%, #648859 100%); background: -ms-linear-gradient(to bottom right, #f0bcbc 0%, #f0bcbc 49%, #648859 50%, #648859 100%);
/* ie10+ */ /* ie10+ */
background: linear-gradient(to bottom right, #d9534f 0%, #d9534f 49%, #648859 50%, #648859 100%); background: linear-gradient(to bottom right, #f0bcbc 0%, #f0bcbc 49%, #648859 50%, #648859 100%);
/* w3c */ /* w3c */
} }
.image-title {
padding: 4px 6px;
color: white;
font-size: 16px;
font-weight: 600;
background-color: rgba(0, 0, 0, 0.66);
}
/* /*
7) SHORTCODES 7) SHORTCODES
=============================================================== ===============================================================