Merge branch 'alpha' of github.com:Tria-plc/edr-platform into alpha

apps/edr-passenger-api/src/modules/bookings/bookings.service.ts

@@ -1888,6 +1888,8 @@ export class BookingsService {
       adultCount: booking.adultCount, childCount: booking.childCount,
       displayCurrency: booking.displayCurrency, displayTotalMinor: booking.displayTotalMinor ?? undefined,
       bookingType: booking.bookingType,
+      packageId: (booking as any).packageId ?? null,
+      isPackageBooking: !!(booking as any).packageId,
       returnLegStatus: (booking as any).returnLegStatus ?? null,
       outboundBoardedAt: (booking as any).outboundBoardedAt ?? null,
       returnBoardedAt: (booking as any).returnBoardedAt ?? null,

apps/edr-passenger-api/src/modules/payments/payments.service.ts

@@ -261,7 +261,7 @@ export class PaymentsService {
       // Booking is in ETB — convert to the provider's settlement currency.
       chargeAmount = await this.currencyService.convertMinorToChargeMajor(
         booking.totalMinor,
-        'ETB',
+          booking.currency,
         chargeCurrency,
       );
     }