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

Merged in feat/SW-207 (pull request #386)

Browse Source 
feat(SW-207): add expiring points and date when they will expire

Approved-by: Michael Zetterberg
This commit is contained in:
Simon.Emanuelsson
2024-08-07 08:53:48 +00:00
committed by Michael Zetterberg
parent 461df11e62 be620f18ba
commit 9796ff29c5
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/MyPages/Blocks/Overview/Stats/ExpiringPoints/index.tsx
View File

@@ -1,3 +1,6 @@
import { Lang } from "@/constants/languages"
import { dt } from "@/lib/dt"
import Body from "@/components/TempDesignSystem/Text/Body" import Body from "@/components/TempDesignSystem/Text/Body"
import { getIntl } from "@/i18n" import { getIntl } from "@/i18n"
import { getMembership } from "@/utils/user" import { getMembership } from "@/utils/user"
@@ -8,16 +11,19 @@ export default async function ExpiringPoints({ user }: UserProps) {
const { formatMessage } = await getIntl() const { formatMessage } = await getIntl()
const membership = getMembership(user.memberships) const membership = getMembership(user.memberships)
// TODO - add correct points when available from API // TODO - add correct points when available from API
if (!membership /* || !membership.expiringPoints*/) { if (!membership || !membership.pointsToExpire) {
// TODO: handle this case? // TODO: handle this case?
return null return null
} }
// sv hardcoded to force space on thousands
const formatter = new Intl.NumberFormat(Lang.sv)
const d = dt(membership.pointsExpiryDate)
return ( return (
<section> <section>
<Body color="white" textTransform="bold" textAlign="center"> <Body color="white" textTransform="bold" textAlign="center">
{membership.currentPoints} {formatMessage({ id: "points expiring by" })}{" "} {formatter.format(membership.pointsToExpire)}{" "}
{membership.expirationDate} {formatMessage({ id: "points expiring by" })} {d.format("YYYY-MM-DD")}
</Body> </Body>
</section> </section>
) )

2
server/routers/user/output.ts
View File

@@ -26,7 +26,9 @@ export const getUserSchema = z.object({
memberSince: z.string(), memberSince: z.string(),
membershipType: z.string(), membershipType: z.string(),
nextLevel: z.string().optional(), nextLevel: z.string().optional(),
pointsExpiryDate: z.string().optional(),
pointsRequiredToNextlevel: z.number().optional(), pointsRequiredToNextlevel: z.number().optional(),
pointsToExpire: z.number().optional(),
}) })
), ),
phoneNumber: z.string().optional(), phoneNumber: z.string().optional(),