- {booking.passengers?.map((passenger: any, idx: number) => (
+ {groupedPassengers.map((passenger: any, idx: number) => (
-
-
-
-
- {idx + 1}
-
-
- {passenger.fullName}
-
-
- {passenger.category}
-
-
-
-
-
-
- Coach:
-
-
- {passenger.seat?.coach || "N/A"}
-
-
-
-
- Seat Number:
-
-
- {passenger.seat?.number || "N/A"}
-
-
-
-
- Class:
-
-
- {passenger.seat?.seatClass || "N/A"}
-
-
-
-
-
- {isConfirmed && (
-
- )}
+
+
+ {idx + 1}
+
+
+ {passenger.fullName}
+
+
+ {passenger.category}
+
+
+ {isRoundTripBooking ? (
+
+ {(
+ [
+ { legLabel: "Outbound", seat: passenger.outboundSeat },
+ { legLabel: "Return", seat: passenger.returnSeat },
+ ] as const
+ ).map(({ legLabel, seat }) => (
+
+
+
+ {legLabel}
+
+
+
+ {isConfirmed && (
+
+ )}
+
+ ))}
+
+ ) : (
+
+
+
+
+ {isConfirmed && (
+
+ )}
+
+ )}
))}
diff --git a/apps/edr-passenger-web/portal/src/lib/generate-voucher.ts b/apps/edr-passenger-web/portal/src/lib/generate-voucher.ts
index 306225a6c..ac2625fad 100644
--- a/apps/edr-passenger-web/portal/src/lib/generate-voucher.ts
+++ b/apps/edr-passenger-web/portal/src/lib/generate-voucher.ts
@@ -419,18 +419,33 @@ export const generatePassengerVoucherPDF = async (data: PassengerVoucherData): P
// ─── legacy combined voucher (kept for backward compat) ──────────────────────
+interface VoucherSchedule {
+ trainNumber: string;
+ trainName?: string;
+ origin: { name: string; code: string; city: string };
+ destination: { name: string; code: string; city: string };
+ departureAt: string;
+ arrivalAt: string;
+}
+
interface VoucherData {
bookingRef: string;
status: string;
- passengers: Array<{ fullName: string; category: string; seat?: { number: string; coach: string; seatClass: string } }>;
- schedule: { trainNumber: string; trainName?: string; origin: { name: string; code: string; city: string }; destination: { name: string; code: string; city: string }; departureAt: string; arrivalAt: string };
+ // /bookings/:ref returns one row per passenger PER LEG for round trips (leg 1 =
+ // outbound, leg 2 = return), each with that leg's own seat — see bookings.service.ts's
+ // getByRef(). dateOfBirth is included purely to disambiguate same-name passengers when
+ // grouping leg rows back into one passenger below.
+ passengers: Array<{ fullName: string; dateOfBirth?: string; category: string; leg?: number; seat?: { number: string; coach: string; seatClass: string } }>;
+ schedule: VoucherSchedule;
+ returnSchedule?: VoucherSchedule | null;
totalMinor: number;
currency: string;
bookingType: string;
createdAt: string;
- // One ticket per passenger, matched below by passengerName — see bookings.service.ts's
- // getByRef(). Optional/absent falls back to a client-generated placeholder number.
- tickets?: Array<{ passengerName?: string; barcodePayload?: string }>;
+ // One ticket per passenger per leg (round trips have a separate ticket/barcode for the
+ // return leg) — matched below by passengerName + leg. Optional/absent falls back to a
+ // client-generated placeholder number.
+ tickets?: Array<{ passengerName?: string; leg?: number; barcodePayload?: string }>;
// The actual settled amount/currency for this booking's payment — preferred over the
// ETB booking total once available, since it reflects what was really charged.
payment?: { amountMinor?: number; currency?: string };
@@ -447,31 +462,54 @@ export const generateVoucherPDF = async (booking: VoucherData): Promise
=>
const useSettledAmount = settledAmountMinor != null && !!settledCurrency;
const voucherCurrency = useSettledAmount ? settledCurrency! : booking.currency;
+ const isRoundTrip = booking.bookingType === 'ROUND_TRIP' && !!booking.returnSchedule;
+
+ // Group leg rows back into one entry per real passenger — without this, a round trip
+ // produced two half-passenger vouchers (one per leg, each showing only its own leg's
+ // seat) instead of one voucher per passenger covering both legs.
+ const grouped = new Map<
+ string,
+ { fullName: string; category: string; outboundSeat?: VoucherData['passengers'][number]['seat']; returnSeat?: VoucherData['passengers'][number]['seat'] }
+ >();
+ booking.passengers.forEach((p) => {
+ const key = `${p.fullName}|${p.dateOfBirth}|${p.category}`;
+ const entry = grouped.get(key) || { fullName: p.fullName, category: p.category, outboundSeat: undefined, returnSeat: undefined };
+ if (p.leg === 2) entry.returnSeat = p.seat;
+ else entry.outboundSeat = p.seat;
+ grouped.set(key, entry);
+ });
+
// Separate file per passenger, saved back-to-back with no macrotask (setTimeout) between
// them — a setTimeout delay here would push later saves outside the click's synchronous
// user-activation window and risk iOS Safari silently blocking them. The awaited work
// inside generatePassengerVoucherPDF is itself just microtasks (cached logo, QR encode),
// which doesn't have that effect.
- for (let i = 0; i < booking.passengers.length; i++) {
- const p = booking.passengers[i];
+ for (const p of grouped.values()) {
+ // The displayed ticket number is always the outbound leg's — matched by leg, not just
+ // name, so a round trip doesn't end up showing whichever ticket happens to sort first.
const matchedTicket =
- booking.tickets?.find((t) => t.passengerName === p.fullName) ?? booking.tickets?.[i] ?? null;
+ booking.tickets?.find((t) => t.passengerName === p.fullName && (t.leg ?? 1) === 1) ??
+ booking.tickets?.find((t) => t.passengerName === p.fullName) ??
+ null;
// No fabricated placeholder — a made-up TKT-... number reads as real and is misleading
// if it doesn't match what's actually on file.
const ticketNumber = matchedTicket?.barcodePayload || 'Not yet issued';
await generatePassengerVoucherPDF({
- bookingRef: booking.bookingRef,
+ bookingRef: booking.bookingRef,
ticketNumber,
- passengerName: p.fullName,
- seatNumber: p.seat?.number,
- status: booking.status,
- outboundSchedule: { ...booking.schedule, seatClass: p.seat?.seatClass },
- isRoundTrip: false,
- fareMinor: useSettledAmount ? settledAmountMinor! : booking.totalMinor,
- currency: voucherCurrency,
- fareIsMajorUnits: useSettledAmount,
- createdAt: booking.createdAt,
+ passengerName: p.fullName,
+ status: booking.status,
+ outboundSchedule: { ...booking.schedule, seatClass: p.outboundSeat?.seatClass },
+ inboundSchedule: isRoundTrip ? { ...booking.returnSchedule!, seatClass: p.returnSeat?.seatClass } : undefined,
+ isRoundTrip,
+ seatNumber: isRoundTrip ? undefined : p.outboundSeat?.number,
+ outboundSeatNumber: isRoundTrip ? p.outboundSeat?.number : undefined,
+ inboundSeatNumber: isRoundTrip ? p.returnSeat?.number : undefined,
+ fareMinor: useSettledAmount ? settledAmountMinor! : booking.totalMinor,
+ currency: voucherCurrency,
+ fareIsMajorUnits: useSettledAmount,
+ createdAt: booking.createdAt,
});
}
};