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

Merge branch 'release/2020.06-02'

Browse Source
This commit is contained in:
Björn Fromme
2020-06-18 09:31:48 +02:00
parent 5d0ec39915 817d830ed3
commit 940cbf7cd9
3 changed files with 262 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.lock
Generated
+256 -284
View File
File diff suppressed because it is too large Load Diff
public/typo3conf/ext/ep_products/Classes/Service/DateImportService.php
+5 -5
View File
@@ -554,13 +554,13 @@ class DateImportService implements SingletonInterface, LoggerAwareInterface
$price = (int) $roomXml->attributes()['preis']; $price = (int) $roomXml->attributes()['preis'];
// Skip all unavailable rooms // Skip all unavailable rooms
if (!$available) { // if (!$available) {
// continue;
// }
// Skip rooms with zero price _and_ zero availability.
if (!$available && !$price) {
continue; continue;
} }
// Skip rooms with zero price and zero availability.
//if (!$available && !$price) {
// continue;
//}
$pax = (int) $roomXml->attributes()['MaxPax']; $pax = (int) $roomXml->attributes()['MaxPax'];
$availableTotal += $available * $pax; $availableTotal += $available * $pax;
public/typo3conf/ext/ep_theme/Resources/Private/Forms/ApplicationForm.form.yaml
+1 -1
View File
@@ -13,7 +13,7 @@ finishers:
recipientName: 'E&P Reisen' recipientName: 'E&P Reisen'
senderAddress: '{text-6}' senderAddress: '{text-6}'
senderName: '{text-1}' senderName: '{text-1}'
replyToAddress: info@ep-reisen.de replyToAddress: team@ep-reisen.de
carbonCopyAddress: '' carbonCopyAddress: ''
blindCarbonCopyAddress: '' blindCarbonCopyAddress: ''
format: html format: html