diff --git a/trunk/app/Resources/views/base.html.twig b/trunk/app/Resources/views/base.html.twig index 58e1c4d2..9769c0e3 100644 --- a/trunk/app/Resources/views/base.html.twig +++ b/trunk/app/Resources/views/base.html.twig @@ -8,7 +8,9 @@ - {% block page_title %}{{ page is defined ? page.pagetitle : 'Kulturreisen vom Reiseveranstalter STERN TOURS aus Berlin' }}{% endblock page_title %} + {% block page_title %} + {{ page is defined ? page.pagetitle : iq_page_title is defined ? iq_page_title : 'Kulturreisen vom Reiseveranstalter STERN TOURS aus Berlin' }} + {% endblock page_title %} {% block metatags %} @@ -17,20 +19,18 @@ {% block meta_description -%} {%- if page is defined and page.description is not empty -%} - {%- elseif app.debug -%} - + {%- endif -%} + {%- if iq_page_description is defined and iq_page_description is not empty -%} + {%- endif -%} {%- endblock %} {% block meta_keywords -%} {%- if page is defined and page.keywords is not empty -%} - {%- elseif app.debug -%} - {%- endif -%} {%- endblock %} {% block meta_robots %} - {% if app.debug %}{% endif %} {% endblock %} {% endblock %} diff --git a/trunk/app/Resources/views/default/components/header.html.twig b/trunk/app/Resources/views/default/components/header.html.twig index 2b3c458b..c1452c9a 100644 --- a/trunk/app/Resources/views/default/components/header.html.twig +++ b/trunk/app/Resources/views/default/components/header.html.twig @@ -66,7 +66,7 @@ {% for key, val in local %} - + {% if val.active == 0 %} {% else %} @@ -107,7 +107,7 @@
{{ val.day }} {{ key }}{{ val.day }} {{ val.date }}geschlossen
{% for key, val in phone %} - + {% if val.active == 0 %} {% else %} diff --git a/trunk/app/Resources/views/default/email/bookingServiceEmail.txt.twig b/trunk/app/Resources/views/default/email/bookingServiceEmail.txt.twig index 0a063408..712597d7 100644 --- a/trunk/app/Resources/views/default/email/bookingServiceEmail.txt.twig +++ b/trunk/app/Resources/views/default/email/bookingServiceEmail.txt.twig @@ -1,7 +1,15 @@ FOLGENDE REISE WURDE GEBUCHT: -URL: {{ travel_program_url }} +Anfrage Nr +{{ lead_id }} -CRM: {{ crm_url }} +URL +{{ travel_program_url }} + +CRM + +{{ crm_v1_url }} + +{{ crm_v3_url }} {% include 'default/email/components/bookingSummary.txt.twig' %} \ No newline at end of file diff --git a/trunk/app/Resources/views/default/email/fewoBookingServiceEmail.txt.twig b/trunk/app/Resources/views/default/email/fewoBookingServiceEmail.txt.twig index 6088619c..50e9688b 100644 --- a/trunk/app/Resources/views/default/email/fewoBookingServiceEmail.txt.twig +++ b/trunk/app/Resources/views/default/email/fewoBookingServiceEmail.txt.twig @@ -1,7 +1,9 @@ Folgende Wohnung wurde gemietet -URL: {{ lodging_url }} +URL: +{{ lodging_url }} -CRM: {{ crm_url }} +CRM: +{{ crm_url }} {% include 'default/email/components/fewoBookingSummary.txt.twig' %} \ No newline at end of file diff --git a/trunk/app/Resources/views/default/pages/bookingConfirmation.html.twig b/trunk/app/Resources/views/default/pages/bookingConfirmation.html.twig index 7d66c4a3..1924d97e 100644 --- a/trunk/app/Resources/views/default/pages/bookingConfirmation.html.twig +++ b/trunk/app/Resources/views/default/pages/bookingConfirmation.html.twig @@ -142,9 +142,9 @@ @@ -163,7 +163,7 @@ - + @@ -175,7 +175,7 @@ - + @@ -187,7 +187,7 @@ - +
{{ val.day }} {{ key }}{{ val.day }} {{ val.date }}geschlossen
Anrede - {% if booking.salutation == 1 %} + {% if booking.salutationId == 1 %} Herr - {% elseif booking.salutation == 2 %} + {% elseif booking.salutationId == 2 %} Frau {% endif %}
Straße, Hausnummer{{ booking.street }} {{ booking.houseNr }}{{ booking.street }}
PLZ
Land{{ booking.country }}{{ booking.countryId }}
Telefon tagsüber
E-Mail-Adresse{{ booking.mail }}{{ booking.email }}
diff --git a/trunk/app/Resources/views/default/pages/cms/fewoTravelProgram.html.twig b/trunk/app/Resources/views/default/pages/cms/fewoTravelProgram.html.twig index 77098ee2..cbf47ca7 100644 --- a/trunk/app/Resources/views/default/pages/cms/fewoTravelProgram.html.twig +++ b/trunk/app/Resources/views/default/pages/cms/fewoTravelProgram.html.twig @@ -29,7 +29,7 @@