Skip to content

fix: ensure billing interval is passed when converting old pro #8449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 15, 2024
+31 −2
Merged

fix: ensure billing interval is passed when converting old pro #8449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion packages/app/src/app/components/WorkspaceSetup/steps/ChangePlan.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import track from '@codesandbox/common/lib/utils/analytics';
import { Stack, Button, Text, Icon } from '@codesandbox/components';
import * as dashboardUrls from '@codesandbox/common/lib/utils/url-generator/dashboard';

import { SubscriptionInterval } from 'app/graphql/types';
import { useURLSearchParams } from 'app/hooks/useURLSearchParams';
import { useActions, useAppState } from 'app/overmind';
import { StepProps } from '../types';
Expand Down Expand Up @@ -59,7 +60,11 @@ export const ChangePlan: React.FC<StepProps> = ({
<Text>{checkout.newSubscription.totalCredits} VM credits</Text>
</Stack>
<Text size={6} color="#e5e5e5">
${checkout.newSubscription.totalPrice} / month
${checkout.newSubscription.totalPrice} /{' '}
{checkout.newSubscription.billingInterval ===
SubscriptionInterval.Monthly
? 'month'
: 'year'}
</Text>
</Stack>

Expand Down
14 changes: 14 additions & 0 deletions packages/app/src/app/graphql/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2237,6 +2237,7 @@ export type RootMutationTypeChangeTeamMemberAuthorizationsArgs = {

export type RootMutationTypeConvertToUsageBillingArgs = {
addons: Array<Scalars['String']>;
billingInterval: InputMaybe<SubscriptionInterval>;
plan: Scalars['String'];
teamId: Scalars['UUID4'];
};
Expand Down Expand Up @@ -2473,6 +2474,7 @@ export type RootMutationTypePermanentlyDeleteSandboxesArgs = {

export type RootMutationTypePreviewConvertToUsageBillingArgs = {
addons: Array<Scalars['String']>;
billingInterval: InputMaybe<SubscriptionInterval>;
plan: Scalars['String'];
teamId: Scalars['UUID4'];
};
Expand Down Expand Up @@ -5652,6 +5654,7 @@ export type PreviewConvertToUsageBillingMutationVariables = Exact<{
teamId: Scalars['UUID4'];
addons: Array<Scalars['String']> | Scalars['String'];
plan: Scalars['String'];
billingInterval: InputMaybe<SubscriptionInterval>;
}>;

export type PreviewConvertToUsageBillingMutation = {
Expand All @@ -5667,6 +5670,7 @@ export type ConvertToUsageBillingMutationVariables = Exact<{
teamId: Scalars['UUID4'];
addons: Array<Scalars['String']> | Scalars['String'];
plan: Scalars['String'];
billingInterval: InputMaybe<SubscriptionInterval>;
}>;

export type ConvertToUsageBillingMutation = {
Expand Down Expand Up @@ -5753,6 +5757,16 @@ export type SetTeamMetadataMutation = {
ubbBeta: boolean;
friendOfCsb: boolean;
};
limits: {
__typename?: 'TeamLimits';
includedPublicSandboxes: number;
includedPrivateSandboxes: number;
};
usage: {
__typename?: 'TeamUsage';
publicSandboxesQuantity: number;
privateSandboxesQuantity: number;
};
};
};

Expand Down
10 changes: 9 additions & 1 deletion packages/app/src/app/overmind/effects/gql/dashboard/mutations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,11 +436,13 @@ export const previewConvertToUsageBilling: Query<
$teamId: UUID4!
$addons: [String!]!
$plan: String!
$billingInterval: SubscriptionInterval
) {
previewConvertToUsageBilling(
plan: $plan
addons: $addons
teamId: $teamId
billingInterval: $billingInterval
) {
total
totalExcludingTax
Expand All @@ -456,8 +458,14 @@ export const convertToUsageBilling: Query<
$teamId: UUID4!
$addons: [String!]!
$plan: String!
$billingInterval: SubscriptionInterval
) {
convertToUsageBilling(plan: $plan, addons: $addons, teamId: $teamId)
convertToUsageBilling(
plan: $plan
addons: $addons
teamId: $teamId
billingInterval: $billingInterval
)
}
`;

Expand Down
2 changes: 2 additions & 0 deletions packages/app/src/app/overmind/namespaces/checkout/actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,7 @@ export const calculateConversionCharge = async (
teamId: workspaceId,
plan: newSubscription.basePlan.id,
addons: actions.checkout.getFlatAddonsList(),
billingInterval: newSubscription.billingInterval,
});

// Cap the values to a min of 0
Expand Down Expand Up @@ -391,6 +392,7 @@ export const convertToUsageBilling = async (
teamId: workspaceId,
plan: newSubscription.basePlan.id,
addons: actions.checkout.getFlatAddonsList(),
billingInterval: newSubscription.billingInterval,
});

return { success: true };
Expand Down