Merge pull request #55289 from software-mansion-labs/fix/car-cancellation-policy

Update cancellation logic for car reservations

Author: rlinoz

src/languages/en.ts

@@ -2517,6 +2517,7 @@ const translations = {
             carType: 'Car type',
             cancellation: 'Cancellation policy',
             cancellationUntil: 'Free cancellation until',
+            freeCancellation: 'Free cancellation',
             confirmation: 'Confirmation number',
         },
         train: 'Rail',

src/languages/es.ts

@@ -2541,6 +2541,7 @@ const translations = {
             carType: 'Tipo de coche',
             cancellation: 'Política de cancelación',
             cancellationUntil: 'Cancelación gratuita hasta el',
+            freeCancellation: 'Cancelación gratuita',
             confirmation: 'Número de confirmación',
         },
         train: 'Tren',

src/pages/Travel/CarTripDetails.tsx

@@ -22,9 +22,15 @@ function CarTripDetails({reservation, personalDetails}: CarTripDetailsProps) {
 
     const pickUpDate = DateUtils.getFormattedTransportDateAndHour(new Date(reservation.start.date));
     const dropOffDate = DateUtils.getFormattedTransportDateAndHour(new Date(reservation.end.date));
-    const cancellationText = reservation.cancellationDeadline
-        ? `${translate('travel.carDetails.cancellationUntil')} ${DateUtils.getFormattedTransportDateAndHour(new Date(reservation.cancellationDeadline)).date}`
-        : reservation.cancellationPolicy;
+
+    let cancellationText = reservation.cancellationPolicy;
+    if (reservation.cancellationDeadline) {
+        cancellationText = `${translate('travel.carDetails.cancellationUntil')} ${DateUtils.getFormattedTransportDateAndHour(new Date(reservation.cancellationDeadline)).date}`;
+    }
+
+    if (reservation.cancellationPolicy === null && reservation.cancellationDeadline === null) {
+        cancellationText = translate('travel.carDetails.freeCancellation');
+    }
 
     const displayName = personalDetails?.displayName ?? reservation.travelerPersonalInfo?.name;