Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Improve manual commission flow to reuse existing events if present #2853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
steven-tey merged 34 commits into from
Sep 18, 2025
Merged

Improve manual commission flow to reuse existing events if present #2853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
8c803cc
Improve manual commission flow to reuse existing events if present
steven-tey Sep 17, 2025
224d469
fetch events for customer
devkiran Sep 17, 2025
e4a599a
duplicate the events for customers
devkiran Sep 17, 2025
a9a8291
Update create-manual-commission.ts
devkiran Sep 17, 2025
45c63a2
Update create-manual-commission.ts
devkiran Sep 17, 2025
d3eda3b
Update create-commission-sheet.tsx
devkiran Sep 17, 2025
ea3041f
Update create-commission-sheet.tsx
devkiran Sep 17, 2025
aaff137
rename to includedEventIds
devkiran Sep 17, 2025
40b37ef
simplify the sheet
devkiran Sep 17, 2025
e66b743
Update create-manual-commission.ts
devkiran Sep 17, 2025
819003a
revert the eventId filter
devkiran Sep 17, 2025
2533796
Merge branch 'main' into improve-manual-commission
steven-tey Sep 17, 2025
7258bae
Update create-manual-commission.ts
devkiran Sep 17, 2025
e46bb0b
Merge branch 'improve-manual-commission' of https://github.com/dubinc…
devkiran Sep 17, 2025
93226a3
Update create-manual-commission.ts
devkiran Sep 17, 2025
ba5bba7
Update create-manual-commission.ts
devkiran Sep 17, 2025
89979b8
Update create-commission-sheet.tsx
devkiran Sep 17, 2025
428bc9b
Merge branch 'main' into improve-manual-commission
steven-tey Sep 17, 2025
f3646be
remove PartnerDetailsSheet, small updates
steven-tey Sep 18, 2025
d72440b
final changes
steven-tey Sep 18, 2025
ab23477
remove suspended promises
steven-tey Sep 18, 2025
346a86e
Update create-commission-sheet.tsx
devkiran Sep 18, 2025
7b49708
Merge branch 'main' into improve-manual-commission
steven-tey Sep 18, 2025
b7b72e8
use provided invoiceId
devkiran Sep 18, 2025
e5a50c2
Update create-manual-commission.ts
devkiran Sep 18, 2025
3bd0ed5
fix Sale events validation incorrectly blocks lead commission creation
devkiran Sep 18, 2025
0507772
add back suspended promises
steven-tey Sep 18, 2025
68830a5
ensure newClickAttributes are not overriden
steven-tey Sep 18, 2025
b34c9cb
Update create-manual-commission.ts
steven-tey Sep 18, 2025
e6fca91
refactor commissionsToCreate
steven-tey Sep 18, 2025
3fdff7a
fix timestamps, fix createPartnerCommission
steven-tey Sep 18, 2025
00ad79e
fix timezone issues
steven-tey Sep 18, 2025
a04a1ad
fix timezone issues...again!!
steven-tey Sep 18, 2025
dd68fa0
final timezone fix please...for the love of god
steven-tey Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
716 changes: 435 additions & 281 deletions ...eb/app/app.dub.co/(dashboard)/[slug]/(ee)/program/commissions/create-commission-sheet.tsx
View file
Open in desktop

Large diffs are not rendered by default.

30 changes: 2 additions & 28 deletions apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/partners-table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import { useArchivePartnerModal } from "@/ui/partners/archive-partner-modal";
import { useBanPartnerModal } from "@/ui/partners/ban-partner-modal";
import { useChangeGroupModal } from "@/ui/partners/change-group-modal";
import { GroupColorCircle } from "@/ui/partners/groups/group-color-circle";
import { PartnerDetailsSheet } from "@/ui/partners/partner-details-sheet";
import { PartnerRowItem } from "@/ui/partners/partner-row-item";
import { PartnerStatusBadges } from "@/ui/partners/partner-status-badges";
import { useUnbanPartnerModal } from "@/ui/partners/unban-partner-modal";
Expand Down Expand Up @@ -56,7 +55,7 @@ import { Command } from "cmdk";
import { LockOpen } from "lucide-react";
import { useAction } from "next-safe-action/hooks";
import { useParams, useRouter } from "next/navigation";
import { useEffect, useMemo, useState } from "react";
import { useMemo, useState } from "react";
import { toast } from "sonner";
import useSWR from "swr";
import { usePartnerFilters } from "./use-partner-filters";
Expand Down Expand Up @@ -133,22 +132,6 @@ export function PartnersTable() {
},
);

const [detailsSheetState, setDetailsSheetState] = useState<
| { open: false; partnerId: string | null }
| { open: true; partnerId: string }
>({ open: false, partnerId: null });

useEffect(() => {
const partnerId = searchParams.get("partnerId");
if (partnerId) setDetailsSheetState({ open: true, partnerId });
}, [searchParams]);

const { currentPartner, isLoading: isCurrentPartnerLoading } =
useCurrentPartner({
partners,
partnerId: detailsSheetState.partnerId,
});

const { groups } = useGroups();

const [pendingChangeGroupPartners, setPendingChangeGroupPartners] = useState<
Expand Down Expand Up @@ -394,22 +377,13 @@ export function PartnersTable() {
tdClassName: "border-l-0",
resourceName: (p) => `partner${p ? "s" : ""}`,
rowCount: partnersCount || 0,
loading: isLoading || isCurrentPartnerLoading,
loading: isLoading,
error: error || countError ? "Failed to load partners" : undefined,
});

return (
<div className="flex flex-col gap-6">
<ChangeGroupModal />
{detailsSheetState.partnerId && currentPartner && (
<PartnerDetailsSheet
isOpen={detailsSheetState.open}
setIsOpen={(open) =>
setDetailsSheetState((s) => ({ ...s, open }) as any)
}
partner={currentPartner}
/>
)}
<div>
<div className="flex flex-col gap-3 md:flex-row md:items-center md:justify-between">
<Filter.Select
Expand Down
Loading