mirror of
https://github.com/Tria-plc/edr-platform.git
synced 2026-08-29 21:08:12 +00:00
Merge pull request #732 from Tria-plc/alpha
totalMinor with displayTotalMinor updates
This commit is contained in:
@@ -152,7 +152,7 @@ export class BookingsService {
|
|||||||
id: booking.id,
|
id: booking.id,
|
||||||
bookingRef: booking.bookingRef,
|
bookingRef: booking.bookingRef,
|
||||||
status: booking.status,
|
status: booking.status,
|
||||||
totalMinor: resolvePackageRoundTripTotal(booking, (booking as any).priceTier?.priceMinor, booking.adultCount, booking.childCount),
|
totalMinor: booking.displayTotalMinor ?? resolvePackageRoundTripTotal(booking, (booking as any).priceTier?.priceMinor, booking.adultCount, booking.childCount),
|
||||||
currency: booking.displayCurrency,
|
currency: booking.displayCurrency,
|
||||||
displayCurrency: booking.displayCurrency,
|
displayCurrency: booking.displayCurrency,
|
||||||
displayTotalMinor: booking.displayTotalMinor,
|
displayTotalMinor: booking.displayTotalMinor,
|
||||||
@@ -296,7 +296,7 @@ export class BookingsService {
|
|||||||
id: booking.id,
|
id: booking.id,
|
||||||
bookingRef: booking.bookingRef,
|
bookingRef: booking.bookingRef,
|
||||||
status: booking.status,
|
status: booking.status,
|
||||||
totalMinor: resolvePackageRoundTripTotal(booking, (booking as any).priceTier?.priceMinor, booking.adultCount, booking.childCount),
|
totalMinor: booking.displayTotalMinor ?? resolvePackageRoundTripTotal(booking, (booking as any).priceTier?.priceMinor, booking.adultCount, booking.childCount),
|
||||||
currency: booking.displayCurrency,
|
currency: booking.displayCurrency,
|
||||||
displayCurrency: booking.displayCurrency,
|
displayCurrency: booking.displayCurrency,
|
||||||
displayTotalMinor: booking.displayTotalMinor,
|
displayTotalMinor: booking.displayTotalMinor,
|
||||||
@@ -409,7 +409,7 @@ export class BookingsService {
|
|||||||
id: booking.id,
|
id: booking.id,
|
||||||
bookingRef: booking.bookingRef,
|
bookingRef: booking.bookingRef,
|
||||||
status: booking.status,
|
status: booking.status,
|
||||||
totalMinor: resolvePackageRoundTripTotal(booking, (booking as any).priceTier?.priceMinor, booking.adultCount, booking.childCount),
|
totalMinor: booking.displayTotalMinor ?? resolvePackageRoundTripTotal(booking, (booking as any).priceTier?.priceMinor, booking.adultCount, booking.childCount),
|
||||||
currency: booking.displayCurrency,
|
currency: booking.displayCurrency,
|
||||||
displayCurrency: booking.displayCurrency,
|
displayCurrency: booking.displayCurrency,
|
||||||
displayTotalMinor: booking.displayTotalMinor,
|
displayTotalMinor: booking.displayTotalMinor,
|
||||||
@@ -554,7 +554,7 @@ export class BookingsService {
|
|||||||
const uniquePassengers = Array.from(new Map(passengerDetails.map((p: any) => [p.name, p])).values());
|
const uniquePassengers = Array.from(new Map(passengerDetails.map((p: any) => [p.name, p])).values());
|
||||||
return {
|
return {
|
||||||
id: booking.id, bookingRef: booking.bookingRef, status: booking.status,
|
id: booking.id, bookingRef: booking.bookingRef, status: booking.status,
|
||||||
totalMinor: resolvePackageRoundTripTotal(booking, booking.priceTier?.priceMinor, booking.adultCount, booking.childCount),
|
totalMinor: booking.displayTotalMinor ?? resolvePackageRoundTripTotal(booking, booking.priceTier?.priceMinor, booking.adultCount, booking.childCount),
|
||||||
currency: booking.displayCurrency,
|
currency: booking.displayCurrency,
|
||||||
displayCurrency: booking.displayCurrency, displayTotalMinor: booking.displayTotalMinor,
|
displayCurrency: booking.displayCurrency, displayTotalMinor: booking.displayTotalMinor,
|
||||||
contactEmail: booking.contactEmail, contactPhone: booking.contactPhone,
|
contactEmail: booking.contactEmail, contactPhone: booking.contactPhone,
|
||||||
@@ -683,7 +683,7 @@ export class BookingsService {
|
|||||||
id: booking.id,
|
id: booking.id,
|
||||||
bookingRef: booking.bookingRef,
|
bookingRef: booking.bookingRef,
|
||||||
status: booking.status,
|
status: booking.status,
|
||||||
totalMinor: resolvePackageRoundTripTotal(booking, (booking as any).priceTier?.priceMinor, booking.adultCount, booking.childCount),
|
totalMinor: booking.displayTotalMinor ?? resolvePackageRoundTripTotal(booking, (booking as any).priceTier?.priceMinor, booking.adultCount, booking.childCount),
|
||||||
currency: booking.displayCurrency,
|
currency: booking.displayCurrency,
|
||||||
displayCurrency: booking.displayCurrency,
|
displayCurrency: booking.displayCurrency,
|
||||||
displayTotalMinor: booking.displayTotalMinor,
|
displayTotalMinor: booking.displayTotalMinor,
|
||||||
@@ -1883,7 +1883,7 @@ export class BookingsService {
|
|||||||
|
|
||||||
return {
|
return {
|
||||||
id: booking.id, bookingRef: booking.bookingRef, status: booking.status,
|
id: booking.id, bookingRef: booking.bookingRef, status: booking.status,
|
||||||
totalMinor: resolvePackageRoundTripTotal(booking, (booking as any).priceTier?.priceMinor, booking.adultCount, booking.childCount),
|
totalMinor: booking.displayTotalMinor ?? resolvePackageRoundTripTotal(booking, (booking as any).priceTier?.priceMinor, booking.adultCount, booking.childCount),
|
||||||
currency: booking.displayCurrency,
|
currency: booking.displayCurrency,
|
||||||
adultCount: booking.adultCount, childCount: booking.childCount,
|
adultCount: booking.adultCount, childCount: booking.childCount,
|
||||||
displayCurrency: booking.displayCurrency, displayTotalMinor: booking.displayTotalMinor ?? undefined,
|
displayCurrency: booking.displayCurrency, displayTotalMinor: booking.displayTotalMinor ?? undefined,
|
||||||
|
|||||||
Reference in New Issue
Block a user