Skip to content

Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍

Feature/Improve subscription service (#3989)

Thomas Kaul4104fb2f8f08
diff --git a/apps/api/src/app/subscription/subscription.controller.ts b/apps/api/src/app/subscription/subscription.controller.ts
index f4ca6d4272..a042b2ea25 100644
--- a/apps/api/src/app/subscription/subscription.controller.ts
+++ b/apps/api/src/app/subscription/subscription.controller.ts
@@ -113,7 +113,7 @@ export class SubscriptionController {
@Post('stripe/checkout-session')
@UseGuards(AuthGuard('jwt'), HasPermissionGuard)
public async createCheckoutSession(
- @Body() { couponId, priceId }: { couponId: string; priceId: string }
+ @Body() { couponId, priceId }: { couponId?: string; priceId: string }
) {
try {
return this.subscriptionService.createCheckoutSession({
diff --git a/apps/api/src/app/subscription/subscription.service.ts b/apps/api/src/app/subscription/subscription.service.ts
index 5454506692..7c1df023ca 100644
--- a/apps/api/src/app/subscription/subscription.service.ts
+++ b/apps/api/src/app/subscription/subscription.service.ts
@@ -124,7 +124,9 @@ export class SubscriptionService {
let offer: SubscriptionOffer = price ? 'renewal' : 'default';
if (isBefore(createdAt, parseDate('2023-01-01'))) {
- offer = 'renewal-early-bird';
+ offer = 'renewal-early-bird-2023';
+ } else if (isBefore(createdAt, parseDate('2024-01-01'))) {
+ offer = 'renewal-early-bird-2024';
}
return {
diff --git a/apps/client/src/app/components/header/header.component.html b/apps/client/src/app/components/header/header.component.html
index 2e9c031229..ff36c2ebe0 100644
--- a/apps/client/src/app/components/header/header.component.html
+++ b/apps/client/src/app/components/header/header.component.html
@@ -180,7 +180,8 @@
<ng-container i18n>Upgrade Plan</ng-container>
} @else if (
user.subscription.offer === 'renewal' ||
- user.subscription.offer === 'renewal-early-bird'
+ user.subscription.offer === 'renewal-early-bird-2023' ||
+ user.subscription.offer === 'renewal-early-bird-2024'
) {
<ng-container i18n>Renew Plan</ng-container>
}
diff --git a/apps/client/src/app/components/user-account-membership/user-account-membership.html b/apps/client/src/app/components/user-account-membership/user-account-membership.html
index 644ec06053..d30ce7bdd2 100644
--- a/apps/client/src/app/components/user-account-membership/user-account-membership.html
+++ b/apps/client/src/app/components/user-account-membership/user-account-membership.html
@@ -16,7 +16,8 @@
<ng-container i18n>Upgrade Plan</ng-container>
} @else if (
user.subscription.offer === 'renewal' ||
- user.subscription.offer === 'renewal-early-bird'
+ user.subscription.offer === 'renewal-early-bird-2023' ||
+ user.subscription.offer === 'renewal-early-bird-2024'
) {
<ng-container i18n>Renew Plan</ng-container>
}
diff --git a/apps/client/src/app/pages/pricing/pricing-page.html b/apps/client/src/app/pages/pricing/pricing-page.html
index 1caa4e8a01..fe805ef62f 100644
--- a/apps/client/src/app/pages/pricing/pricing-page.html
+++ b/apps/client/src/app/pages/pricing/pricing-page.html
@@ -278,7 +278,8 @@
<ng-container i18n>Upgrade Plan</ng-container>
} @else if (
user.subscription.offer === 'renewal' ||
- user.subscription.offer === 'renewal-early-bird'
+ user.subscription.offer === 'renewal-early-bird-2023' ||
+ user.subscription.offer === 'renewal-early-bird-2024'
) {
<ng-container i18n>Renew Plan</ng-container>
}
diff --git a/libs/common/src/lib/types/subscription-offer.type.ts b/libs/common/src/lib/types/subscription-offer.type.ts
index 180088b1ea..98977da455 100644
--- a/libs/common/src/lib/types/subscription-offer.type.ts
+++ b/libs/common/src/lib/types/subscription-offer.type.ts
@@ -1 +1,5 @@
-export type SubscriptionOffer = 'default' | 'renewal' | 'renewal-early-bird';
+export type SubscriptionOffer =
+ | 'default'
+ | 'renewal'
+ | 'renewal-early-bird-2023'
+ | 'renewal-early-bird-2024';