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

#1464 + #1441

Browse source 
Formatierungen Kalenderansicht
Sortierung FEWO

git-svn-id: http://78.47.251.156/svn/dev/sterntours-3@3438 f459cee4-fb09-11de-96c3-f9c5f16c3c76
This commit is contained in:
adametz 2018-08-10 12:58:46 +00:00
parent 326f7f4f54
commit bdb24ccd09
12 changed files with 207 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

30
trunk/src/AppBundle/Controller/BookingController.php
View file

@ -318,6 +318,7 @@ class BookingController extends Controller
}
$insuranceTotal = 0;
$tempInsuranceHTML = array();
foreach ($possibleRooms as $room)
{
@ -379,14 +380,21 @@ class BookingController extends Controller
$a = $adultCount * $insurancePriceValue;
$insuranceTotal += $a;
$ret += $a;
if (isset($insuranceHtmlSummary))
{
$insuranceHtmlSummary[] = [
'value' => $a,
'label' => 'RV '. $bookingRequest->getInsurance()->getName() .' ('.
$insurancePrice->getCode() .') <strong>['. $this->calcNumTravelerLabel($adultCount) .' x '.
Util::formatPrice($insurancePriceValue) . ' pro Person]</strong>'
];
if(!empty($tempInsuranceHTML[$a])){
$tempInsuranceHTML[$a]['count'] = intval($tempInsuranceHTML[$a]['count']) + $adultCount;
$tempInsuranceHTML[$a]['value'] = $tempInsuranceHTML[$a]['value'] + $insurancePriceValue;
}else{
$tempInsuranceHTML[$a] = array(
'value' => $a,
'label_first' => 'RV '. $bookingRequest->getInsurance()->getName() .' ('. $insurancePrice->getCode() .') ',
'label_last' => Util::formatPrice($insurancePriceValue) . ' pro Person',
'count' => $adultCount,
);
}
}
if (isset($outPriceInfo))
{
@ -401,6 +409,16 @@ class BookingController extends Controller
}
}
if(count($tempInsuranceHTML) > 0 ){
foreach ($tempInsuranceHTML as $item) {
$insuranceHtmlSummary[] =[
'value' => $item['value'],
'label' => $item['label_first'].'<strong>['.$item['count'].' x '.$item['label_last'].' ]</strong>',
];
}
}
if (isset($insuranceHtmlSummary))
{
$outHtmlSummary = array_merge($outHtmlSummary, $insuranceHtmlSummary);

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

@ -50,6 +50,7 @@ class CmsController extends Controller
public function overviewAction(Page $page)
{
$settings = $page->getCmsSettings();
if (!is_array($settings))
{

1
trunk/src/AppBundle/Controller/ComponentController.php
View file

@ -54,6 +54,7 @@ class ComponentController extends Controller
if ($page->getLvl() == 0)
{
$view['nav_pages'] = $page->getChildren();
$view['nav_child_pages'] = [];
}
else