From b8ec81329a61d9ac614eae8a3876df5ba06c64ea Mon Sep 17 00:00:00 2001 From: uli Date: Tue, 14 Mar 2017 08:01:57 +0000 Subject: [PATCH] =?UTF-8?q?*=20rel=3D"nofollow"=20und=20target=3D"=5Fblank?= =?UTF-8?q?"=20f=C3=BCr=20verschiedene=20externe=20Links=20*=20Mindestprei?= =?UTF-8?q?s=20im=20Slider=20oben=20im=20Reiseprogramm=20nicht=20anzeigen,?= =?UTF-8?q?=20wenn=20keine=20Termine=20vorhanden=20sind=20*=20Tripodo-Expo?= =?UTF-8?q?rt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3315 f459cee4-fb09-11de-96c3-f9c5f16c3c76 --- .../views/default/components/footer.html.twig | 4 +- .../views/default/components/header.html.twig | 2 +- .../default/components/home/slider.html.twig | 2 +- .../default/components/pageBoxImage.html.twig | 2 +- .../default/components/sidebar.html.twig | 4 +- .../default/pages/cms/travelProgram.html.twig | 9 +- .../Resources/views/default/tripodo.xml.twig | 119 ++++++++++++++++++ trunk/app/config/parameters.yml.dist | 6 + trunk/composer.lock | 28 ++++- .../Command/TripodoExportCommand.php | 78 ++++++++++++ trunk/src/AppBundle/Entity/TravelCountry.php | 39 ++++++ trunk/src/AppBundle/Entity/TravelDate.php | 11 +- .../AppBundle/Entity/TravelDestination.php | 3 +- trunk/src/AppBundle/Entity/TravelProgram.php | 45 ++++++- .../Entity/TravelProgramRepository.php | 24 ++++ .../Listener/KernelControllerListener.php | 9 ++ trunk/src/AppBundle/Util.php | 13 ++ 17 files changed, 380 insertions(+), 18 deletions(-) create mode 100644 trunk/app/Resources/views/default/tripodo.xml.twig create mode 100644 trunk/src/AppBundle/Command/TripodoExportCommand.php diff --git a/trunk/app/Resources/views/default/components/footer.html.twig b/trunk/app/Resources/views/default/components/footer.html.twig index 6bb252f2..37861c62 100644 --- a/trunk/app/Resources/views/default/components/footer.html.twig +++ b/trunk/app/Resources/views/default/components/footer.html.twig @@ -16,8 +16,8 @@
diff --git a/trunk/app/Resources/views/default/components/header.html.twig b/trunk/app/Resources/views/default/components/header.html.twig index 6f33f6f3..62015fb1 100644 --- a/trunk/app/Resources/views/default/components/header.html.twig +++ b/trunk/app/Resources/views/default/components/header.html.twig @@ -35,7 +35,7 @@
  • Kulturreisen
  • diff --git a/trunk/app/Resources/views/default/components/home/slider.html.twig b/trunk/app/Resources/views/default/components/home/slider.html.twig index da92013a..0d0a5162 100644 --- a/trunk/app/Resources/views/default/components/home/slider.html.twig +++ b/trunk/app/Resources/views/default/components/home/slider.html.twig @@ -8,7 +8,7 @@
    - eKomi - The Feedback Company: + eKomi - The Feedback Company:
    • Spezialist für Kulturreisen
      • diff --git a/trunk/app/Resources/views/default/components/pageBoxImage.html.twig b/trunk/app/Resources/views/default/components/pageBoxImage.html.twig index a732e708..5ff6ab0c 100644 --- a/trunk/app/Resources/views/default/components/pageBoxImage.html.twig +++ b/trunk/app/Resources/views/default/components/pageBoxImage.html.twig @@ -8,4 +8,4 @@ {% set image_url = '/bundles/app/images/no-picture.png' %} {% set image_alt = 'Kein Vorschaubild vorhanden' %} {% endif %} -
      \ No newline at end of file +
      \ No newline at end of file diff --git a/trunk/app/Resources/views/default/components/sidebar.html.twig b/trunk/app/Resources/views/default/components/sidebar.html.twig index 09f3c70d..e8b3b3f5 100644 --- a/trunk/app/Resources/views/default/components/sidebar.html.twig +++ b/trunk/app/Resources/views/default/components/sidebar.html.twig @@ -32,13 +32,13 @@ TOP bewertet
    - + {% image '@AppBundle/Resources/public/images/siegel_sehr_gut_SternTours.jpg' %}Netzsieger.de bewertet STERN TOURS{% endimage %}
    - +
    diff --git a/trunk/app/Resources/views/default/pages/cms/travelProgram.html.twig b/trunk/app/Resources/views/default/pages/cms/travelProgram.html.twig index a6672ce1..db0030f8 100644 --- a/trunk/app/Resources/views/default/pages/cms/travelProgram.html.twig +++ b/trunk/app/Resources/views/default/pages/cms/travelProgram.html.twig @@ -19,10 +19,11 @@ ********* SLIDER ********* #} -
    - -
    ab {{ travel_program.lowestPrice|number_format }} € p.P.
    -
    + {% if travel_program.lowestPrice > 0 %} +
    +
    ab {{ travel_program.lowestPrice|number_format }} € p.P.
    +
    + {% endif %}