Merge branch 'release/2020.06-02'

2020-06-18 09:31:48 +02:00
parent 5d0ec39915 817d830ed3
commit 940cbf7cd9
3 changed files with 262 additions and 290 deletions
@@ -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;
@@ -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