admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Set optional checkout.session.url (#4569)

Browse Source 
* Set optional checkout.session.url

* Lint

* Edit .env.example

* Vale CI

---------

Co-authored-by: Félix Malfait <felix.malfait@gmail.com>
This commit is contained in:
martmull
2024-03-20 07:04:07 +01:00
committed by GitHub
parent c90e379fc4
commit 35d41e38c8
7 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/twenty-front/src/config/index.ts
View File

@ -27,4 +27,4 @@ const getDefaultUrl = () => {
export const REACT_APP_SERVER_BASE_URL =
window._env_?.REACT_APP_SERVER_BASE_URL ||
process.env.REACT_APP_SERVER_BASE_URL ||
getDefaultUrl();
getDefaultUrl();

6
packages/twenty-front/src/generated/graphql.tsx
View File

@ -552,7 +552,7 @@ export type Sentry = {
export type SessionEntity = {
__typename?: 'SessionEntity';
url: Scalars['String'];
url?: Maybe<Scalars['String']>;
};
/** Sort Directions */
@ -1015,7 +1015,7 @@ export type BillingPortalSessionQueryVariables = Exact<{
}>;
export type BillingPortalSessionQuery = { __typename?: 'Query', billingPortalSession: { __typename?: 'SessionEntity', url: string } };
export type BillingPortalSessionQuery = { __typename?: 'Query', billingPortalSession: { __typename?: 'SessionEntity', url?: string | null } };
export type CheckoutSessionMutationVariables = Exact<{
recurringInterval: Scalars['String'];
@ -1023,7 +1023,7 @@ export type CheckoutSessionMutationVariables = Exact<{
}>;
export type CheckoutSessionMutation = { __typename?: 'Mutation', checkoutSession: { __typename?: 'SessionEntity', url: string } };
export type CheckoutSessionMutation = { __typename?: 'Mutation', checkoutSession: { __typename?: 'SessionEntity', url?: string | null } };
export type GetProductPricesQueryVariables = Exact<{
product: Scalars['String'];

7
packages/twenty-front/src/pages/settings/SettingsBilling.tsx
View File

@ -35,6 +35,9 @@ export const SettingsBilling = () => {
},
});
const billingPortalButtonDisabled =
loading || !isDefined(data) || !isDefined(data.billingPortalSession.url);
const displayPaymentFailInfo =
onboardingStatus === OnboardingStatus.PastDue ||
onboardingStatus === OnboardingStatus.Unpaid;
@ -46,7 +49,7 @@ export const SettingsBilling = () => {
onboardingStatus === OnboardingStatus.CompletedWithoutSubscription;
const openBillingPortal = () => {
if (isDefined(data)) {
if (isDefined(data) && isDefined(data.billingPortalSession.url)) {
window.location.replace(data.billingPortalSession.url);
}
};
@ -95,7 +98,7 @@ export const SettingsBilling = () => {
title="View billing details"
variant="secondary"
onClick={openBillingPortal}
disabled={loading}
disabled={billingPortalButtonDisabled}
/>
</Section>
)}