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 add-commission-source

Kiran K5fb95e4efbd0
diff --cc apps/web/lib/partnerstack/import-commissions.ts
index b8a85f0ff9,19743d1a3f..d06fc1ba41
--- a/apps/web/lib/partnerstack/import-commissions.ts
+++ b/apps/web/lib/partnerstack/import-commissions.ts
@@@ -1,12 -1,6 +1,12 @@@
import { prisma } from "@/lib/prisma";
- import { nanoid } from "@dub/utils";
+ import { nanoid, sleep } from "@dub/utils";
-import { CommissionStatus, Customer, Link, Program } from "@prisma/client";
+import {
+ CommissionSource,
+ CommissionStatus,
+ Customer,
+ Link,
+ Program,
+} from "@prisma/client";
import { convertCurrencyWithFxRates } from "../analytics/convert-currency";
import { isFirstConversion } from "../analytics/is-first-conversion";
import { createId } from "../api/create-id";
diff --cc apps/web/lib/tolt/import-commissions.ts
index 94d73144cb,9e2b335834..498d5a38e3
--- a/apps/web/lib/tolt/import-commissions.ts
+++ b/apps/web/lib/tolt/import-commissions.ts
@@@ -1,14 -1,8 +1,14 @@@
import { prisma } from "@/lib/prisma";
import { sendEmail } from "@dub/email";
import ProgramImported from "@dub/email/templates/program-imported";
- import { nanoid } from "@dub/utils";
+ import { nanoid, sleep } from "@dub/utils";
-import { CommissionStatus, Customer, Link, Program } from "@prisma/client";
+import {
+ CommissionSource,
+ CommissionStatus,
+ Customer,
+ Link,
+ Program,
+} from "@prisma/client";
import { convertCurrencyWithFxRates } from "../analytics/convert-currency";
import { isFirstConversion } from "../analytics/is-first-conversion";
import { createId } from "../api/create-id";