From d252471900a5292c02fb804f0775fa10a2d54c7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?=
Date: Tue, 31 Aug 2021 16:23:53 +0200
Subject: [PATCH 1/2] Use proper operator
---
.../ext/ep_products/Classes/Service/ContingentImportService.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public/typo3conf/ext/ep_products/Classes/Service/ContingentImportService.php b/public/typo3conf/ext/ep_products/Classes/Service/ContingentImportService.php
index be19c903..7ce0393e 100644
--- a/public/typo3conf/ext/ep_products/Classes/Service/ContingentImportService.php
+++ b/public/typo3conf/ext/ep_products/Classes/Service/ContingentImportService.php
@@ -263,7 +263,7 @@ class ContingentImportService implements SingletonInterface, LoggerAwareInterfac
if (in_array($roomCode, $this->ignoredRoomTypes, true)) {
continue;
}
- $roomTypeBusProId = $roomType['link'] ?? $roomType['idBusPro'];
+ $roomTypeBusProId = $roomType['link'] ?: $roomType['idBusPro'];
$xpath = sprintf('zimmerliste/zimmer[@idbuspro="%d"]', $roomTypeBusProId);
$xmlRoom = $xmlDate->xpath($xpath)[0];
$this->calculateContingent($xmlRoom, $roomType, $date, $hotelData);
From e921a12e775921bd4ad88654f3c3ed1de05d01b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?=
Date: Tue, 31 Aug 2021 16:40:00 +0200
Subject: [PATCH 2/2] Adjust headline in sidebar facts box
---
.../Resources/Private/Assets/scss/remix/_sidebar.scss | 4 ++++
.../ext/ep_theme/Resources/Private/Partials/Facts.html | 9 ++++++++-
.../Resources/Private/Templates/City/Detail.html | 2 +-
.../Resources/Private/Templates/Country/Detail.html | 2 +-
.../Resources/Private/Templates/Hotel/Detail.html | 2 +-
.../Resources/Private/Templates/Region/Detail.html | 2 +-
6 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_sidebar.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_sidebar.scss
index 124f784e..86e5a811 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_sidebar.scss
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_sidebar.scss
@@ -5,3 +5,7 @@
max-width: 165px;
margin: 0 auto;
}
+
+.headline {
+ text-transform: none;
+}
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Facts.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Facts.html
index 3aa40467..a98e992f 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Facts.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Facts.html
@@ -1,6 +1,13 @@
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Hotel/Detail.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Hotel/Detail.html
index 8304545c..a91c39c8 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Hotel/Detail.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Hotel/Detail.html
@@ -31,7 +31,7 @@
Direkt zu den Angeboten
-
+
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Region/Detail.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Region/Detail.html
index aeb551b0..82a4e509 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Region/Detail.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Region/Detail.html
@@ -37,7 +37,7 @@
-
+