Merged in fix/SW-2079-update-confirmation-page-summ (pull request #1774)
fix: SW-2079 Fixed regular room price display confirmation page * fix: SW-2079 Fixed regular room price display confirmation page Approved-by: Simon.Emanuelsson
This commit is contained in:
@@ -173,7 +173,7 @@ export default function PriceDetailsModal() {
|
|||||||
<Row
|
<Row
|
||||||
bold
|
bold
|
||||||
label={intl.formatMessage({ id: "Room charge" })}
|
label={intl.formatMessage({ id: "Room charge" })}
|
||||||
value={room.formattedTotalCost}
|
value={room.formattedRoomCost}
|
||||||
/>
|
/>
|
||||||
</TableSection>
|
</TableSection>
|
||||||
|
|
||||||
|
|||||||
@@ -53,13 +53,13 @@ export default function ReceiptRoom({
|
|||||||
{room.rateDefinition.isMemberRate ? (
|
{room.rateDefinition.isMemberRate ? (
|
||||||
<div className={styles.memberPrice}>
|
<div className={styles.memberPrice}>
|
||||||
<Typography variant="Body/Paragraph/mdRegular">
|
<Typography variant="Body/Paragraph/mdRegular">
|
||||||
<p className={styles.red}>{room.formattedTotalCost}</p>
|
<p className={styles.red}>{room.formattedRoomCost}</p>
|
||||||
</Typography>
|
</Typography>
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<Typography variant="Body/Paragraph/mdRegular">
|
<Typography variant="Body/Paragraph/mdRegular">
|
||||||
<p className={styles.uiTextHighContrast}>
|
<p className={styles.uiTextHighContrast}>
|
||||||
{room.formattedTotalCost}
|
{room.formattedRoomCost}
|
||||||
</p>
|
</p>
|
||||||
</Typography>
|
</Typography>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -19,13 +19,13 @@ export function mapRoomState(
|
|||||||
(pkg) => pkg.code === BreakfastPackageEnum.FREE_MEMBER_BREAKFAST
|
(pkg) => pkg.code === BreakfastPackageEnum.FREE_MEMBER_BREAKFAST
|
||||||
)
|
)
|
||||||
|
|
||||||
let formattedTotalCost = formatPrice(
|
let formattedRoomCost = formatPrice(
|
||||||
intl,
|
intl,
|
||||||
booking.totalPrice,
|
booking.roomPrice,
|
||||||
booking.currencyCode
|
booking.currencyCode
|
||||||
)
|
)
|
||||||
if (booking.roomPoints) {
|
if (booking.roomPoints) {
|
||||||
formattedTotalCost = formatPrice(
|
formattedRoomCost = formatPrice(
|
||||||
intl,
|
intl,
|
||||||
booking.roomPoints,
|
booking.roomPoints,
|
||||||
CurrencyEnum.POINTS,
|
CurrencyEnum.POINTS,
|
||||||
@@ -33,7 +33,7 @@ export function mapRoomState(
|
|||||||
booking.currencyCode
|
booking.currencyCode
|
||||||
)
|
)
|
||||||
} else if (booking.cheques) {
|
} else if (booking.cheques) {
|
||||||
formattedTotalCost = formatPrice(
|
formattedRoomCost = formatPrice(
|
||||||
intl,
|
intl,
|
||||||
booking.cheques,
|
booking.cheques,
|
||||||
CurrencyEnum.CC,
|
CurrencyEnum.CC,
|
||||||
@@ -41,7 +41,7 @@ export function mapRoomState(
|
|||||||
booking.currencyCode
|
booking.currencyCode
|
||||||
)
|
)
|
||||||
} else if (booking.vouchers) {
|
} else if (booking.vouchers) {
|
||||||
formattedTotalCost = formatPrice(
|
formattedRoomCost = formatPrice(
|
||||||
intl,
|
intl,
|
||||||
booking.vouchers,
|
booking.vouchers,
|
||||||
CurrencyEnum.Voucher
|
CurrencyEnum.Voucher
|
||||||
@@ -58,7 +58,7 @@ export function mapRoomState(
|
|||||||
childBedPreferences: booking.childBedPreferences,
|
childBedPreferences: booking.childBedPreferences,
|
||||||
confirmationNumber: booking.confirmationNumber,
|
confirmationNumber: booking.confirmationNumber,
|
||||||
currencyCode: booking.currencyCode,
|
currencyCode: booking.currencyCode,
|
||||||
formattedTotalCost,
|
formattedRoomCost,
|
||||||
fromDate: booking.checkInDate,
|
fromDate: booking.checkInDate,
|
||||||
name: room.name,
|
name: room.name,
|
||||||
packages: booking.packages,
|
packages: booking.packages,
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ export interface Room {
|
|||||||
fromDate: Date
|
fromDate: Date
|
||||||
name: string
|
name: string
|
||||||
packages: BookingConfirmation["booking"]["packages"]
|
packages: BookingConfirmation["booking"]["packages"]
|
||||||
formattedTotalCost: string
|
formattedRoomCost: string
|
||||||
rateDefinition: BookingConfirmation["booking"]["rateDefinition"]
|
rateDefinition: BookingConfirmation["booking"]["rateDefinition"]
|
||||||
roomFeatures?: PackageSchema[] | null
|
roomFeatures?: PackageSchema[] | null
|
||||||
roomPoints: number
|
roomPoints: number
|
||||||
|
|||||||
Reference in New Issue
Block a user