chunzhi/comfyui-deploy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: make sure we were able to detect the pricing plan correct when not in a org

Browse Source
This commit is contained in:
bennykok 2024-01-26 00:28:05 +08:00
parent 6f0499c657
commit 8305134a8e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/app/(app)/api/stripe/callback/route.tsx
View File

@ -89,7 +89,7 @@ export async function POST(req: Request) {
.insert(subscriptionStatusTable) .insert(subscriptionStatusTable)
.values({ .values({
stripe_customer_id: customerId, stripe_customer_id: customerId,
org_id: orgId, org_id: orgId && orgId.length > 0 && orgId != "null" ? orgId : null,
user_id: userId, user_id: userId,
subscription_id: subscriptionId, subscription_id: subscriptionId,
plan: plan as "pro" | "enterprise" | "basic", plan: plan as "pro" | "enterprise" | "basic",

4
web/src/server/getCurrentPlan.tsx
View File

@ -1,5 +1,5 @@
import { db } from "@/db/db"; import { db } from "@/db/db";
import { and, desc, eq, isNull } from "drizzle-orm"; import { and, desc, eq, isNull, or } from "drizzle-orm";
import { subscriptionStatusTable } from "@/db/schema"; import { subscriptionStatusTable } from "@/db/schema";
import { APIKeyUserType } from "@/server/APIKeyBodyRequest"; import { APIKeyUserType } from "@/server/APIKeyBodyRequest";
import { auth } from "@clerk/nextjs"; import { auth } from "@clerk/nextjs";
@ -23,7 +23,7 @@ export async function getCurrentPlan({ user_id, org_id }: APIKeyUserType) {
eq(subscriptionStatusTable.user_id, user_id), eq(subscriptionStatusTable.user_id, user_id),
org_id org_id
? eq(subscriptionStatusTable.org_id, org_id) ? eq(subscriptionStatusTable.org_id, org_id)
: isNull(subscriptionStatusTable.org_id), : or(isNull(subscriptionStatusTable.org_id), eq(subscriptionStatusTable.org_id, "")),
), ),
orderBy: desc(subscriptionStatusTable.created_at), orderBy: desc(subscriptionStatusTable.created_at),
}); });