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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Björn Fromme
2020-04-21 18:09:46 +02:00
parent f9ea4677c8 4868c440dd
commit 3c48dc6c37
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_products/Classes/Service/IcalService.php
+9 -2
View File
@@ -128,7 +128,9 @@ class IcalService implements SingletonInterface
foreach ($events as $event) { foreach ($events as $event) {
/** @var Contingent $event */ /** @var Contingent $event */
if (null === $item && (Contingent::STATUS_BLOCKED === $event->getStatus() || Contingent::STATUS_ONREQUEST === $event->getStatus())) { $isBlocked = Contingent::STATUS_BLOCKED === $event->getStatus() || Contingent::STATUS_ONREQUEST === $event->getStatus();
$isUnavailable = 0 === $event->getAvailable();
if (null === $item && ($isBlocked || $isUnavailable)) {
$item = [ $item = [
'from' => $event->getBegin(), 'from' => $event->getBegin(),
]; ];
@@ -138,6 +140,11 @@ class IcalService implements SingletonInterface
$item = null; $item = null;
} }
} }
if (isset($event) && null !== $item && !isset($item['to'])) {
$item['to'] = $event->getEnd();
$this->addBlockedItem($item);
}
} }
/** /**
@@ -160,7 +167,7 @@ class IcalService implements SingletonInterface
/** /**
* @param array $item * @param array $item
*/ */
protected function addOccupancyItem( array $item): void protected function addOccupancyItem(array $item): void
{ {
if (0 === $item['occupancy']) { if (0 === $item['occupancy']) {
return; return;