sudacode/ghostfolio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Bugfix/fix upgrade vs. renew subscription button labels (#4549)

Browse Source 
* Fix upgrade vs. renew subscription button labels
This commit is contained in:
Thomas Kaul 2025-04-17 20:33:11 +02:00 committed by GitHub
parent 5e64de6650
commit 07ad7f2817
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/api/src/app/subscription/subscription.service.ts
View File

@ -183,8 +183,8 @@ export class SubscriptionService {
});
return {
expiresAt,
offer,
expiresAt: isBefore(new Date(), expiresAt) ? expiresAt : undefined,
type: isBefore(new Date(), expiresAt)
? SubscriptionType.Premium
: SubscriptionType.Basic
@ -210,10 +210,15 @@ export class SubscriptionService {
return undefined;
}
const offers =
const offers: {
[offer in SubscriptionOfferKey]: SubscriptionOffer;
} =
((await this.propertyService.getByKey(PROPERTY_STRIPE_CONFIG)) as any) ??
{};
return offers[key];
return {
...offers[key],
isRenewal: key.startsWith('renewal')
};
}
}

10
apps/client/src/app/components/header/header.component.html
View File

@ -181,14 +181,10 @@
<a class="d-flex" mat-menu-item [routerLink]="routerLinkPricing"
><span class="align-items-center d-flex"
><span>
@if (user.subscription.offer === 'default') {
<ng-container i18n>Upgrade Plan</ng-container>
} @else if (
user.subscription.offer === 'renewal' ||
user.subscription.offer === 'renewal-early-bird-2023' ||
user.subscription.offer === 'renewal-early-bird-2024'
) {
@if (user.subscription.offer.isRenewal) {
<ng-container i18n>Renew Plan</ng-container>
} @else {
<ng-container i18n>Upgrade Plan</ng-container>
}
</span>
<gf-premium-indicator

10
apps/client/src/app/components/user-account-membership/user-account-membership.html
View File

@ -14,14 +14,10 @@
hasPermissionForSubscription && hasPermissionToUpdateUserSettings
) {
<button color="primary" mat-flat-button (click)="onCheckout()">
@if (user.subscription.offer === 'default') {
<ng-container i18n>Upgrade Plan</ng-container>
} @else if (
user.subscription.offer === 'renewal' ||
user.subscription.offer === 'renewal-early-bird-2023' ||
user.subscription.offer === 'renewal-early-bird-2024'
) {
@if (user.subscription.offer.isRenewal) {
<ng-container i18n>Renew Plan</ng-container>
} @else {
<ng-container i18n>Upgrade Plan</ng-container>
}
</button>
@if (price) {

10
apps/client/src/app/pages/pricing/pricing-page.html
View File

@ -306,14 +306,10 @@
mat-flat-button
(click)="onCheckout()"
>
@if (user.subscription.offer === 'default') {
<ng-container i18n>Upgrade Plan</ng-container>
} @else if (
user.subscription.offer === 'renewal' ||
user.subscription.offer === 'renewal-early-bird-2023' ||
user.subscription.offer === 'renewal-early-bird-2024'
) {
@if (user.subscription.offer.isRenewal) {
<ng-container i18n>Renew Plan</ng-container>
} @else {
<ng-container i18n>Upgrade Plan</ng-container>
}
</button>
<p class="m-0 text-muted">

1
libs/common/src/lib/interfaces/subscription-offer.interface.ts
View File

@ -4,6 +4,7 @@ export interface SubscriptionOffer {
coupon?: number;
couponId?: string;
durationExtension?: StringValue;
isRenewal?: boolean;
label?: string;
price: number;
priceId: string;