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@3351 f459cee4-fb09-11de-96c3-f9c5f16c3c76
This commit is contained in:
valentin.wacker 2017-10-25 13:00:52 +00:00
parent 8c393c75e5
commit 081c7f471e
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -171,6 +171,8 @@ class AdminController extends Controller
{ {
$calendar = $calendarUtil->markCalendarDaysWithReservations($lodging, $calendar); $calendar = $calendarUtil->markCalendarDaysWithReservations($lodging, $calendar);
$calendar = $calendarUtil->mergeWithPaddedCalendar($calendar, $paddedCalendar); $calendar = $calendarUtil->mergeWithPaddedCalendar($calendar, $paddedCalendar);
} else {
$calendar = $paddedCalendar;
} }
$form = $this->createForm(FewoLodgingType::class, $lodging, [ $form = $this->createForm(FewoLodgingType::class, $lodging, [
@ -237,9 +239,10 @@ class AdminController extends Controller
{ {
$calendar = $calendarUtil->markCalendarDaysWithReservations($lodging, $calendar); $calendar = $calendarUtil->markCalendarDaysWithReservations($lodging, $calendar);
$calendar = $calendarUtil->mergeWithPaddedCalendar($calendar, $paddedCalendar); $calendar = $calendarUtil->mergeWithPaddedCalendar($calendar, $paddedCalendar);
} else {
$calendar = $paddedCalendar;
} }
return $this->render('default/pages/cms/fewoTravelProgram.html.twig', [ return $this->render('default/pages/cms/fewoTravelProgram.html.twig', [
'fewo_lodging' => $lodging, 'fewo_lodging' => $lodging,
'calendar' => $calendar 'calendar' => $calendar

10
trunk/src/AppBundle/Controller/CmsController.php
View file

@ -132,9 +132,13 @@ class CmsController 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);
} else {
$calendar = $paddedCalendar;
}
return $this->render('default/pages/cms/fewoTravelProgram.html.twig', [ return $this->render('default/pages/cms/fewoTravelProgram.html.twig', [
'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..').DIRECTORY_SEPARATOR, 'base_dir' => realpath($this->getParameter('kernel.root_dir').'/..').DIRECTORY_SEPARATOR,