Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-26 18:42:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #823 from Tria-plc/alpha

Browse Source 
Include coach number to voucher
This commit is contained in:
robiman
2026-07-20 00:22:00 +03:00
committed by GitHub
parent 903219eec1 3293040438
commit efa3c218fe
7 changed files with 625 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/edr-passenger-api/src/common/utils/timezone.utils.ts
View File

@@ -18,12 +18,11 @@
* parseEthiopianTime('2026-06-15') // Treats as midnight EAT
*/
export function parseEthiopianTime(dateInput: string | Date): Date {
if (dateInput instanceof Date) {
return dateInput;
}
// Parse as local time (EAT) since TZ is set to Africa/Addis_Ababa
return new Date(dateInput);
if (dateInput instanceof Date) return dateInput;
// Already has timezone info (Z or +HH:MM) — parse directly as UTC
if (/Z$|[+-]\d{2}:\d{2}$/.test(dateInput)) return new Date(dateInput);
// Bare local string (e.g. "2026-07-23T21:00") — treat explicitly as EAT (UTC+3)
return new Date(dateInput + '+03:00');
}
/**

16
apps/edr-passenger-api/src/modules/reports/reports.service.ts
View File

@@ -447,7 +447,7 @@ export class ReportsService {
_count: { select: { seats: true } },
},
},
seat: { include: { coach: { select: { number: true, coachType: { select: { name: true } } } } } },
seat: { select: { seatNumber: true, bedPosition: true, coach: { select: { number: true, coachType: { select: { name: true, seatClasses: { select: { name: true, bedPosition: true } } } } } } } },
},
orderBy: [{ seat: { coach: { number: "asc" } } }, { seat: { seatNumber: "asc" } }],
});
@@ -474,13 +474,25 @@ export class ReportsService {
passportNumber: bs.passportNumber,
passportCountry: bs.passportCountry,
seatLabel: bs.seatLabelSnapshot,
seatNumber: bs.seat?.seatNumber ?? null,
seatClassName: (() => {
const classes = bs.seat?.coach?.coachType?.seatClasses ?? [];
const matched = bs.seat?.bedPosition
? classes.find((sc: any) => sc.bedPosition?.toLowerCase() === bs.seat!.bedPosition!.toLowerCase())
: null;
return (matched ?? classes[0])?.name ?? bs.seat?.coach?.coachType?.name ?? null;
})(),
coachNumber: bs.seat?.coach?.number ?? null,
coachType: (bs.seat?.coach as any)?.coachType?.name ?? null,
coachType: bs.seat?.coach?.coachType?.name ?? null,
nationality: bs.passportCountry
? (bs.passportCountry === 'Djibouti' ? 'Djiboutian' : bs.passportCountry)
: bs.idDocumentType === 'NATIONAL_ID' ? 'Ethiopian' : null,
origin: bs.booking.originStationId ? (stationName.get(bs.booking.originStationId) ?? null) : null,
destination: bs.booking.destinationStationId ? (stationName.get(bs.booking.destinationStationId) ?? null) : null,
amountPaidMinor: bs.booking.totalMinor,
currency: bs.booking.currency ?? 'ETB',
isGroupBooking: (bs.booking._count?.seats ?? 0) > 1,
bookingStatus: bs.booking.status,
}));
}

720
apps/edr-passenger-api/src/modules/search/search.service.ts
View File

File diff suppressed because it is too large Load Diff

29
apps/edr-passenger-web/backoffice/src/app/reports/passengers/page.tsx
View File

@@ -52,13 +52,17 @@ interface PassengerRow {
passportNumber: string | null;
passportCountry: string | null;
seatLabel: string | null;
seatNumber: string | null;
seatClassName: string | null;
coachNumber: string | null;
coachType: string | null;
nationality: string | null;
origin: string | null;
destination: string | null;
amountPaidMinor: number;
currency: string;
isGroupBooking: boolean;
bookingStatus: string;
}
type Tab = "occupancy" | "list";
@@ -105,6 +109,7 @@ export default function PassengersReportPage() {
.filter((p) => {
if (filterCoach && p.coachNumber !== filterCoach) return false;
if (filterOrigin && p.origin !== filterOrigin) return false;
if (filterSeatClass && p.seatClassName !== filterSeatClass) return false;
if (listSearch.trim()) {
const q = listSearch.toLowerCase();
return (
@@ -454,6 +459,30 @@ export default function PassengersReportPage() {
value={listSearch}
onChange={(e) => setListSearch(e.target.value)}
/>
<select
className="input w-40"
value={filterSeatClass}
onChange={(e) => setFilterSeatClass(e.target.value)}
>
<option value="">All classes</option>
{seatClassOptions.map((c) => (
<option key={c} value={c}>
{c}
</option>
))}
</select>
<select
className="input w-36"
value={filterOrigin}
onChange={(e) => setFilterOrigin(e.target.value)}
>
<option value="">All origins</option>
{originOptions.map((o) => (
<option key={o} value={o}>
{o}
</option>
))}
</select>
{passengerList.length > 0 && (
<ActionButton
icon={Download}

2
apps/edr-passenger-web/backoffice/src/app/schedules/page.tsx
View File

@@ -514,7 +514,7 @@ export default function SchedulesPage() {
const payload: any = {
trainId: bulkForm.trainId,
routeId: bulkForm.routeId,
startDateTime: bulkForm.startDateTime,
startDateTime: new Date(bulkForm.startDateTime).toISOString(),
durationHours: parseInt(bulkForm.durationHours),
repeatEveryDays: parseInt(bulkForm.repeatEveryDays),
forNextDays: parseInt(bulkForm.forNextDays),

27
apps/edr-passenger-web/portal/src/app/booking/confirmation/page.tsx
View File

@@ -263,21 +263,24 @@ export default function ConfirmationPage() {
const ticketNumber = matchedTicket?.barcodePayload || "Not yet issued";
await generatePassengerVoucherPDF({
bookingRef: pnr,
bookingRef: pnr,
ticketNumber,
passengerName: p.name || `Passenger ${i + 1}`,
dateOfBirth: p.dateOfBirth,
nationality: p.nationality,
seatNumber: p.seatNumber,
outboundSeatNumber: (p as any).outboundSeatNumber,
inboundSeatNumber: (p as any).inboundSeatNumber,
passengerName: p.name || `Passenger ${i + 1}`,
dateOfBirth: p.dateOfBirth,
nationality: p.nationality,
seatNumber: p.seatNumber,
coachNumber: p.coachNumber,
outboundSeatNumber: p.outboundSeatNumber,
outboundCoachNumber: p.outboundCoachNumber,
inboundSeatNumber: p.inboundSeatNumber,
inboundCoachNumber: p.inboundCoachNumber,
status,
outboundSchedule: outbound,
inboundSchedule: inbound,
outboundSchedule: outbound,
inboundSchedule: inbound,
isRoundTrip,
fareMinor: hasSettledAmount ? settledAmountMinor! : getEtbFare(i),
currency: voucherCurrency,
fareIsMajorUnits: hasSettledAmount,
fareMinor: hasSettledAmount ? settledAmountMinor! : getEtbFare(i),
currency: voucherCurrency,
fareIsMajorUnits: hasSettledAmount,
createdAt,
});
}

44
apps/edr-passenger-web/portal/src/lib/generate-voucher.ts
View File

@@ -24,8 +24,11 @@ interface PassengerVoucherData {
dateOfBirth?: string;
nationality?: string;
seatNumber?: string;
coachNumber?: string;
outboundSeatNumber?: string;
outboundCoachNumber?: string;
inboundSeatNumber?: string;
inboundCoachNumber?: string;
status: string;
outboundSchedule: ScheduleInfo;
inboundSchedule?: ScheduleInfo;
@@ -314,16 +317,21 @@ function drawPassengerDetails(doc: jsPDF, data: PassengerVoucherData, y: number,
label(doc, 'Passenger details', margin, y);
y += 7;
const formatSeat = (coach: string | undefined, seat: string | undefined): string => {
if (!seat) return '—';
return coach ? `Coach ${coach} · Seat ${seat}` : `Seat ${seat}`;
};
const rows: [string, string][] = [
['Full name', data.passengerName || '—'],
['Date of birth', data.dateOfBirth ? new Date(data.dateOfBirth).toLocaleDateString('en-US', { year: 'numeric', month: 'long', day: 'numeric' }) : '—'],
['Nationality', data.nationality || '—'],
];
if (data.isRoundTrip) {
rows.push(['Outbound seat', data.outboundSeatNumber || '—']);
rows.push(['Return seat', data.inboundSeatNumber || '—']);
rows.push(['Outbound seat', formatSeat(data.outboundCoachNumber, data.outboundSeatNumber)]);
rows.push(['Return seat', formatSeat(data.inboundCoachNumber, data.inboundSeatNumber)]);
} else {
rows.push(['Seat', data.seatNumber || '—']);
rows.push(['Seat', formatSeat(data.coachNumber, data.seatNumber)]);
}
const rowH = 7;
@@ -485,9 +493,10 @@ export const generateVoucherPDF = async (booking: VoucherData): Promise<void> =>
// 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.
type SeatInfo = VoucherData['passengers'][number]['seat'];
const grouped = new Map<
string,
{ fullName: string; category: string; outboundSeat?: VoucherData['passengers'][number]['seat']; returnSeat?: VoucherData['passengers'][number]['seat'] }
{ fullName: string; category: string; outboundSeat?: SeatInfo; returnSeat?: SeatInfo }
>();
booking.passengers.forEach((p) => {
const key = `${p.fullName}|${p.dateOfBirth}|${p.category}`;
@@ -514,20 +523,23 @@ export const generateVoucherPDF = async (booking: VoucherData): Promise<void> =>
const ticketNumber = matchedTicket?.barcodePayload || 'Not yet issued';
await generatePassengerVoucherPDF({
bookingRef: booking.bookingRef,
bookingRef: booking.bookingRef,
ticketNumber,
passengerName: p.fullName,
status: booking.status,
outboundSchedule: { ...booking.schedule, seatClass: p.outboundSeat?.seatClass },
inboundSchedule: isRoundTrip ? { ...booking.returnSchedule!, seatClass: p.returnSeat?.seatClass } : undefined,
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: voucherFareMinor,
currency: voucherCurrency,
fareIsMajorUnits: useSettledAmount,
createdAt: booking.createdAt,
seatNumber: isRoundTrip ? undefined : p.outboundSeat?.number,
coachNumber: isRoundTrip ? undefined : p.outboundSeat?.coach,
outboundSeatNumber: isRoundTrip ? p.outboundSeat?.number : undefined,
outboundCoachNumber: isRoundTrip ? p.outboundSeat?.coach : undefined,
inboundSeatNumber: isRoundTrip ? p.returnSeat?.number : undefined,
inboundCoachNumber: isRoundTrip ? p.returnSeat?.coach : undefined,
fareMinor: voucherFareMinor,
currency: voucherCurrency,
fareIsMajorUnits: useSettledAmount,
createdAt: booking.createdAt,
});
}
};