Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update cancellation logic for car reservations #55289

Merged
merged 1 commit into from
Jan 20, 2025
+11 −3
Merged

Update cancellation logic for car reservations #55289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/languages/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2505,6 +2505,7 @@ const translations = {
carType: 'Car type',
cancellation: 'Cancellation policy',
cancellationUntil: 'Free cancellation until',
freeCancellation: 'Free cancellation',
confirmation: 'Confirmation number',
},
train: 'Rail',
Expand Down
1 change: 1 addition & 0 deletions src/languages/es.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2529,6 +2529,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',
Expand Down
12 changes: 9 additions & 3 deletions src/pages/Travel/CarTripDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Loading