From 4db826ee6fbb85194ccf35bb95f870be458885da Mon Sep 17 00:00:00 2001 From: Bruce Tian Date: Tue, 7 May 2024 15:28:16 +0300 Subject: [PATCH 1/2] feat: increase team subscription to --- .../modules/userDashboard/components/OrgBilling/OrgPlan.tsx | 2 +- packages/client/utils/constants.ts | 2 +- .../server/graphql/queries/helpers/makeUpcomingInvoice.ts | 2 +- packages/server/utils/stripe/StripeManager.ts | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlan.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlan.tsx index af763e72a3c..5bb0600aad2 100644 --- a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlan.tsx +++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlan.tsx @@ -187,7 +187,7 @@ const OrgPlan = (props: Props) => { {planTier === 'team' ? ( <> - {'$6 per active user '} + {'$8 per active user '} {} diff --git a/packages/client/utils/constants.ts b/packages/client/utils/constants.ts index b2f4a0f77d5..5fb9d20ba04 100644 --- a/packages/client/utils/constants.ts +++ b/packages/client/utils/constants.ts @@ -100,7 +100,7 @@ export const AUTHENTICATION_PAGE = 'authentication' /* Stripe */ // changing this does NOT change it in stripe, it just changes the UI -export const MONTHLY_PRICE = 6 +export const MONTHLY_PRICE = 8 export const FAILED = 'FAILED' diff --git a/packages/server/graphql/queries/helpers/makeUpcomingInvoice.ts b/packages/server/graphql/queries/helpers/makeUpcomingInvoice.ts index 84bff7ba4a3..67300e239c3 100644 --- a/packages/server/graphql/queries/helpers/makeUpcomingInvoice.ts +++ b/packages/server/graphql/queries/helpers/makeUpcomingInvoice.ts @@ -35,7 +35,7 @@ export default async function makeUpcomingInvoice( : undefined const subscription = stripeInvoice.lines.data.find( - ({plan}) => plan?.id === StripeManager.PARABOL_TEAM_600 + ({plan}) => plan?.id === StripeManager.PARABOL_TEAM_800 ) if (subscription && subscription.quantity !== quantity) { const {subscription_item: lineitemId} = subscription diff --git a/packages/server/utils/stripe/StripeManager.ts b/packages/server/utils/stripe/StripeManager.ts index 28db42bd437..ddc2da364de 100644 --- a/packages/server/utils/stripe/StripeManager.ts +++ b/packages/server/utils/stripe/StripeManager.ts @@ -4,7 +4,7 @@ import {Logger} from '../Logger' import sendToSentry from '../sendToSentry' export default class StripeManager { - static PARABOL_TEAM_600 = 'parabol-pro-600' // $6/seat/mo + static PARABOL_TEAM_800 = 'parabol-pro-800' // $8/seat/mo static PARABOL_ENTERPRISE_2021_LOW = 'plan_2021_ann_low' static WEBHOOK_SECRET = process.env.STRIPE_WEBHOOK_SECRET! stripe = new Stripe(process.env.STRIPE_SECRET_KEY!, { @@ -141,7 +141,7 @@ export default class StripeManager { }, items: [ { - plan: StripeManager.PARABOL_TEAM_600, + plan: StripeManager.PARABOL_TEAM_800, quantity } ] @@ -164,7 +164,7 @@ export default class StripeManager { }, items: [ { - plan: StripeManager.PARABOL_TEAM_600, + plan: StripeManager.PARABOL_TEAM_800, quantity } ] From b59d0de6e51c2aeec86eb683dc07adaff293c515 Mon Sep 17 00:00:00 2001 From: Bruce Tian Date: Tue, 7 May 2024 16:30:19 +0300 Subject: [PATCH 2/2] Update some constants --- .../userDashboard/components/OrgBilling/OrgPlan.tsx | 3 ++- .../graphql/queries/helpers/makeUpcomingInvoice.ts | 2 +- packages/server/utils/stripe/StripeManager.ts | 10 +++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlan.tsx b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlan.tsx index 5bb0600aad2..0587c683d45 100644 --- a/packages/client/modules/userDashboard/components/OrgBilling/OrgPlan.tsx +++ b/packages/client/modules/userDashboard/components/OrgBilling/OrgPlan.tsx @@ -8,6 +8,7 @@ import useTooltip from '../../../../hooks/useTooltip' import {Elevation} from '../../../../styles/elevation' import {PALETTE} from '../../../../styles/paletteV3' import {Radius} from '../../../../types/constEnums' +import {MONTHLY_PRICE} from '../../../../utils/constants' const PlanTitle = styled('h6')({ color: PALETTE.SLATE_700, @@ -187,7 +188,7 @@ const OrgPlan = (props: Props) => { {planTier === 'team' ? ( <> - {'$8 per active user '} + {`$${MONTHLY_PRICE} per active user `} {} diff --git a/packages/server/graphql/queries/helpers/makeUpcomingInvoice.ts b/packages/server/graphql/queries/helpers/makeUpcomingInvoice.ts index 67300e239c3..13b53503b98 100644 --- a/packages/server/graphql/queries/helpers/makeUpcomingInvoice.ts +++ b/packages/server/graphql/queries/helpers/makeUpcomingInvoice.ts @@ -35,7 +35,7 @@ export default async function makeUpcomingInvoice( : undefined const subscription = stripeInvoice.lines.data.find( - ({plan}) => plan?.id === StripeManager.PARABOL_TEAM_800 + ({plan}) => plan?.id === StripeManager.TEAM_PRICE_APP_ID ) if (subscription && subscription.quantity !== quantity) { const {subscription_item: lineitemId} = subscription diff --git a/packages/server/utils/stripe/StripeManager.ts b/packages/server/utils/stripe/StripeManager.ts index ddc2da364de..5a2c74e665d 100644 --- a/packages/server/utils/stripe/StripeManager.ts +++ b/packages/server/utils/stripe/StripeManager.ts @@ -4,8 +4,8 @@ import {Logger} from '../Logger' import sendToSentry from '../sendToSentry' export default class StripeManager { - static PARABOL_TEAM_800 = 'parabol-pro-800' // $8/seat/mo - static PARABOL_ENTERPRISE_2021_LOW = 'plan_2021_ann_low' + static TEAM_PRICE_APP_ID = 'parabol-pro-800' // $8/seat/mo + static ENTERPRISE_PRICE_APP_ID = 'plan_2021_ann_low' static WEBHOOK_SECRET = process.env.STRIPE_WEBHOOK_SECRET! stripe = new Stripe(process.env.STRIPE_SECRET_KEY!, { apiVersion: '2020-08-27', @@ -116,7 +116,7 @@ export default class StripeManager { proration_behavior: 'none', items: [ { - plan: plan || StripeManager.PARABOL_ENTERPRISE_2021_LOW, + plan: plan || StripeManager.ENTERPRISE_PRICE_APP_ID, quantity } ] @@ -141,7 +141,7 @@ export default class StripeManager { }, items: [ { - plan: StripeManager.PARABOL_TEAM_800, + plan: StripeManager.TEAM_PRICE_APP_ID, quantity } ] @@ -164,7 +164,7 @@ export default class StripeManager { }, items: [ { - plan: StripeManager.PARABOL_TEAM_800, + plan: StripeManager.TEAM_PRICE_APP_ID, quantity } ]