diff --git a/trunk/app/Resources/views/base.html.twig b/trunk/app/Resources/views/base.html.twig index 91b75722..9f46a2c5 100644 --- a/trunk/app/Resources/views/base.html.twig +++ b/trunk/app/Resources/views/base.html.twig @@ -5,9 +5,11 @@ - - - + {% block metatags %} + + + + {% endblock %} STERNTOURS diff --git a/trunk/app/Resources/views/default/components/footer.html.twig b/trunk/app/Resources/views/default/components/footer.html.twig index 9fdae54b..f98169e6 100644 --- a/trunk/app/Resources/views/default/components/footer.html.twig +++ b/trunk/app/Resources/views/default/components/footer.html.twig @@ -112,7 +112,7 @@
-

STERN TOURS © 2016

+

STERN TOURS © {{ 'now'|date('Y') }}

diff --git a/trunk/app/Resources/views/default/components/pageBox.html.twig b/trunk/app/Resources/views/default/components/pageBox.html.twig index 55523da9..62c8397c 100644 --- a/trunk/app/Resources/views/default/components/pageBox.html.twig +++ b/trunk/app/Resources/views/default/components/pageBox.html.twig @@ -7,7 +7,7 @@ {% if child_page.boxStar is not empty %}
{{ child_page.boxStar|raw }}
{% endif %} - {% if child_page.travelProgram is not empty %} + {% if child_page.travelProgram is not empty and child_page.travelProgram.lowestPrice > 0 %}
ab {{ child_page.travelProgram.lowestPrice|number_format }} € p.P.
{% endif %} {% if child_page.boxDiscount is not empty %} diff --git a/trunk/app/Resources/views/default/pages/booking.html.twig b/trunk/app/Resources/views/default/pages/booking.html.twig index a6a4a078..d1db97a3 100644 --- a/trunk/app/Resources/views/default/pages/booking.html.twig +++ b/trunk/app/Resources/views/default/pages/booking.html.twig @@ -1,6 +1,11 @@ {% extends 'base.html.twig' %} {% form_theme form 'default/form/theme.html.twig' %} +{% block metatags %} + {{ parent() }} + +{% endblock %} + {% block stylesheets %} {{ parent() }} {% stylesheets 'bundles/app/css/booking.css' filter='cssrewrite' %} @@ -339,8 +344,15 @@ {{ form_widget(form.acceptTerms) }} {{ form_errors(form.acceptTerms) }} diff --git a/trunk/app/Resources/views/default/pages/overview.html.twig b/trunk/app/Resources/views/default/pages/overview.html.twig index 71e9addb..d80de99b 100644 --- a/trunk/app/Resources/views/default/pages/overview.html.twig +++ b/trunk/app/Resources/views/default/pages/overview.html.twig @@ -1,8 +1,10 @@ {% extends 'base.html.twig' %} +{# {% block nav_sidebar_widget %} {% include 'default/components/sidebar/navSidebarWidget.html.twig' %} {% endblock %} +#} {% block body %}
diff --git a/trunk/app/Resources/views/default/pages/travelProgram.html.twig b/trunk/app/Resources/views/default/pages/travelProgram.html.twig index b4501299..bb408635 100644 --- a/trunk/app/Resources/views/default/pages/travelProgram.html.twig +++ b/trunk/app/Resources/views/default/pages/travelProgram.html.twig @@ -179,6 +179,7 @@ Buchungsformular diff --git a/trunk/src/AppBundle/Controller/BookingController.php b/trunk/src/AppBundle/Controller/BookingController.php index 92d2d979..9b7f8b5d 100644 --- a/trunk/src/AppBundle/Controller/BookingController.php +++ b/trunk/src/AppBundle/Controller/BookingController.php @@ -146,7 +146,10 @@ class BookingController extends Controller 'price_type_by_id' => $this->priceTypeById, 'breadcrumb_entries' => $breadcrumbEntries, 'summary' => $htmlSummary, - 'total_price' => $totalPrice + 'total_price' => $totalPrice, + 'mediator_terms_filename' => $travelProgram->getIsMediated() + ? $this->getDoctrine()->getRepository('AppBundle:TravelOrganizer')->find(1)->getFileName() + : null ]); } elseif ($action == '/berechne-gesamtpreis') diff --git a/trunk/src/AppBundle/Controller/DefaultController.php b/trunk/src/AppBundle/Controller/DefaultController.php index a75f1042..f4ac617b 100644 --- a/trunk/src/AppBundle/Controller/DefaultController.php +++ b/trunk/src/AppBundle/Controller/DefaultController.php @@ -61,9 +61,11 @@ class DefaultController extends Controller // #WORKAROUND Special navigation logic here adapted from the old website: Don't show child entries // #TODO Only applies at level 0 + /* 'nav_pages' => $page->getChildren(), 'nav_child_pages' => [], 'nav_open_node' => null + */ ]); } @@ -160,8 +162,16 @@ class DefaultController extends Controller if ($page->getHasChildren()) { - $view['nav_pages'] = $pageRepo->getSiblings($page); - $view['nav_child_pages'] = $pageRepo->getChildren($page); + if ($page->getLvl() == 0) + { + $view['nav_pages'] = $page->getChildren(); + $view['nav_child_pages'] = []; + } + else + { + $view['nav_pages'] = $pageRepo->getSiblings($page); + $view['nav_child_pages'] = $page->getChildren(); + } $view['nav_open_node'] = $page; } else @@ -170,7 +180,14 @@ class DefaultController extends Controller if ($parent) { $view['nav_pages'] = $pageRepo->getSiblings($parent); - $view['nav_child_pages'] = $pageRepo->getSiblings($page); + if (empty($view['nav_pages'])) + { + $view['nav_pages'] = $pageRepo->getSiblings($page); + } + else + { + $view['nav_child_pages'] = $pageRepo->getSiblings($page); + } $view['nav_open_node'] = $parent; } else diff --git a/trunk/src/AppBundle/Entity/PageRepository.php b/trunk/src/AppBundle/Entity/PageRepository.php index 33e0c315..1f3f788b 100644 --- a/trunk/src/AppBundle/Entity/PageRepository.php +++ b/trunk/src/AppBundle/Entity/PageRepository.php @@ -51,7 +51,7 @@ class PageRepository extends NestedTreeRepository $parent = $page->getParent(); if (!$parent) { - // #TODO Return all root pages + // On purpose, we don't treat root pages as if they were siblings return []; } $siblings = $parent->getChildren(); diff --git a/trunk/src/AppBundle/Entity/TravelDate.php b/trunk/src/AppBundle/Entity/TravelDate.php index f460253c..1bbb9574 100644 --- a/trunk/src/AppBundle/Entity/TravelDate.php +++ b/trunk/src/AppBundle/Entity/TravelDate.php @@ -241,7 +241,7 @@ final class TravelDate if ($price->getPriceTypeId() == 3) { // Use double room if available (#1076) - return /*$price->getEffectiveDiscountPrice() ??*/ $price->getEffectivePrice(); + return $price->getEffectiveDiscountPrice() ?? $price->getEffectivePrice(); } if ($lowest < 0 || $price->getEffectivePrice() < 0) { diff --git a/trunk/src/AppBundle/Entity/TravelPeriodRepository.php b/trunk/src/AppBundle/Entity/TravelPeriodRepository.php index d4e8c8c6..de53f1b1 100644 --- a/trunk/src/AppBundle/Entity/TravelPeriodRepository.php +++ b/trunk/src/AppBundle/Entity/TravelPeriodRepository.php @@ -290,6 +290,10 @@ class TravelPeriodRepository extends \Doctrine\ORM\EntityRepository $flightPeriodByKey = null; if (!$program->getIsMediated()) { + if (!$program->getTravelArrivalPoint()) + { + return []; + } if ($flags & self::TD_QUERY_VIRTUAL) { // If virtual entries are included, we have to fetch all flight periods, because we don't know diff --git a/trunk/src/AppBundle/Listener/KernelControllerListener.php b/trunk/src/AppBundle/Listener/KernelControllerListener.php index 9ca97ada..7bf0bc9f 100644 --- a/trunk/src/AppBundle/Listener/KernelControllerListener.php +++ b/trunk/src/AppBundle/Listener/KernelControllerListener.php @@ -21,14 +21,11 @@ class KernelControllerListener { private $em; private $controllerResolver; - private $router; - public function __construct(EntityManager $entityManager, ControllerResolverInterface $controllerResolver, - Router $router) + public function __construct(EntityManager $entityManager, ControllerResolverInterface $controllerResolver) { $this->em = $entityManager; $this->controllerResolver = $controllerResolver; - $this->router = $router; } public function onKernelController(FilterControllerEvent $event)