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

Merge branch 'release/2020.02-04'

Browse Source
This commit is contained in:
Björn Fromme
2020-02-05 14:55:37 +01:00
parent e72bd5c5bb 5d706d74db
commit 39820b453d
4 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_products/Classes/Service/DateImportService.php
+2 -2
View File
@@ -369,11 +369,11 @@ class DateImportService implements SingletonInterface
'important' => $product['important'],
];
$skiPass = $this->parseSelectionGroup($xmlDate, 'Leistungen Skipass');
$servicesBoard = $this->parseSelectionGroup($xmlDate, 'Leistungen Verpflegung');
$skiPass = $this->parseSelectionGroup($xmlDate, 'Leistungen Skipass');
$servicesIncluded = $this->parseSelectionGroup($xmlDate, 'Leistungen Sonstige');
$date['services_included'] = serialize($this->combineServices($servicesIncluded, $skiPass, $servicesBoard));
$date['services_included'] = serialize($this->combineServices($servicesBoard, $skiPass, $servicesIncluded));
if ($servicesBoard) {
$date['board'] = reset($servicesBoard);
public/typo3conf/ext/ep_products/Classes/Service/IcalService.php
+5 -1
View File
@@ -128,7 +128,7 @@ class IcalService implements SingletonInterface
foreach ($events as $event) {
/** @var Contingent $event */
if (null === $item && Contingent::STATUS_BLOCKED === $event->getStatus()) {
if (null === $item && (Contingent::STATUS_BLOCKED === $event->getStatus() || Contingent::STATUS_ONREQUEST === $event->getStatus())) {
$item = [
'from' => $event->getBegin(),
];
@@ -162,6 +162,10 @@ class IcalService implements SingletonInterface
*/
protected function addOccupancyItem( array $item): void
{
if (0 === $item['occupancy']) {
return;
}
$summary = sprintf('Part-occupied:%d', $item['occupancy']);
try {
public/typo3conf/ext/ep_products/Configuration/FlexForms/flexform_hotel_detail_event.xml
+1 -1
View File
@@ -18,7 +18,7 @@
<type>select</type>
<renderType>selectSingle</renderType>
<foreign_table>tx_epproducts_domain_model_product</foreign_table>
<foreign_table_where>AND tx_epproducts_domain_model_product.hidden = 0 AND tx_epproducts_domain_model_product.deleted = 0 ORDER BY tx_epproducts_domain_model_product.name</foreign_table_where>
<foreign_table_where>AND tx_epproducts_domain_model_product.hidden = 0 AND tx_epproducts_domain_model_product.deleted = 0 ORDER BY tx_epproducts_domain_model_product.name_internal</foreign_table_where>
<minitems>1</minitems>
<maxitems>1</maxitems>
</config>
public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/EventPricetable.html
+11
View File
@@ -6,6 +6,17 @@
<f:layout name="Default"/>
<f:section name="Main">
<f:if condition="{pricetable}">
<f:then>
<f:render section="Table" arguments="{_all}"/>
</f:then>
<f:else>
<f:render partial="NotBookable" arguments="{_all}"/>
</f:else>
</f:if>
</f:section>
<f:section name="Table">
<div class="table-responsive">
<table class="table table-bordered table-hover pricetable">
<f:for each="{categories}" as="category" key="categoryKey">