Merge branch 'release/2020.01-02'

public/typo3conf/ext/ep_products/Classes/Service/DateImportService.php

@@ -372,7 +372,7 @@ class DateImportService implements SingletonInterface
         $servicesBoard =  $this->parseSelectionGroup($xmlDate, 'Leistungen Verpflegung');
         $servicesIncluded = $this->parseSelectionGroup($xmlDate, 'Leistungen Sonstige');
 
-        $date['services_included'] = serialize($this->combineServices($skiPass, $servicesBoard, $servicesIncluded));
+        $date['services_included'] = serialize($this->combineServices($servicesIncluded, $skiPass, $servicesBoard));
 
         if ($servicesBoard) {
             $date['board'] = reset($servicesBoard);
@@ -678,13 +678,15 @@ class DateImportService implements SingletonInterface
                 $data[$type] = [];
             }
 
-            $data[$type][] = [
+            $data[$type][(int)$service->attributes()['id']] = [
                 'idBusPro' => (int) $service->attributes()['idbuspro'],
                 'label' => $label,
                 'price' => number_format($price, 2, ',', '.'),
             ];
         }
 
+        ksort($data);
+
         return $data;
     }
 
@@ -700,10 +702,12 @@ class DateImportService implements SingletonInterface
         foreach ($selectionGroup as $selection)
         {
             $attributes = $selection->attributes();
-            $idBusPro = (int) $attributes['idbuspro'];
-            $data[$idBusPro] = (string) $attributes['bezeichnung'];
+            $id = (int) $attributes['id'];
+            $data[$id] = (string) $attributes['bezeichnung'];
         }
 
+        ksort($data);
+
         return $data;
     }
 

public/typo3conf/ext/ep_theme/Resources/Private/Partials/Product/Details.html

@@ -1,13 +1,6 @@
 <div class="ep-headbar">Konzept</div>
 <div class="product-details product-details--concept">
     {product.conceptDescription -> f:format.html()}
-    <f:if condition="{product.calendarHotel}">
-        <p>
-            <f:link.typolink class="button" parameter="{settings.groupsContactFormPageUid}" additionalParams="&ref={currentPageUid}">
-                Direkt zum Anfrageformular
-            </f:link.typolink>
-        </p>
-    </f:if>
 </div>
 <div class="ep-headbar">Verpflegung</div>
 <div class="product-details product-details--board">

public/typo3conf/ext/ep_theme/Resources/Private/Templates/Product/Detail.html

@@ -261,6 +261,9 @@
                     argument-prefix="{ep:argumentPrefix(pluginName: 'ajax', extensionName: 'epproducts')}"
                 ></calendar>
             </div>
+            <f:link.typolink class="button button--full" parameter="{settings.groupsContactFormPageUid}" additionalParams="&ref={currentPageUid}">
+                Direkt zum Anfrageformular
+            </f:link.typolink>
         </f:if>
     </f:section>