From 97494ac0de06e0e064e8712aa70f825eef04457c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= <fromme@dreipunktnull.com>
Date: Wed, 5 Feb 2020 14:19:54 +0100
Subject: [PATCH 1/4] Sort products by internal name

---
 .../Configuration/FlexForms/flexform_hotel_detail_event.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/typo3conf/ext/ep_products/Configuration/FlexForms/flexform_hotel_detail_event.xml b/public/typo3conf/ext/ep_products/Configuration/FlexForms/flexform_hotel_detail_event.xml
index 3a2262b1..5a6878ff 100644
--- a/public/typo3conf/ext/ep_products/Configuration/FlexForms/flexform_hotel_detail_event.xml
+++ b/public/typo3conf/ext/ep_products/Configuration/FlexForms/flexform_hotel_detail_event.xml
@@ -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>

From 6ad8769ca6488207986d7d85850de149f3f4fe96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= <fromme@dreipunktnull.com>
Date: Wed, 5 Feb 2020 14:21:21 +0100
Subject: [PATCH 2/4] Reorder services in popup

---
 .../ext/ep_products/Classes/Service/DateImportService.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/typo3conf/ext/ep_products/Classes/Service/DateImportService.php b/public/typo3conf/ext/ep_products/Classes/Service/DateImportService.php
index 7e710c75..97c03843 100644
--- a/public/typo3conf/ext/ep_products/Classes/Service/DateImportService.php
+++ b/public/typo3conf/ext/ep_products/Classes/Service/DateImportService.php
@@ -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);

From 6a94b76008c95f3691750156e185b85c43a5c5f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= <fromme@dreipunktnull.com>
Date: Wed, 5 Feb 2020 14:27:31 +0100
Subject: [PATCH 3/4] Exclude items with zero occupancy from ical rendering

---
 .../ext/ep_products/Classes/Service/IcalService.php         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/public/typo3conf/ext/ep_products/Classes/Service/IcalService.php b/public/typo3conf/ext/ep_products/Classes/Service/IcalService.php
index 144fb232..c5af9f8a 100644
--- a/public/typo3conf/ext/ep_products/Classes/Service/IcalService.php
+++ b/public/typo3conf/ext/ep_products/Classes/Service/IcalService.php
@@ -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 {

From 5d706d74db2a3ba356747a50ea51aa8e3172af8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= <fromme@dreipunktnull.com>
Date: Wed, 5 Feb 2020 14:51:33 +0100
Subject: [PATCH 4/4] Show alert in case of empty event pricetable

---
 .../Private/Templates/AjaxTable/EventPricetable.html  | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/EventPricetable.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/EventPricetable.html
index 1c7d3866..d283fb6c 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/EventPricetable.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/EventPricetable.html
@@ -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">