From 45977fd4de881472e61e3c0716806e1205e6b090 Mon Sep 17 00:00:00 2001 From: "valentin.wacker" Date: Thu, 2 Nov 2017 12:29:09 +0000 Subject: [PATCH] #1352 git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3358 f459cee4-fb09-11de-96c3-f9c5f16c3c76 --- .../default/admin/lodgingsEdit.html.twig | 2 +- .../views/default/admin/pricesEdit.html.twig | 2 +- .../views/default/admin/pricesNew.html.twig | 2 +- .../default/admin/reservationsEdit.html.twig | 2 +- .../default/admin/reservationsNew.html.twig | 2 +- .../views/default/admin/seasons.html.twig | 2 + .../components/booking/fewoSummary.html.twig | 10 +-- .../cms/calendarLodgingProgram.html.twig | 2 +- .../pages/cms/fewoTravelProgram.html.twig | 17 +++-- .../views/default/pages/fewoBooking.html.twig | 10 ++- .../AppBundle/Controller/CmsController.php | 4 +- .../Controller/FewoBookingController.php | 3 + .../assets/less/includes/travel.less | 14 ++++- .../assets/less/theme_variables.less | 3 +- .../AppBundle/Resources/public/css/custom.css | 63 ++++++++++--------- 15 files changed, 86 insertions(+), 52 deletions(-) diff --git a/trunk/app/Resources/views/default/admin/lodgingsEdit.html.twig b/trunk/app/Resources/views/default/admin/lodgingsEdit.html.twig index 4e461392..d2d717a6 100644 --- a/trunk/app/Resources/views/default/admin/lodgingsEdit.html.twig +++ b/trunk/app/Resources/views/default/admin/lodgingsEdit.html.twig @@ -91,7 +91,7 @@ Bis Mindestbelegung Preis pro Nacht - Pauschalpreis + Service-Gebühr diff --git a/trunk/app/Resources/views/default/admin/pricesEdit.html.twig b/trunk/app/Resources/views/default/admin/pricesEdit.html.twig index c219abc6..a6fc9fab 100644 --- a/trunk/app/Resources/views/default/admin/pricesEdit.html.twig +++ b/trunk/app/Resources/views/default/admin/pricesEdit.html.twig @@ -15,7 +15,7 @@
{{ 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'}) }}