From 5d0f4e5cc9cb26809d55f96c9d6a606458400934 Mon Sep 17 00:00:00 2001
From: adametz <adametz@f459cee4-fb09-11de-96c3-f9c5f16c3c76>
Date: Wed, 20 Jun 2018 15:19:38 +0000
Subject: [PATCH] #1429 Templates

git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3414 f459cee4-fb09-11de-96c3-f9c5f16c3c76
---
 .../views/default/pages/booking.html.twig     | 23 ++++++++++++++-----
 .../pages/bookingConfirmation.html.twig       | 23 ++++++++++++++-----
 .../pages/cms/travelProgramPDF.html.twig      | 13 +++++++++--
 3 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/trunk/app/Resources/views/default/pages/booking.html.twig b/trunk/app/Resources/views/default/pages/booking.html.twig
index 82f4bf37..b0612370 100644
--- a/trunk/app/Resources/views/default/pages/booking.html.twig
+++ b/trunk/app/Resources/views/default/pages/booking.html.twig
@@ -235,12 +235,23 @@
                                                         <li>{{ travel_program_service|raw }}</li>
                                                     {% endfor %}
                                                 </ul>
-                                                <h3>Hinweise</h3>
-                                                <ul class="c1">
-                                                    {% for travel_program_service in travel_program.advices|split('\n') %}
-                                                        <li>{{ travel_program_service|raw }}</li>
-                                                    {% endfor %}
-                                                </ul>
+                                                {% if (travel_program.advices is not empty) or (travel_program.generalnote is not empty) %}
+                                                    <h3>Hinweise</h3>
+                                                    <ul>
+                                                         {% if travel_program.generalnote is not empty %}
+                                                             {% for notes in travel_program.generalnote.text|trim|split('\n') %}
+                                                                 {% if notes is not empty %}
+                                                                    <li>{{ notes|raw }}</li>
+                                                                  {% endif %}
+                                                             {% endfor %}
+                                                        {% endif %}
+                                                        {% for travel_program_advice in travel_program.advices|trim|split('\n') %}
+                                                            {% if travel_program_advice is not empty %}
+                                                            <li>{{ travel_program_advice|raw }}</li>
+                                                             {% endif %}
+                                                        {% endfor %}
+                                                    </ul>
+                                                {% endif %}
                                             </div>
                                         </div>
                                     </div>
diff --git a/trunk/app/Resources/views/default/pages/bookingConfirmation.html.twig b/trunk/app/Resources/views/default/pages/bookingConfirmation.html.twig
index 138936b5..52e4228f 100644
--- a/trunk/app/Resources/views/default/pages/bookingConfirmation.html.twig
+++ b/trunk/app/Resources/views/default/pages/bookingConfirmation.html.twig
@@ -97,12 +97,23 @@
                                                         <li>{{ travel_program_service|raw }}</li>
                                                     {% endfor %}
                                                 </ul>
-                                                <h3>Hinweise</h3>
-                                                <ul class="c1">
-                                                    {% for travel_program_service in travel_program.advices|split('\n') %}
-                                                        <li>{{ travel_program_service|raw }}</li>
-                                                    {% endfor %}
-                                                </ul>
+                                                {% if (travel_program.advices is not empty) or (travel_program.generalnote is not empty) %}
+                                                    <h3>Hinweise</h3>
+                                                    <ul>
+                                                         {% if travel_program.generalnote is not empty %}
+                                                             {% for notes in travel_program.generalnote.text|trim|split('\n') %}
+                                                                 {% if notes is not empty %}
+                                                                    <li>{{ notes|raw }}</li>
+                                                                  {% endif %}
+                                                             {% endfor %}
+                                                        {% endif %}
+                                                        {% for travel_program_advice in travel_program.advices|trim|split('\n') %}
+                                                            {% if travel_program_advice is not empty %}
+                                                            <li>{{ travel_program_advice|raw }}</li>
+                                                             {% endif %}
+                                                        {% endfor %}
+                                                    </ul>
+                                                {% endif %}
                                             </div>
                                         </div>
                                     </div>
diff --git a/trunk/app/Resources/views/default/pages/cms/travelProgramPDF.html.twig b/trunk/app/Resources/views/default/pages/cms/travelProgramPDF.html.twig
index f2234397..8531b40e 100644
--- a/trunk/app/Resources/views/default/pages/cms/travelProgramPDF.html.twig
+++ b/trunk/app/Resources/views/default/pages/cms/travelProgramPDF.html.twig
@@ -23,11 +23,20 @@
     </ul>
 {% endif %}
 
-{% if travel_program.advices is not empty %}
+{% if (travel_program.advices is not empty) or (travel_program.generalnote is not empty) %}
     <h3>Hinweise</h3>
     <ul>
+         {% if travel_program.generalnote is not empty %}
+             {% for notes in travel_program.generalnote.text|trim|split('\n') %}
+                 {% if notes is not empty %}
+                    <li>{{ notes|raw }}</li>
+                  {% endif %}
+             {% endfor %}
+        {% endif %}
         {% for travel_program_advice in travel_program.advices|trim|split('\n') %}
+            {% if travel_program_advice is not empty %}
             <li>{{ travel_program_advice|raw }}</li>
+             {% endif %}
         {% endfor %}
     </ul>
-{% endif %}
+{% endif %}
\ No newline at end of file