EP/website-typo3
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/2019.12-04'

Browse Source
This commit is contained in:
Björn Fromme
2019-12-05 14:35:22 +01:00
parent ca0a0adaae d947f4548f
commit f0959b47e8
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_products/Classes/Service/IcalService.php
+4 -11
View File
@@ -78,10 +78,10 @@ class IcalService implements SingletonInterface
$paxTotal = $event->getPax(); $paxTotal = $event->getPax();
$paxAvaiable = $event->getAvailable(); $paxAvaiable = $event->getAvailable();
$percentageBooked = 100;
if ($paxTotal > 0) { if ($paxTotal > 0) {
$percentageBooked = 100 - round($paxAvaiable / $paxTotal * 100); $percentageBooked = 100 - round($paxAvaiable / $paxTotal * 100);
} else {
$percentageBooked = 100;
} }
if ($percentageBooked >= self::THRESHOLD) { if ($percentageBooked >= self::THRESHOLD) {
@@ -90,8 +90,7 @@ class IcalService implements SingletonInterface
} }
$dateStart = $event->getBegin(); $dateStart = $event->getBegin();
} elseif (null !== $dateStart) { } elseif (null !== $dateStart) {
$dateEnd = clone $event->getBegin(); $dateEnd = $event->getEnd();
$dateEnd->modify('-1 day');
$this->addCalendarItem($vcalendar, $dateStart, $dateEnd); $this->addCalendarItem($vcalendar, $dateStart, $dateEnd);
$dateStart = $dateEnd = null; $dateStart = $dateEnd = null;
} }
@@ -136,12 +135,6 @@ class IcalService implements SingletonInterface
*/ */
protected function createCalendarInstance(): Vcalendar protected function createCalendarInstance(): Vcalendar
{ {
$vcalendar = Vcalendar::factory([ Vcalendar::UNIQUE_ID => 'www.ep-reisen.de' ]); return Vcalendar::factory([ Vcalendar::UNIQUE_ID => 'www.ep-reisen.de' ]);
$vcalendar->setXprop(
Vcalendar::X_WR_TIMEZONE,
'Europe/Berlin'
);
return $vcalendar;
} }
} }