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@3356 f459cee4-fb09-11de-96c3-f9c5f16c3c76
This commit is contained in:
uli 2017-10-27 09:47:23 +00:00
parent 8240ce87f9
commit 3bb0bb53a7
11 changed files with 276 additions and 330 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -168,7 +168,7 @@ class AdminController extends Controller
$calendar = $calendarUtil->getCalendar();
if (count($lodging->getPrices()->toArray()) != 0)
{
$calendar = $calendarUtil->markCalendarDaysWithReservations($lodging, $calendar);
$calendar = $calendarUtil->getCalendarWithReservations($lodging);
$calendar = $calendarUtil->mergeWithPaddedCalendar($calendar, $paddedCalendar);
} else {
$calendar = $paddedCalendar;
@ -238,7 +238,7 @@ class AdminController extends Controller
$calendar = $calendarUtil->getCalendar();
if (count($lodging->getPrices()->toArray()) != 0)
{
$calendar = $calendarUtil->markCalendarDaysWithReservations($lodging, $calendar);
$calendar = $calendarUtil->getCalendarWithReservations($lodging);
$calendar = $calendarUtil->mergeWithPaddedCalendar($calendar, $paddedCalendar);
} else {
$calendar = $paddedCalendar;