Merge branch 'release/2020.06-02'

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

@@ -554,13 +554,13 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
             $price = (int) $roomXml->attributes()['preis'];
 
             // Skip all unavailable rooms
-            if (!$available) {
+//            if (!$available) {
+//                continue;
+//            }
+            // Skip rooms with zero price _and_ zero availability.
+            if (!$available && !$price) {
                 continue;
             }
-            // Skip rooms with zero price and zero availability.
-            //if (!$available && !$price) {
-            //    continue;
-            //}
 
             $pax = (int) $roomXml->attributes()['MaxPax'];
             $availableTotal += $available * $pax;

public/typo3conf/ext/ep_theme/Resources/Private/Forms/ApplicationForm.form.yaml

@@ -13,7 +13,7 @@ finishers:
       recipientName: 'E&P Reisen'
       senderAddress: '{text-6}'
       senderName: '{text-1}'
-      replyToAddress: info@ep-reisen.de
+      replyToAddress: team@ep-reisen.de
       carbonCopyAddress: ''
       blindCarbonCopyAddress: ''
       format: html