From 8c393c75e53e5d897a9f33c0270b3ad39aa59def Mon Sep 17 00:00:00 2001 From: "valentin.wacker" Date: Wed, 25 Oct 2017 12:54:30 +0000 Subject: [PATCH] #1352 git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3350 f459cee4-fb09-11de-96c3-f9c5f16c3c76 --- .../src/AppBundle/Controller/AdminController.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/trunk/src/AppBundle/Controller/AdminController.php b/trunk/src/AppBundle/Controller/AdminController.php index f815740a..a69c1fb9 100644 --- a/trunk/src/AppBundle/Controller/AdminController.php +++ b/trunk/src/AppBundle/Controller/AdminController.php @@ -165,11 +165,13 @@ class AdminController extends Controller $reservations = $calendarUtil->getReservations($lodging); - $paddedCalendar = $calendarUtil->getCalendarWithPadding(); $calendar = $calendarUtil->getCalendar(); - $calendar = $calendarUtil->markCalendarDaysWithReservations($lodging, $calendar); - $calendar = $calendarUtil->mergeWithPaddedCalendar($calendar, $paddedCalendar); + if (count($lodging->getPrices()->toArray()) != 0) + { + $calendar = $calendarUtil->markCalendarDaysWithReservations($lodging, $calendar); + $calendar = $calendarUtil->mergeWithPaddedCalendar($calendar, $paddedCalendar); + } $form = $this->createForm(FewoLodgingType::class, $lodging, [ //options @@ -231,8 +233,11 @@ class AdminController extends Controller $paddedCalendar = $calendarUtil->getCalendarWithPadding(); $calendar = $calendarUtil->getCalendar(); - $calendar = $calendarUtil->markCalendarDaysWithReservations($lodging, $calendar); - $calendar = $calendarUtil->mergeWithPaddedCalendar($calendar, $paddedCalendar); + if (count($lodging->getPrices()->toArray()) != 0) + { + $calendar = $calendarUtil->markCalendarDaysWithReservations($lodging, $calendar); + $calendar = $calendarUtil->mergeWithPaddedCalendar($calendar, $paddedCalendar); + } return $this->render('default/pages/cms/fewoTravelProgram.html.twig', [