The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
change orders over invoices for subscriptions
Pedro Ladeira287afc2fb2be
diff --git a/apps/web/lib/lemonsqueezy/api.ts b/apps/web/lib/lemonsqueezy/api.tsindex 7cc6d20cb8..b61bd37ad7 100644--- a/apps/web/lib/lemonsqueezy/api.ts+++ b/apps/web/lib/lemonsqueezy/api.ts@@ -214,18 +214,23 @@ export class LemonSqueezyApi {async listOrders({storeId,page = 1,+ include,}: {storeId: string;page?: number;+ include?: string;}): Promise<LemonSqueezyOrder[]> {const { data } = await this.listResources({path: "/orders",storeId,page,+ include,});return data.map((resource) =>- flattenResource(resource, lemonSqueezyOrderSchema),+ flattenResource(resource, lemonSqueezyOrderSchema, {+ subscription_ids: getRelationshipIds(resource, "subscriptions"),+ }),);}diff --git a/apps/web/lib/lemonsqueezy/import-commissions.ts b/apps/web/lib/lemonsqueezy/import-commissions.tsindex cd7fc73ea0..f96e9bafe4 100644--- a/apps/web/lib/lemonsqueezy/import-commissions.ts+++ b/apps/web/lib/lemonsqueezy/import-commissions.ts@@ -69,9 +69,10 @@ function resolveAmountUsd({return converted.currency.toUpperCase() === "USD" ? converted.amount : null;}-// Only renewals/updates — initials are covered by the Order import.-// Missing/unknown billing_reason is skipped to avoid double-counting.-const IMPORTABLE_INVOICE_REASONS = new Set(["renewal", "updated"]);+// Subscriptions: all periods come from invoices (including initial).+// Orders are one-time only (no related subscriptions). Missing/unknown+// billing_reason is skipped.+const IMPORTABLE_INVOICE_REASONS = new Set(["initial", "renewal", "updated"]);const toDubStatus = (status: string): CommissionStatus | null => {switch (status) {@@ -172,7 +173,7 @@ export async function importCommissions(payload: LemonSqueezyImportPayload) {return;}- // Finished orders → continue with subscription invoices (skip initial to avoid double-count)+ // Finished one-time orders → continue with subscription invoices (all periods)if (resource === "orders") {await lemonSqueezyImporter.queue({...payload,@@ -223,15 +224,21 @@ async function listOrderSaleEvents({storeId: string;page: number;}): Promise<{ saleEvents: SaleEvent[]; pageEmpty: boolean }> {- const orders = await lemonSqueezyApi.listOrders({ storeId, page });+ const orders = await lemonSqueezyApi.listOrders({+ storeId,+ page,+ include: "subscriptions",+ });if (orders.length === 0) {return { saleEvents: [], pageEmpty: true };}+ // One-time only — subscription first charges come from invoices (billing_reason: initial)const saleEvents = orders- .filter((order): order is LemonSqueezyOrder & { affiliate_id: number } =>- Boolean(order.affiliate_id),+ .filter(+ (order): order is LemonSqueezyOrder & { affiliate_id: number } =>+ Boolean(order.affiliate_id) && order.subscription_ids.length === 0,).map((order) => ({invoiceId: `ls_order_${order.id}`,diff --git a/apps/web/lib/lemonsqueezy/schemas.ts b/apps/web/lib/lemonsqueezy/schemas.tsindex 9039c67627..e34d1e1f61 100644--- a/apps/web/lib/lemonsqueezy/schemas.ts+++ b/apps/web/lib/lemonsqueezy/schemas.ts@@ -126,6 +126,8 @@ export const lemonSqueezyOrderSchema = z.object({price: z.number().nullish(),}).nullish(),+ // Populated when listing with include=subscriptions+ subscription_ids: z.array(z.string()).default([]),status: z.string(),refunded: z.boolean().nullish(),refunded_at: z.string().nullish(),