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

Fix: Correctly determine conditions to show booking button in table

Browse Source
This commit is contained in:
Björn Fromme
2023-06-22 08:51:21 +02:00
parent c7a2998782
commit 5323b2498e
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_products/Classes/Service/DateService.php
+2 -2
View File
@@ -198,7 +198,7 @@ class DateService implements SingletonInterface
$nonBookableDateUids = $resolvedOptions['nonBookableDateUids']; $nonBookableDateUids = $resolvedOptions['nonBookableDateUids'];
foreach ($priceTableData as $row) { foreach ($priceTableData as $row) {
$showBookingButton = $resolvedOptions['showBookingButton'] || !in_array($row['dateBusProId'], $nonBookableDateUids, false); $showBookingButton = $resolvedOptions['showBookingButton'] && !in_array($row['dateBusProId'], $nonBookableDateUids);
$dateStart = new \DateTime($row['dateStart']); $dateStart = new \DateTime($row['dateStart']);
$dateEnd = new \DateTime($row['dateEnd']); $dateEnd = new \DateTime($row['dateEnd']);
@@ -277,7 +277,7 @@ class DateService implements SingletonInterface
// Default booking button status is determined by the product // Default booking button status is determined by the product
$showBookingButton = $resolvedOptions['showBookingButton']; $showBookingButton = $resolvedOptions['showBookingButton'];
// Check if booking button is disabled for this date // Check if booking button is disabled for this date
if (true === in_array($row['dateBusProId'], $nonBookableDateUids, false)) { if (true === in_array($row['dateBusProId'], $nonBookableDateUids)) {
$showBookingButton = false; $showBookingButton = false;
} }
public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/Pricetable.html
+7 -7
View File
@@ -111,14 +111,8 @@
</f:if> </f:if>
</td> </td>
<td class="px-2 py-1 md:p-2 whitespace-nowrap"> <td class="px-2 py-1 md:p-2 whitespace-nowrap">
<f:if condition="{row.isHideBookingButton}"> <f:if condition="{row.showBookingButton}">
<f:then> <f:then>
<f:link.typolink parameter="{settings.travelAlertPageUid}"
class="button bg-button button--small">
Reisen-Alert
</f:link.typolink>
</f:then>
<f:else>
<f:if condition="{row.available}"> <f:if condition="{row.available}">
<f:then> <f:then>
<a class="button bg-button button--small w-full" <a class="button bg-button button--small w-full"
@@ -148,6 +142,12 @@
</span> </span>
</f:else> </f:else>
</f:if> </f:if>
</f:then>
<f:else>
<f:link.typolink parameter="{settings.travelAlertPageUid}"
class="button bg-button button--small">
Reisen-Alert
</f:link.typolink>
</f:else> </f:else>
</f:if> </f:if>
</td> </td>