Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

Merge branch 'main' into yearly-limits

Steven Tey9d0aae2da614
diff --cc apps/web/app/(ee)/api/stripe/webhook/checkout-session-completed.ts
index 9570016b04,b3f7ddfe4e..c8109fbc5c
--- a/apps/web/app/(ee)/api/stripe/webhook/checkout-session-completed.ts
+++ b/apps/web/app/(ee)/api/stripe/webhook/checkout-session-completed.ts
@@@ -100,8 -102,8 +100,9 @@@ export async function checkoutSessionCo
usersLimit: limits.users,
trialEndsAt,
paymentFailedAt: null,
+ subscriptionCanceledAt: null,
...(planPeriod !== undefined && { planPeriod }),
+ ...getSubscriptionBillingFields(subscription),
},
include: {
users: {
diff --cc apps/web/app/(ee)/api/stripe/webhook/utils/update-workspace-plan.ts
index 2acd9093c7,fa93521329..0fb405ceac
--- a/apps/web/app/(ee)/api/stripe/webhook/utils/update-workspace-plan.ts
+++ b/apps/web/app/(ee)/api/stripe/webhook/utils/update-workspace-plan.ts
@@@ -22,13 -22,13 +23,14 @@@ import { sendBatchEmail } from "@dub/em
import AdvancedPlanDowngradeNotice from "@dub/email/templates/advanced-plan-downgrade-notice";
import UpgradeEmail from "@dub/email/templates/upgrade-email";
import {
+ getBillingStartDate,
+ APP_DOMAIN_WITH_NGROK,
getPlanAndTierFromPriceId,
- getWorkspaceLimitsForStripeSubscriptionStatus,
+ NEW_BUSINESS_PRICE_IDS,
} from "@dub/utils";
-import { NEW_BUSINESS_PRICE_IDS } from "@dub/utils/src";
import type Stripe from "stripe";
-import { getPlanPeriodFromStripeSubscription } from "./stripe-plan-period";
+import { getPlanPeriodFromStripeSubscription } from "./get-plan-period-from-stripe-subscription";
+import { getWorkspaceLimitsFromStripeSubscription } from "./get-workspace-limits-from-stripe-subscription";
export async function updateWorkspacePlan({
workspace,