gitmedia/sterntours
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#1352

Browse source 
git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3350 f459cee4-fb09-11de-96c3-f9c5f16c3c76
This commit is contained in:
valentin.wacker 2017-10-25 12:54:30 +00:00
parent 011353734a
commit 8c393c75e5
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
trunk/src/AppBundle/Controller/AdminController.php
View file

@ -165,11 +165,13 @@ class AdminController extends Controller
$reservations = $calendarUtil->getReservations($lodging); $reservations = $calendarUtil->getReservations($lodging);
$paddedCalendar = $calendarUtil->getCalendarWithPadding(); $paddedCalendar = $calendarUtil->getCalendarWithPadding();
$calendar = $calendarUtil->getCalendar(); $calendar = $calendarUtil->getCalendar();
$calendar = $calendarUtil->markCalendarDaysWithReservations($lodging, $calendar); if (count($lodging->getPrices()->toArray()) != 0)
$calendar = $calendarUtil->mergeWithPaddedCalendar($calendar, $paddedCalendar); {
$calendar = $calendarUtil->markCalendarDaysWithReservations($lodging, $calendar);
$calendar = $calendarUtil->mergeWithPaddedCalendar($calendar, $paddedCalendar);
}
$form = $this->createForm(FewoLodgingType::class, $lodging, [ $form = $this->createForm(FewoLodgingType::class, $lodging, [
//options //options
@ -231,8 +233,11 @@ class AdminController extends Controller
$paddedCalendar = $calendarUtil->getCalendarWithPadding(); $paddedCalendar = $calendarUtil->getCalendarWithPadding();
$calendar = $calendarUtil->getCalendar(); $calendar = $calendarUtil->getCalendar();
$calendar = $calendarUtil->markCalendarDaysWithReservations($lodging, $calendar); if (count($lodging->getPrices()->toArray()) != 0)
$calendar = $calendarUtil->mergeWithPaddedCalendar($calendar, $paddedCalendar); {
$calendar = $calendarUtil->markCalendarDaysWithReservations($lodging, $calendar);
$calendar = $calendarUtil->mergeWithPaddedCalendar($calendar, $paddedCalendar);
}
return $this->render('default/pages/cms/fewoTravelProgram.html.twig', [ return $this->render('default/pages/cms/fewoTravelProgram.html.twig', [