scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in fix/api-change-remove-points-packages (pull request #1547)

Browse Source 
Fix/api change remove points packages

* fix/remove-points

* fix: translate if points is currency


Approved-by: Niclas Edenvin
Approved-by: Simon.Emanuelsson
This commit is contained in:
Bianca Widstam
2025-03-17 10:59:17 +00:00
parent 1d49b834ff
commit 21aea22e48
2 changed files with 6 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddedAncillaries/index.tsx
View File

@@ -66,19 +66,9 @@ export function AddedAncillaries({
<div className={styles.paymentMobile}> <div className={styles.paymentMobile}>
<Body>{intl.formatMessage({ id: "Total" })}</Body> <Body>{intl.formatMessage({ id: "Total" })}</Body>
<Body textTransform="bold"> <Body textTransform="bold">
{`${ancillary.totalPrice} ${ancillary.currency}`} {ancillary.currency.toLowerCase() === "points"
</Body> ? `${ancillary.totalPrice} ${intl.formatMessage({ id: "Points" })}`
<Divider : `${ancillary.totalPrice} ${ancillary.currency}`}
variant="vertical"
color="baseSurfaceSubtleNormal"
/>
<Body textTransform="bold">
{intl.formatMessage(
{ id: "{value} points" },
{
value: ancillary.points,
}
)}
</Body> </Body>
</div> </div>
</div> </div>
@@ -121,16 +111,9 @@ export function AddedAncillaries({
<div className={styles.payment}> <div className={styles.payment}>
<Body>{intl.formatMessage({ id: "Total" })}</Body> <Body>{intl.formatMessage({ id: "Total" })}</Body>
<Body textTransform="bold"> <Body textTransform="bold">
{`${ancillary.totalPrice} ${ancillary.currency}`} {ancillary.currency.toLowerCase() === "points"
</Body> ? `${ancillary.totalPrice} ${intl.formatMessage({ id: "Points" })}`
<Divider variant="vertical" color="baseSurfaceSubtleNormal" /> : `${ancillary.totalPrice} ${ancillary.currency}`}
<Body textTransform="bold">
{intl.formatMessage(
{ id: "{value} points" },
{
value: ancillary.points,
}
)}
</Body> </Body>
</div> </div>
</div> </div>

2
apps/scandic-web/server/routers/booking/output.ts
View File

@@ -93,7 +93,6 @@ export const packageSchema = z
totalPrice: z.number().nullable(), totalPrice: z.number().nullable(),
totalUnit: z.number().int().nullable(), totalUnit: z.number().int().nullable(),
currency: z.string().default(""), currency: z.string().default(""),
points: z.number().int().nullable(),
}), }),
comment: z.string().nullable().optional(), comment: z.string().nullable().optional(),
}) })
@@ -103,7 +102,6 @@ export const packageSchema = z
comment: packageData.comment, comment: packageData.comment,
code: packageData.code, code: packageData.code,
currency: packageData.price.currency, currency: packageData.price.currency,
points: packageData.price.points,
totalPrice: packageData.price.totalPrice ?? 0, totalPrice: packageData.price.totalPrice ?? 0,
totalUnit: packageData.price.totalUnit ?? 0, totalUnit: packageData.price.totalUnit ?? 0,
unit: packageData.price.unit ?? 0, unit: packageData.price.unit ?? 0,