Merge branch 'dub-customer' of https://github.com/dubinc/dub into dub…

…-customer

apps/web/app/api/workspaces/[idOrSlug]/billing/invoices/route.ts

@@ -46,19 +46,9 @@ const subscriptionInvoices = async (stripeId: string) => {
 };
 
 const payoutInvoices = async (workspaceId: string) => {
-  const program = await prisma.program.findFirst({
-    where: {
-      workspaceId,
-    },
-  });
-
-  if (!program) {
-    return [];
-  }
-
   const invoices = await prisma.invoice.findMany({
     where: {
-      programId: program.id,
+      workspaceId,
     },
     select: {
       id: true,

apps/web/lib/actions/partners/confirm-payouts.ts

@@ -74,6 +74,7 @@ export const confirmPayoutsAction = authActionClient
         data: {
           id: createId({ prefix: "inv_" }),
           programId,
+          workspaceId: workspace.id,
           amount,
           fee,
           total,

packages/prisma/schema/invoice.prisma

@@ -7,15 +7,19 @@ enum InvoiceStatus {
 model Invoice {
   id              String   @id @default(cuid())
   programId       String
+  workspaceId     String
   status          InvoiceStatus   @default(processing)
   amount          Int      @default(0)
   fee             Int      @default(0)
   total           Int      @default(0)
   receiptUrl      String?  @db.LongText
   createdAt       DateTime @default(now())
 
-  program Program  @relation(fields: [programId], references: [id])
   payouts Payout[]
+  program Program  @relation(fields: [programId], references: [id])
+  workspace Project @relation(fields: [workspaceId], references: [id])
 
   @@index([programId])
+  @@index([workspaceId])
+  
 }

packages/prisma/schema/workspace.prisma

@@ -44,6 +44,7 @@ model Project {
   domains               Domain[]
   tags                  Tag[]
   programs              Program[]
+  invoices              Invoice[]
   customers             Customer[]
   defaultDomains        DefaultDomains[]
   restrictedTokens      RestrictedToken[]