Merged in fix/STAY-97 (pull request #3092)
fix: Change copy of Total price in price summary ancillaries * fix: Change copy of Total price in price summary ancillaries Approved-by: Erik Tiekstra
This commit is contained in:
@@ -109,7 +109,7 @@ export default function ActionButtons({
|
|||||||
isPriceDetailsOpen ? "keyboard_arrow_up" : "keyboard_arrow_down"
|
isPriceDetailsOpen ? "keyboard_arrow_up" : "keyboard_arrow_down"
|
||||||
}
|
}
|
||||||
size={20}
|
size={20}
|
||||||
color="Icon/Interactive/Accent"
|
color="CurrentColor"
|
||||||
/>
|
/>
|
||||||
</Button>
|
</Button>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -51,8 +51,8 @@ export default function PriceSummary({
|
|||||||
title={item.title}
|
title={item.title}
|
||||||
quantity={item.quantityWithCard}
|
quantity={item.quantityWithCard}
|
||||||
label={intl.formatMessage({
|
label={intl.formatMessage({
|
||||||
id: "booking.priceIncludingVat",
|
id: "common.price",
|
||||||
defaultMessage: "Price including VAT",
|
defaultMessage: "Price",
|
||||||
})}
|
})}
|
||||||
value={formatPrice(intl, item.totalPrice, item.currency)}
|
value={formatPrice(intl, item.totalPrice, item.currency)}
|
||||||
/>
|
/>
|
||||||
@@ -80,19 +80,35 @@ export default function PriceSummary({
|
|||||||
))}
|
))}
|
||||||
|
|
||||||
<div className={styles.column}>
|
<div className={styles.column}>
|
||||||
<Typography variant="Body/Paragraph/mdBold">
|
{hasTotalPrice ? (
|
||||||
<p>
|
<Typography variant="Body/Paragraph/mdRegular">
|
||||||
{hasTotalPrice
|
<p>
|
||||||
? intl.formatMessage({
|
{intl.formatMessage(
|
||||||
id: "priceSummary.totalPriceIncludingVat",
|
{
|
||||||
defaultMessage: "Total price including VAT",
|
id: "booking.totalPriceInclVat",
|
||||||
})
|
defaultMessage: "<b>Total price</b> (incl VAT)",
|
||||||
: intl.formatMessage({
|
},
|
||||||
id: "common.totalPoints",
|
{
|
||||||
defaultMessage: "Total points",
|
b: (str) => (
|
||||||
})}
|
<Typography variant="Body/Paragraph/mdBold">
|
||||||
</p>
|
<span>{str}</span>
|
||||||
</Typography>
|
</Typography>
|
||||||
|
),
|
||||||
|
}
|
||||||
|
)}
|
||||||
|
</p>
|
||||||
|
</Typography>
|
||||||
|
) : (
|
||||||
|
<Typography variant="Body/Paragraph/mdBold">
|
||||||
|
<p>
|
||||||
|
{intl.formatMessage({
|
||||||
|
id: "common.totalPoints",
|
||||||
|
defaultMessage: "Total points",
|
||||||
|
})}
|
||||||
|
</p>
|
||||||
|
</Typography>
|
||||||
|
)}
|
||||||
|
|
||||||
<div className={styles.totalPrice}>
|
<div className={styles.totalPrice}>
|
||||||
{(hasTotalPoints || hasTotalPrice) && (
|
{(hasTotalPoints || hasTotalPrice) && (
|
||||||
<Typography variant="Body/Paragraph/mdBold">
|
<Typography variant="Body/Paragraph/mdBold">
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ import { PaymentOption } from "@scandic-hotels/design-system/Form/PaymentOption"
|
|||||||
import { PaymentOptionsGroup } from "@scandic-hotels/design-system/Form/PaymentOptionsGroup"
|
import { PaymentOptionsGroup } from "@scandic-hotels/design-system/Form/PaymentOptionsGroup"
|
||||||
import { SelectPaymentMethod } from "@scandic-hotels/design-system/Form/SelectPaymentMethod"
|
import { SelectPaymentMethod } from "@scandic-hotels/design-system/Form/SelectPaymentMethod"
|
||||||
import { MaterialIcon } from "@scandic-hotels/design-system/Icons/MaterialIcon"
|
import { MaterialIcon } from "@scandic-hotels/design-system/Icons/MaterialIcon"
|
||||||
import Link from "@scandic-hotels/design-system/OldDSLink"
|
import { TextLink } from "@scandic-hotels/design-system/TextLink"
|
||||||
import { Typography } from "@scandic-hotels/design-system/Typography"
|
import { Typography } from "@scandic-hotels/design-system/Typography"
|
||||||
|
|
||||||
import { useAddAncillaryStore } from "@/stores/my-stay/add-ancillary-flow"
|
import { useAddAncillaryStore } from "@/stores/my-stay/add-ancillary-flow"
|
||||||
@@ -195,24 +195,22 @@ export default function ConfirmationStep({
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
termsAndConditionsLink: (str) => (
|
termsAndConditionsLink: (str) => (
|
||||||
<Link
|
<TextLink
|
||||||
textDecoration="underline"
|
typography="Link/sm"
|
||||||
color="Text/Interactive/Secondary"
|
|
||||||
target="_blank"
|
target="_blank"
|
||||||
href={bookingTermsAndConditionsRoutes[lang]}
|
href={bookingTermsAndConditionsRoutes[lang]}
|
||||||
>
|
>
|
||||||
{str}
|
{str}
|
||||||
</Link>
|
</TextLink>
|
||||||
),
|
),
|
||||||
privacyPolicyLink: (str) => (
|
privacyPolicyLink: (str) => (
|
||||||
<Link
|
<TextLink
|
||||||
textDecoration="underline"
|
typography="Link/sm"
|
||||||
color="Text/Interactive/Secondary"
|
|
||||||
target="_blank"
|
target="_blank"
|
||||||
href={privacyPolicyRoutes[lang]}
|
href={privacyPolicyRoutes[lang]}
|
||||||
>
|
>
|
||||||
{str}
|
{str}
|
||||||
</Link>
|
</TextLink>
|
||||||
),
|
),
|
||||||
}
|
}
|
||||||
)}
|
)}
|
||||||
|
|||||||
Reference in New Issue
Block a user