fix: always use totalPrice to display roomCharge

This commit is contained in:
Simon Emanuelsson
2025-04-16 12:41:37 +02:00
committed by Simon.Emanuelsson
parent edc4f0c016
commit b5deb84b33
7 changed files with 209 additions and 82 deletions

View File

@@ -30,6 +30,8 @@ export default function PriceDetails() {
.startOf("day") .startOf("day")
.diff(dt(fromDate).startOf("day"), "days") .diff(dt(fromDate).startOf("day"), "days")
console.log({ rooms })
const totalPrice = rooms.reduce<Price>( const totalPrice = rooms.reduce<Price>(
(total, room) => { (total, room) => {
if (!room) { if (!room) {

View File

@@ -0,0 +1,62 @@
"use client"
import { useIntl } from "react-intl"
import { Typography } from "@scandic-hotels/design-system/Typography"
import Cheques from "../Cheques"
import Points from "../Points"
import Price from "../Price"
import { PriceTypeEnum } from "@/types/components/hotelReservation/myStay/myStay"
import type { BookingConfirmation } from "@/types/trpc/routers/booking/confirmation"
interface PriceTypeProps
extends Pick<
BookingConfirmation["booking"],
"cheques" | "rateDefinition" | "roomPoints" | "totalPrice" | "vouchers"
> {
isCancelled: boolean
priceType: PriceTypeEnum
}
export default function PriceType({
cheques,
isCancelled,
priceType,
rateDefinition,
roomPoints,
totalPrice,
vouchers,
}: PriceTypeProps) {
const intl = useIntl()
switch (priceType) {
case PriceTypeEnum.cheque:
return <Cheques cheques={cheques} price={isCancelled ? 0 : totalPrice} />
case PriceTypeEnum.money:
return (
<Price
isMember={rateDefinition.isMemberRate}
price={isCancelled ? 0 : totalPrice}
variant="Title/Subtitle/lg"
/>
)
case PriceTypeEnum.points:
return <Points points={roomPoints} variant="Title/Subtitle/lg" />
case PriceTypeEnum.voucher:
return (
<Typography variant="Title/Subtitle/lg">
<p>
{intl.formatMessage(
{
defaultMessage: "{count} voucher",
},
{ count: vouchers }
)}
</p>
</Typography>
)
default:
return null
}
}

View File

@@ -16,11 +16,11 @@ import IconChip from "@/components/TempDesignSystem/IconChip"
import useLang from "@/hooks/useLang" import useLang from "@/hooks/useLang"
import { IconForFeatureCode } from "../../utils" import { IconForFeatureCode } from "../../utils"
import PriceType from "../PriceType"
import { hasModifiableRate } from "../utils" import { hasModifiableRate } from "../utils"
import { hasBreakfastPackageFromBookingFlow } from "../utils/hasBreakfastPackage" import { hasBreakfastPackageFromBookingFlow } from "../utils/hasBreakfastPackage"
import { mapRoomDetails } from "../utils/mapRoomDetails" import { mapRoomDetails } from "../utils/mapRoomDetails"
import MultiRoomSkeleton from "./MultiRoomSkeleton" import MultiRoomSkeleton from "./MultiRoomSkeleton"
import PriceType from "./PriceType"
import ToggleSidePeek from "./ToggleSidePeek" import ToggleSidePeek from "./ToggleSidePeek"
import styles from "./multiRoom.module.css" import styles from "./multiRoom.module.css"

View File

@@ -0,0 +1,63 @@
"use client"
import { useIntl } from "react-intl"
import { Typography } from "@scandic-hotels/design-system/Typography"
import { useMyStayRoomDetailsStore } from "@/stores/my-stay/myStayRoomDetailsStore"
import Cheques from "../Cheques"
import Points from "../Points"
import Price from "../Price"
import { PriceTypeEnum } from "@/types/components/hotelReservation/myStay/myStay"
export default function PriceType() {
const intl = useIntl()
const {
cheques,
isCancelled,
priceType,
rateDefinition,
roomPoints,
totalPrice,
vouchers,
} = useMyStayRoomDetailsStore((state) => ({
cheques: state.bookedRoom.cheques,
isCancelled: state.bookedRoom.isCancelled,
priceType: state.bookedRoom.priceType,
rateDefinition: state.bookedRoom.rateDefinition,
roomPoints: state.bookedRoom.roomPoints,
totalPrice: state.bookedRoom.totalPrice,
vouchers: state.bookedRoom.vouchers,
}))
switch (priceType) {
case PriceTypeEnum.cheque:
return <Cheques cheques={cheques} price={isCancelled ? 0 : totalPrice} />
case PriceTypeEnum.money:
return (
<Price
isMember={rateDefinition.isMemberRate}
price={isCancelled ? 0 : totalPrice}
variant="Title/Subtitle/lg"
/>
)
case PriceTypeEnum.points:
return <Points points={roomPoints} variant="Title/Subtitle/lg" />
case PriceTypeEnum.voucher:
return (
<Typography variant="Title/Subtitle/lg">
<p>
{intl.formatMessage(
{
defaultMessage: "{count} voucher",
},
{ count: vouchers }
)}
</p>
</Typography>
)
default:
return null
}
}

View File

@@ -18,8 +18,8 @@ import { formatPrice } from "@/utils/numberFormatting"
import GuestDetails from "../GuestDetails" import GuestDetails from "../GuestDetails"
import PriceDetails from "../PriceDetails" import PriceDetails from "../PriceDetails"
import PriceType from "../PriceType"
import { hasModifiableRate } from "../utils" import { hasModifiableRate } from "../utils"
import PriceType from "./PriceType"
import ToggleSidePeek from "./ToggleSidePeek" import ToggleSidePeek from "./ToggleSidePeek"
import styles from "./room.module.css" import styles from "./room.module.css"

View File

@@ -53,7 +53,7 @@ export default function VoucherPrice({
let averagePricePerNight = `${price.numberOfVouchers} ${CurrencyEnum.Voucher}` let averagePricePerNight = `${price.numberOfVouchers} ${CurrencyEnum.Voucher}`
if (averageAdditionalPricePerNight) { if (averageAdditionalPricePerNight) {
averagePricePerNight = `${averagePricePerNight} + ${averageAdditionalPricePerNight} ${pkgsSum.currency}` averagePricePerNight = `${averagePricePerNight} + ${averageAdditionalPricePerNight} ${pkgsSum.currency ?? currency}`
} }
return ( return (
@@ -68,7 +68,7 @@ export default function VoucherPrice({
price.numberOfVouchers, price.numberOfVouchers,
CurrencyEnum.Voucher, CurrencyEnum.Voucher,
additionalPricePerStay, additionalPricePerStay,
pkgsSum.currency pkgsSum.currency ?? currency
)} )}
/> />
</> </>