From e3cc96feb2b89d8f9161a7ebe13d1d7c8aaa62a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aaron=20D=C3=B6tsch?= <aaron@fsmpi.rwth-aachen.de>
Date: Sat, 5 Aug 2023 19:16:09 +0200
Subject: [PATCH] Alter RefundNotificationType
---
src/lib/notifications/types.ts | 2 +-
src/lib/server/notifications/formatter.ts | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/lib/notifications/types.ts b/src/lib/notifications/types.ts
index 415221e..9fb6607 100644
--- a/src/lib/notifications/types.ts
+++ b/src/lib/notifications/types.ts
@@ -5,7 +5,7 @@ export type User = {name: string, id: number}
export type NotificationType<T extends PossibleNotificationType> = {key: number, name: T};
export type BuyNotificationData = {total: number, items: Item[], balanceBefore: number, balanceAfter: number};
-export type RefundNotificationData = {refund: number, item: Item, balanceBefore: number, balanceAfter: number, timeBought: Date};
+export type RefundNotificationData = {refund: {price: number, premium: number, total: number}, item: Item, balanceBefore: number, balanceAfter: number, timeBought: Date};
export type DepositNotificationData = {amount: number, balanceBefore: number, balanceAfter: number};
export type WithdrawNotificationData = {amount: number, balanceBefore: number, balanceAfter: number};
export type UseVoucherNotificationData = {voucher: {code: string, value: number}, balanceBefore: number, balanceAfter: number};
diff --git a/src/lib/server/notifications/formatter.ts b/src/lib/server/notifications/formatter.ts
index f8a7425..6c117aa 100644
--- a/src/lib/server/notifications/formatter.ts
+++ b/src/lib/server/notifications/formatter.ts
@@ -41,7 +41,8 @@ Gesamt: ${(total/100).toFixed(2)}€` + (premiums > 0 ? ` (davon ${(premiums/100
}
case "refund": {
const {refund, item, balanceBefore, balanceAfter, timeBought} = data as NotificationData<"refund">;
- return `Dir wurden ${(refund/100).toFixed(2)}€ für ${item.name} (${item.code}) erstattet, gekauft am ${timeBought.toLocaleString()}.
+ const premiumMessage = refund.premium && refund.premium > 0 ? ` (+${(refund.premium/100).toFixed(2)}€)` : "";
+ return `Dir wurden ${(refund.price/100).toFixed(2)}€${premiumMessage} für ${item.name} (${item.code}) erstattet, gekauft am ${timeBought.toLocaleString()}.
Dein neuer Kontostand beträgt ${(balanceAfter/100).toFixed(2)}€.`;
}
case "deposit": {
--
GitLab