devops/encoach_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Solved a bug with the redirection

Browse Source
This commit is contained in:
Tiago Ribeiro
2024-03-13 09:18:14 +00:00
parent 528299571c
commit 49d2680a07
1 changed files with 1113 additions and 1360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

455
src/pages/payment-record.tsx
View File

@@ -9,15 +9,7 @@ import { shouldRedirectHome } from "@/utils/navigation.disabled";
import usePayments from "@/hooks/usePayments"; import usePayments from "@/hooks/usePayments";
import usePaypalPayments from "@/hooks/usePaypalPayments"; import usePaypalPayments from "@/hooks/usePaypalPayments";
import {Payment, PaypalPayment} from "@/interfaces/paypal"; import {Payment, PaypalPayment} from "@/interfaces/paypal";
import { import {CellContext, createColumnHelper, flexRender, getCoreRowModel, HeaderGroup, Table, useReactTable} from "@tanstack/react-table";
CellContext,
createColumnHelper,
flexRender,
getCoreRowModel,
HeaderGroup,
Table,
useReactTable,
} from "@tanstack/react-table";
import {CURRENCIES} from "@/resources/paypal"; import {CURRENCIES} from "@/resources/paypal";
import {BsTrash} from "react-icons/bs"; import {BsTrash} from "react-icons/bs";
import axios from "axios"; import axios from "axios";
@@ -46,16 +38,16 @@ export const getServerSideProps = withIronSessionSsr(({ req, res }) => {
redirect: { redirect: {
destination: "/login", destination: "/login",
permanent: false, permanent: false,
} },
}; };
} }
if (shouldRedirectHome(user) || !["admin", "developer"].includes(user.type)) { if (shouldRedirectHome(user) || !["admin", "developer", "agent", "corporate"].includes(user.type)) {
return { return {
redirect: { redirect: {
destination: "/", destination: "/",
permanent: false, permanent: false,
} },
}; };
} }
@@ -67,15 +59,7 @@ export const getServerSideProps = withIronSessionSsr(({ req, res }) => {
const columnHelper = createColumnHelper<Payment>(); const columnHelper = createColumnHelper<Payment>();
const paypalColumnHelper = createColumnHelper<PaypalPaymentWithUserData>(); const paypalColumnHelper = createColumnHelper<PaypalPaymentWithUserData>();
const PaymentCreator = ({ const PaymentCreator = ({onClose, reload, showComission = false}: {onClose: () => void; reload: () => void; showComission: boolean}) => {
onClose,
reload,
showComission = false,
}: {
onClose: () => void;
reload: () => void;
showComission: boolean;
}) => {
const [corporate, setCorporate] = useState<CorporateUser>(); const [corporate, setCorporate] = useState<CorporateUser>();
const [date, setDate] = useState<Date>(new Date()); const [date, setDate] = useState<Date>(new Date());
@@ -87,9 +71,7 @@ const PaymentCreator = ({
const referralAgent = useMemo(() => { const referralAgent = useMemo(() => {
if (corporate?.corporateInformation?.referralAgent) { if (corporate?.corporateInformation?.referralAgent) {
return users.find( return users.find((u) => u.id === corporate.corporateInformation.referralAgent);
(u) => u.id === corporate.corporateInformation.referralAgent
);
} }
return undefined; return undefined;
@@ -122,24 +104,16 @@ const PaymentCreator = ({
<h1 className="text-2xl font-semibold">New Payment</h1> <h1 className="text-2xl font-semibold">New Payment</h1>
<div className="flex flex-col gap-4"> <div className="flex flex-col gap-4">
<div className="flex flex-col gap-3"> <div className="flex flex-col gap-3">
<label className="font-normal text-base text-mti-gray-dim"> <label className="font-normal text-base text-mti-gray-dim">Corporate account *</label>
Corporate account *
</label>
<Select <Select
className="px-4 py-4 w-full text-sm font-normal placeholder:text-mti-gray-cool disabled:bg-mti-gray-platinum/40 disabled:text-mti-gray-dim disabled:cursor-not-allowed bg-white rounded-full border border-mti-gray-platinum focus:outline-none" className="px-4 py-4 w-full text-sm font-normal placeholder:text-mti-gray-cool disabled:bg-mti-gray-platinum/40 disabled:text-mti-gray-dim disabled:cursor-not-allowed bg-white rounded-full border border-mti-gray-platinum focus:outline-none"
options={( options={(users.filter((u) => u.type === "corporate") as CorporateUser[]).map((user) => ({
users.filter((u) => u.type === "corporate") as CorporateUser[]
).map((user) => ({
value: user.id, value: user.id,
meta: user, meta: user,
label: `${ label: `${user.corporateInformation?.companyInformation?.name || user.name} - ${user.email}`,
user.corporateInformation?.companyInformation?.name || user.name
} - ${user.email}`,
}))} }))}
defaultValue={{value: "undefined", label: "Select an account"}} defaultValue={{value: "undefined", label: "Select an account"}}
onChange={(value) => onChange={(value) => setCorporate((value as any)?.meta ?? undefined)}
setCorporate((value as any)?.meta ?? undefined)
}
menuPortalTarget={document?.body} menuPortalTarget={document?.body}
styles={{ styles={{
menuPortal: (base) => ({...base, zIndex: 9999}), menuPortal: (base) => ({...base, zIndex: 9999}),
@@ -154,11 +128,7 @@ const PaymentCreator = ({
}), }),
option: (styles, state) => ({ option: (styles, state) => ({
...styles, ...styles,
backgroundColor: state.isFocused backgroundColor: state.isFocused ? "#D5D9F0" : state.isSelected ? "#7872BF" : "white",
? "#D5D9F0"
: state.isSelected
? "#7872BF"
: "white",
color: state.isFocused ? "black" : styles.color, color: state.isFocused ? "black" : styles.color,
}), }),
}} }}
@@ -166,19 +136,9 @@ const PaymentCreator = ({
</div> </div>
<div className="flex flex-col gap-3 w-full"> <div className="flex flex-col gap-3 w-full">
<label className="font-normal text-base text-mti-gray-dim"> <label className="font-normal text-base text-mti-gray-dim">Price *</label>
Price *
</label>
<div className="w-full grid grid-cols-5 gap-2"> <div className="w-full grid grid-cols-5 gap-2">
<Input <Input name="paymentValue" onChange={() => {}} type="number" value={price} defaultValue={0} className="col-span-3" disabled />
name="paymentValue"
onChange={() => {}}
type="number"
value={price}
defaultValue={0}
className="col-span-3"
disabled
/>
<Select <Select
className="px-4 col-span-2 py-4 w-full text-sm font-normal placeholder:text-mti-gray-cool bg-mti-gray-platinum/40 text-mti-gray-dim cursor-not-allowed rounded-full border border-mti-gray-platinum focus:outline-none" className="px-4 col-span-2 py-4 w-full text-sm font-normal placeholder:text-mti-gray-cool bg-mti-gray-platinum/40 text-mti-gray-dim cursor-not-allowed rounded-full border border-mti-gray-platinum focus:outline-none"
options={CURRENCIES.map(({label, currency}) => ({ options={CURRENCIES.map(({label, currency}) => ({
@@ -187,16 +147,12 @@ const PaymentCreator = ({
}))} }))}
defaultValue={{ defaultValue={{
value: currency || "EUR", value: currency || "EUR",
label: label: CURRENCIES.find((c) => c.currency === currency)?.label || "Euro",
CURRENCIES.find((c) => c.currency === currency)?.label ||
"Euro",
}} }}
onChange={() => {}} onChange={() => {}}
value={{ value={{
value: currency || "EUR", value: currency || "EUR",
label: label: CURRENCIES.find((c) => c.currency === currency)?.label || "Euro",
CURRENCIES.find((c) => c.currency === currency)?.label ||
"Euro",
}} }}
menuPortalTarget={document?.body} menuPortalTarget={document?.body}
styles={{ styles={{
@@ -212,11 +168,7 @@ const PaymentCreator = ({
}), }),
option: (styles, state) => ({ option: (styles, state) => ({
...styles, ...styles,
backgroundColor: state.isFocused backgroundColor: state.isFocused ? "#D5D9F0" : state.isSelected ? "#7872BF" : "white",
? "#D5D9F0"
: state.isSelected
? "#7872BF"
: "white",
color: state.isFocused ? "black" : styles.color, color: state.isFocused ? "black" : styles.color,
}), }),
}} }}
@@ -227,27 +179,14 @@ const PaymentCreator = ({
{showComission && ( {showComission && (
<div className="flex gap-4 w-full"> <div className="flex gap-4 w-full">
<div className="flex flex-col w-full gap-3"> <div className="flex flex-col w-full gap-3">
<label className="font-normal text-base text-mti-gray-dim"> <label className="font-normal text-base text-mti-gray-dim">Commission *</label>
Commission * <Input name="commission" onChange={() => {}} type="number" defaultValue={0} value={commission} disabled />
</label>
<Input
name="commission"
onChange={() => {}}
type="number"
defaultValue={0}
value={commission}
disabled
/>
</div> </div>
<div className="flex flex-col w-full gap-3"> <div className="flex flex-col w-full gap-3">
<label className="font-normal text-base text-mti-gray-dim"> <label className="font-normal text-base text-mti-gray-dim">Commission Value*</label>
Commission Value*
</label>
<Input <Input
name="commissionValue" name="commissionValue"
value={`${(commission! / 100) * price!} ${ value={`${(commission! / 100) * price!} ${CURRENCIES.find((c) => c.currency === currency)?.label}`}
CURRENCIES.find((c) => c.currency === currency)?.label
}`}
onChange={() => null} onChange={() => null}
type="text" type="text"
defaultValue={0} defaultValue={0}
@@ -259,14 +198,12 @@ const PaymentCreator = ({
<div className="flex gap-4"> <div className="flex gap-4">
<div className="flex flex-col w-full gap-3"> <div className="flex flex-col w-full gap-3">
<label className="font-normal text-base text-mti-gray-dim"> <label className="font-normal text-base text-mti-gray-dim">Date *</label>
Date *
</label>
<ReactDatePicker <ReactDatePicker
className={clsx( className={clsx(
"p-6 w-full min-h-[70px] flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer", "p-6 w-full min-h-[70px] flex justify-center text-sm font-normal rounded-full border focus:outline-none cursor-pointer",
"hover:border-mti-purple tooltip", "hover:border-mti-purple tooltip",
"transition duration-300 ease-in-out" "transition duration-300 ease-in-out",
)} )}
dateFormat="dd/MM/yyyy" dateFormat="dd/MM/yyyy"
selected={moment(date).toDate()} selected={moment(date).toDate()}
@@ -275,16 +212,10 @@ const PaymentCreator = ({
</div> </div>
<div className="flex flex-col w-full gap-3"> <div className="flex flex-col w-full gap-3">
<label className="font-normal text-base text-mti-gray-dim"> <label className="font-normal text-base text-mti-gray-dim">Country Manager *</label>
Country Manager *
</label>
<Input <Input
name="referralAgent" name="referralAgent"
value={ value={referralAgent ? `${referralAgent.name} - ${referralAgent.email}` : "No country manager"}
referralAgent
? `${referralAgent.name} - ${referralAgent.email}`
: "No country manager"
}
onChange={() => null} onChange={() => null}
type="text" type="text"
defaultValue={"No country manager"} defaultValue={"No country manager"}
@@ -293,19 +224,10 @@ const PaymentCreator = ({
</div> </div>
</div> </div>
<div className="flex w-full justify-end items-center gap-8 mt-4"> <div className="flex w-full justify-end items-center gap-8 mt-4">
<Button <Button variant="outline" color="red" className="w-full max-w-[200px]" onClick={onClose}>
variant="outline"
color="red"
className="w-full max-w-[200px]"
onClick={onClose}
>
Cancel Cancel
</Button> </Button>
<Button <Button className="w-full max-w-[200px]" onClick={submit} disabled={!corporate || !price}>
className="w-full max-w-[200px]"
onClick={submit}
disabled={!corporate || !price}
>
Submit Submit
</Button> </Button>
</div> </div>
@@ -344,26 +266,9 @@ const IS_FILE_SUBMITTED_OPTIONS = [
}, },
]; ];
const CSV_PAYMENTS_WHITELISTED_KEYS = [ const CSV_PAYMENTS_WHITELISTED_KEYS = ["corporateId", "corporate", "date", "amount", "agent", "agentCommission", "agentValue", "isPaid"];
"corporateId",
"corporate",
"date",
"amount",
"agent",
"agentCommission",
"agentValue",
"isPaid",
];
const CSV_PAYPAL_WHITELISTED_KEYS = [ const CSV_PAYPAL_WHITELISTED_KEYS = ["orderId", "status", "name", "email", "value", "createdAt", "subscriptionExpirationDate"];
"orderId",
"status",
"name",
"email",
"value",
"createdAt",
"subscriptionExpirationDate",
];
interface SimpleCSVColumn { interface SimpleCSVColumn {
key: string; key: string;
@@ -381,9 +286,7 @@ export default function PaymentRecord() {
const [selectedCorporateUser, setSelectedCorporateUser] = useState<User>(); const [selectedCorporateUser, setSelectedCorporateUser] = useState<User>();
const [selectedAgentUser, setSelectedAgentUser] = useState<User>(); const [selectedAgentUser, setSelectedAgentUser] = useState<User>();
const [isCreatingPayment, setIsCreatingPayment] = useState(false); const [isCreatingPayment, setIsCreatingPayment] = useState(false);
const [filters, setFilters] = useState< const [filters, setFilters] = useState<{filter: (p: Payment) => boolean; id: string}[]>([]);
{ filter: (p: Payment) => boolean; id: string }[]
>([]);
const [displayPayments, setDisplayPayments] = useState<Payment[]>([]); const [displayPayments, setDisplayPayments] = useState<Payment[]>([]);
const [corporate, setCorporate] = useState<User>(); const [corporate, setCorporate] = useState<User>();
@@ -392,21 +295,12 @@ export default function PaymentRecord() {
const {user} = useUser({redirectTo: "/login"}); const {user} = useUser({redirectTo: "/login"});
const {users, reload: reloadUsers} = useUsers(); const {users, reload: reloadUsers} = useUsers();
const {payments: originalPayments, reload: reloadPayment} = usePayments(); const {payments: originalPayments, reload: reloadPayment} = usePayments();
const { payments: paypalPayments, reload: reloadPaypalPayment } = const {payments: paypalPayments, reload: reloadPaypalPayment} = usePaypalPayments();
usePaypalPayments(); const [startDate, setStartDate] = useState<Date | null>(moment("01/01/2023").toDate());
const [startDate, setStartDate] = useState<Date | null>( const [endDate, setEndDate] = useState<Date | null>(moment().endOf("day").toDate());
moment("01/01/2023").toDate()
);
const [endDate, setEndDate] = useState<Date | null>(
moment().endOf("day").toDate()
);
const [paid, setPaid] = useState<Boolean | null>(IS_PAID_OPTIONS[0].value); const [paid, setPaid] = useState<Boolean | null>(IS_PAID_OPTIONS[0].value);
const [commissionTransfer, setCommissionTransfer] = useState<Boolean | null>( const [commissionTransfer, setCommissionTransfer] = useState<Boolean | null>(IS_FILE_SUBMITTED_OPTIONS[0].value);
IS_FILE_SUBMITTED_OPTIONS[0].value const [corporateTransfer, setCorporateTransfer] = useState<Boolean | null>(IS_FILE_SUBMITTED_OPTIONS[0].value);
);
const [corporateTransfer, setCorporateTransfer] = useState<Boolean | null>(
IS_FILE_SUBMITTED_OPTIONS[0].value
);
const reload = () => { const reload = () => {
reloadUsers(); reloadUsers();
reloadPayment(); reloadPayment();
@@ -426,7 +320,7 @@ export default function PaymentRecord() {
filters filters
.map((f) => f.filter) .map((f) => f.filter)
.reduce((d, f) => d.filter(f), payments) .reduce((d, f) => d.filter(f), payments)
.sort((a, b) => moment(b.date).diff(moment(a.date))) .sort((a, b) => moment(b.date).diff(moment(a.date))),
); );
}, [payments, filters]); }, [payments, filters]);
@@ -467,9 +361,7 @@ export default function PaymentRecord() {
useEffect(() => { useEffect(() => {
setFilters((prev) => [ setFilters((prev) => [
...prev.filter((x) => x.id !== "paid"), ...prev.filter((x) => x.id !== "paid"),
...(typeof paid !== "boolean" ...(typeof paid !== "boolean" ? [] : [{id: "paid", filter: (p: Payment) => p.isPaid === paid}]),
? []
: [{ id: "paid", filter: (p: Payment) => p.isPaid === paid }]),
]); ]);
}, [paid]); }, [paid]);
@@ -481,8 +373,7 @@ export default function PaymentRecord() {
: [ : [
{ {
id: "commissionTransfer", id: "commissionTransfer",
filter: (p: Payment) => filter: (p: Payment) => !p.commissionTransfer === commissionTransfer,
!p.commissionTransfer === commissionTransfer,
}, },
]), ]),
]); ]);
@@ -496,8 +387,7 @@ export default function PaymentRecord() {
: [ : [
{ {
id: "corporateTransfer", id: "corporateTransfer",
filter: (p: Payment) => filter: (p: Payment) => !p.corporateTransfer === corporateTransfer,
!p.corporateTransfer === corporateTransfer,
}, },
]), ]),
]); ]);
@@ -528,9 +418,7 @@ export default function PaymentRecord() {
} }
if (reason.response.status === 403) { if (reason.response.status === 403) {
toast.error( toast.error("You do not have permission to delete an approved payment record!");
"You do not have permission to delete an approved payment record!"
);
return; return;
} }
@@ -541,8 +429,7 @@ export default function PaymentRecord() {
const getFileAssetsColumns = () => { const getFileAssetsColumns = () => {
if (user) { if (user) {
const containerClassName = const containerClassName = "flex gap-2 text-mti-purple-light hover:text-mti-purple-dark ease-in-out duration-300 cursor-pointer";
"flex gap-2 text-mti-purple-light hover:text-mti-purple-dark ease-in-out duration-300 cursor-pointer";
switch (user.type) { switch (user.type) {
case "corporate": case "corporate":
return [ return [
@@ -661,9 +548,7 @@ export default function PaymentRecord() {
return {value: `${value}%`}; return {value: `${value}%`};
} }
case "agent": { case "agent": {
const user = users.find( const user = users.find((x) => x.id === info.row.original.agent) as AgentUser;
(x) => x.id === info.row.original.agent
) as AgentUser;
return { return {
value: user?.name, value: user?.name,
user, user,
@@ -684,8 +569,7 @@ export default function PaymentRecord() {
const user = users.find((x) => x.id === specificValue) as CorporateUser; const user = users.find((x) => x.id === specificValue) as CorporateUser;
return { return {
user, user,
value: value: user?.corporateInformation.companyInformation.name || user?.name,
user?.corporateInformation.companyInformation.name || user?.name,
}; };
} }
case "currency": { case "currency": {
@@ -713,10 +597,9 @@ export default function PaymentRecord() {
return ( return (
<div <div
className={clsx( className={clsx(
"underline text-mti-purple-light hover:text-mti-purple-dark transition ease-in-out duration-300 cursor-pointer" "underline text-mti-purple-light hover:text-mti-purple-dark transition ease-in-out duration-300 cursor-pointer",
)} )}
onClick={() => setSelectedAgentUser(user)} onClick={() => setSelectedAgentUser(user)}>
>
{value} {value}
</div> </div>
); );
@@ -735,9 +618,7 @@ export default function PaymentRecord() {
id: "agentValue", id: "agentValue",
cell: (info) => { cell: (info) => {
const {value} = columHelperValue(info.column.id, info); const {value} = columHelperValue(info.column.id, info);
const currency = CURRENCIES.find( const currency = CURRENCIES.find((x) => x.currency === info.row.original.currency)?.label;
(x) => x.currency === info.row.original.currency
)?.label;
const finalValue = `${value} ${currency}`; const finalValue = `${value} ${currency}`;
return <span>{finalValue}</span>; return <span>{finalValue}</span>;
}, },
@@ -763,10 +644,9 @@ export default function PaymentRecord() {
return ( return (
<div <div
className={clsx( className={clsx(
"underline text-mti-purple-light hover:text-mti-purple-dark transition ease-in-out duration-300 cursor-pointer" "underline text-mti-purple-light hover:text-mti-purple-dark transition ease-in-out duration-300 cursor-pointer",
)} )}
onClick={() => setSelectedCorporateUser(user)} onClick={() => setSelectedCorporateUser(user)}>
>
{value} {value}
</div> </div>
); );
@@ -785,9 +665,7 @@ export default function PaymentRecord() {
id: "amount", id: "amount",
cell: (info) => { cell: (info) => {
const {value} = columHelperValue(info.column.id, info); const {value} = columHelperValue(info.column.id, info);
const currency = CURRENCIES.find( const currency = CURRENCIES.find((x) => x.currency === info.row.original.currency)?.label;
(x) => x.currency === info.row.original.currency
)?.label;
const finalValue = `${value} ${currency}`; const finalValue = `${value} ${currency}`;
return <span>{finalValue}</span>; return <span>{finalValue}</span>;
}, },
@@ -803,23 +681,13 @@ export default function PaymentRecord() {
<Checkbox <Checkbox
isChecked={value} isChecked={value}
onChange={(e) => { onChange={(e) => {
if (user?.type === agent || user?.type === "corporate" || value) if (user?.type === agent || user?.type === "corporate" || value) return null;
return null; if (!info.row.original.commissionTransfer || !info.row.original.corporateTransfer)
if ( return alert("All files need to be uploaded to consider it paid!");
!info.row.original.commissionTransfer || if (!confirm(`Are you sure you want to consider this payment paid?`)) return null;
!info.row.original.corporateTransfer
)
return alert(
"All files need to be uploaded to consider it paid!"
);
if (
!confirm(`Are you sure you want to consider this payment paid?`)
)
return null;
return updatePayment(info.row.original, "isPaid", e); return updatePayment(info.row.original, "isPaid", e);
}} }}>
>
<span></span> <span></span>
</Checkbox> </Checkbox>
); );
@@ -833,11 +701,7 @@ export default function PaymentRecord() {
return ( return (
<div className="flex gap-4"> <div className="flex gap-4">
{user?.type !== "agent" && ( {user?.type !== "agent" && (
<div <div data-tip="Delete" className="cursor-pointer tooltip" onClick={() => deletePayment(row.original.id)}>
data-tip="Delete"
className="cursor-pointer tooltip"
onClick={() => deletePayment(row.original.id)}
>
<BsTrash className="hover:text-mti-purple-light transition ease-in-out duration-300" /> <BsTrash className="hover:text-mti-purple-light transition ease-in-out duration-300" />
</div> </div>
)} )}
@@ -859,7 +723,7 @@ export default function PaymentRecord() {
const user = users.find((x) => x.id === p.userId) as User; const user = users.find((x) => x.id === p.userId) as User;
return {...p, name: user?.name, email: user?.email}; return {...p, name: user?.name, email: user?.email};
}), }),
[paypalPayments, users] [paypalPayments, users],
); );
const paypalColumns = [ const paypalColumns = [
@@ -900,9 +764,7 @@ export default function PaymentRecord() {
id: "value", id: "value",
cell: (info) => { cell: (info) => {
const {value} = columHelperValue(info.column.id, info); const {value} = columHelperValue(info.column.id, info);
const currency = CURRENCIES.find( const currency = CURRENCIES.find((x) => x.currency === info.row.original.currency)?.label;
(x) => x.currency === info.row.original.currency
)?.label;
const finalValue = `${value} ${currency}`; const finalValue = `${value} ${currency}`;
return <span>{finalValue}</span>; return <span>{finalValue}</span>;
}, },
@@ -925,10 +787,7 @@ export default function PaymentRecord() {
}), }),
]; ];
const { rows: filteredRows, renderSearch } = useListSearch( const {rows: filteredRows, renderSearch} = useListSearch(paypalFilterRows, updatedPaypalPayments);
paypalFilterRows,
updatedPaypalPayments
);
const paypalTable = useReactTable({ const paypalTable = useReactTable({
data: filteredRows, data: filteredRows,
@@ -939,10 +798,7 @@ export default function PaymentRecord() {
if (user) { if (user) {
if (selectedCorporateUser) { if (selectedCorporateUser) {
return ( return (
<Modal <Modal isOpen={!!selectedCorporateUser} onClose={() => setSelectedCorporateUser(undefined)}>
isOpen={!!selectedCorporateUser}
onClose={() => setSelectedCorporateUser(undefined)}
>
<> <>
{selectedCorporateUser && ( {selectedCorporateUser && (
<div className="w-full flex flex-col gap-8"> <div className="w-full flex flex-col gap-8">
@@ -964,10 +820,7 @@ export default function PaymentRecord() {
if (selectedAgentUser) { if (selectedAgentUser) {
return ( return (
<Modal <Modal isOpen={!!selectedAgentUser} onClose={() => setSelectedAgentUser(undefined)}>
isOpen={!!selectedAgentUser}
onClose={() => setSelectedAgentUser(undefined)}
>
<> <>
{selectedAgentUser && ( {selectedAgentUser && (
<div className="w-full flex flex-col gap-8"> <div className="w-full flex flex-col gap-8">
@@ -992,18 +845,11 @@ export default function PaymentRecord() {
const getCSVData = () => { const getCSVData = () => {
const tables = [table, paypalTable]; const tables = [table, paypalTable];
const whitelists = [ const whitelists = [CSV_PAYMENTS_WHITELISTED_KEYS, CSV_PAYPAL_WHITELISTED_KEYS];
CSV_PAYMENTS_WHITELISTED_KEYS,
CSV_PAYPAL_WHITELISTED_KEYS,
];
const currentTable = tables[selectedIndex]; const currentTable = tables[selectedIndex];
const whitelist = whitelists[selectedIndex]; const whitelist = whitelists[selectedIndex];
const columns = (currentTable const columns = (currentTable.getHeaderGroups() as any[]).reduce((accm: any[], group: any) => {
.getHeaderGroups() as any[]) const whitelistedColumns = group.headers.filter((header: any) => whitelist.includes(header.id));
.reduce((accm: any[], group: any) => {
const whitelistedColumns = group.headers.filter((header: any) =>
whitelist.includes(header.id)
);
const data = whitelistedColumns.map((data: any) => ({ const data = whitelistedColumns.map((data: any) => ({
key: data.column.columnDef.id, key: data.column.columnDef.id,
@@ -1049,12 +895,7 @@ export default function PaymentRecord() {
<tr key={headerGroup.id}> <tr key={headerGroup.id}>
{headerGroup.headers.map((header) => ( {headerGroup.headers.map((header) => (
<th className="p-4 text-left" key={header.id}> <th className="p-4 text-left" key={header.id}>
{header.isPlaceholder {header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
? null
: flexRender(
header.column.columnDef.header,
header.getContext()
)}
</th> </th>
))} ))}
</tr> </tr>
@@ -1062,10 +903,7 @@ export default function PaymentRecord() {
</thead> </thead>
<tbody className="px-2"> <tbody className="px-2">
{table.getRowModel().rows.map((row) => ( {table.getRowModel().rows.map((row) => (
<tr <tr className="odd:bg-white even:bg-mti-purple-ultralight/40 rounded-lg py-2" key={row.id}>
className="odd:bg-white even:bg-mti-purple-ultralight/40 rounded-lg py-2"
key={row.id}
>
{row.getVisibleCells().map((cell) => ( {row.getVisibleCells().map((cell) => (
<td className="px-4 py-2" key={cell.id}> <td className="px-4 py-2" key={cell.id}>
{flexRender(cell.column.columnDef.cell, cell.getContext())} {flexRender(cell.column.columnDef.cell, cell.getContext())}
@@ -1092,10 +930,7 @@ export default function PaymentRecord() {
{user && ( {user && (
<Layout user={user} className="gap-6"> <Layout user={user} className="gap-6">
{getUserModal()} {getUserModal()}
<Modal <Modal isOpen={isCreatingPayment} onClose={() => setIsCreatingPayment(false)}>
isOpen={isCreatingPayment}
onClose={() => setIsCreatingPayment(false)}
>
<PaymentCreator <PaymentCreator
onClose={() => setIsCreatingPayment(false)} onClose={() => setIsCreatingPayment(false)}
reload={reload} reload={reload}
@@ -1106,26 +941,15 @@ export default function PaymentRecord() {
<div className="w-full flex flex-end justify-between p-2"> <div className="w-full flex flex-end justify-between p-2">
<h1 className="text-2xl font-semibold">Payment Record</h1> <h1 className="text-2xl font-semibold">Payment Record</h1>
<div className="flex justify-end gap-2"> <div className="flex justify-end gap-2">
{(user.type === "developer" || {(user.type === "developer" || user.type === "admin" || user.type === "agent" || user.type === "corporate") && (
user.type === "admin" ||
user.type === "agent" ||
user.type === "corporate") && (
<Button className="max-w-[200px]" variant="outline"> <Button className="max-w-[200px]" variant="outline">
<CSVLink <CSVLink data={csvRows} headers={csvColumns} filename="payment-records.csv">
data={csvRows}
headers={csvColumns}
filename="payment-records.csv"
>
Download CSV Download CSV
</CSVLink> </CSVLink>
</Button> </Button>
)} )}
{(user.type === "developer" || user.type === "admin") && ( {(user.type === "developer" || user.type === "admin") && (
<Button <Button className="max-w-[200px]" variant="outline" onClick={() => setIsCreatingPayment(true)}>
className="max-w-[200px]"
variant="outline"
onClick={() => setIsCreatingPayment(true)}
>
New Payment New Payment
</Button> </Button>
)} )}
@@ -1139,77 +963,54 @@ export default function PaymentRecord() {
"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-mti-purple-light", "w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-mti-purple-light",
"ring-white ring-opacity-60 ring-offset-2 ring-offset-mti-purple-light focus:outline-none focus:ring-2", "ring-white ring-opacity-60 ring-offset-2 ring-offset-mti-purple-light focus:outline-none focus:ring-2",
"transition duration-300 ease-in-out", "transition duration-300 ease-in-out",
selected selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-mti-purple-dark",
? "bg-white shadow"
: "text-blue-100 hover:bg-white/[0.12] hover:text-mti-purple-dark"
) )
} }>
>
Payments Payments
</Tab> </Tab>
{['admin','developer'].includes(user.type) && (<Tab {["admin", "developer"].includes(user.type) && (
<Tab
className={({selected}) => className={({selected}) =>
clsx( clsx(
"w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-mti-purple-light", "w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-mti-purple-light",
"ring-white ring-opacity-60 ring-offset-2 ring-offset-mti-purple-light focus:outline-none focus:ring-2", "ring-white ring-opacity-60 ring-offset-2 ring-offset-mti-purple-light focus:outline-none focus:ring-2",
"transition duration-300 ease-in-out", "transition duration-300 ease-in-out",
selected selected ? "bg-white shadow" : "text-blue-100 hover:bg-white/[0.12] hover:text-mti-purple-dark",
? "bg-white shadow"
: "text-blue-100 hover:bg-white/[0.12] hover:text-mti-purple-dark"
) )
} }>
>
Paypal Paypal
</Tab> </Tab>
)} )}
</Tab.List> </Tab.List>
<Tab.Panels> <Tab.Panels>
<Tab.Panel className="overflow-y-scroll max-h-[600px] rounded-xl scrollbar-hide gap-8 flex flex-col gap-8"> <Tab.Panel className="overflow-y-scroll max-h-[600px] rounded-xl scrollbar-hide gap-8 flex flex-col">
<div <div className={clsx("grid grid-cols-1 md:grid-cols-2 gap-8 w-full", user.type !== "corporate" && "lg:grid-cols-3")}>
className={clsx(
"grid grid-cols-1 md:grid-cols-2 gap-8 w-full",
user.type !== "corporate" && "lg:grid-cols-3"
)}
>
<div className="flex flex-col gap-3 w-full"> <div className="flex flex-col gap-3 w-full">
<label className="font-normal text-base text-mti-gray-dim"> <label className="font-normal text-base text-mti-gray-dim">Corporate account *</label>
Corporate account *
</label>
<Select <Select
isClearable={user.type !== "corporate"} isClearable={user.type !== "corporate"}
className={clsx( className={clsx(
"px-4 py-4 w-full text-sm font-normal placeholder:text-mti-gray-cool bg-white rounded-full border border-mti-gray-platinum focus:outline-none", "px-4 py-4 w-full text-sm font-normal placeholder:text-mti-gray-cool bg-white rounded-full border border-mti-gray-platinum focus:outline-none",
user.type === "corporate" && user.type === "corporate" && "!bg-mti-gray-platinum/40 !text-mti-gray-dim !cursor-not-allowed",
"!bg-mti-gray-platinum/40 !text-mti-gray-dim !cursor-not-allowed"
)} )}
options={( options={(users.filter((u) => u.type === "corporate") as CorporateUser[]).map((user) => ({
users.filter(
(u) => u.type === "corporate"
) as CorporateUser[]
).map((user) => ({
value: user.id, value: user.id,
meta: user, meta: user,
label: `${ label: `${user.corporateInformation?.companyInformation?.name || user.name} - ${user.email}`,
user.corporateInformation?.companyInformation?.name ||
user.name
} - ${user.email}`,
}))} }))}
defaultValue={ defaultValue={
user.type === "corporate" user.type === "corporate"
? { ? {
value: user.id, value: user.id,
meta: user, meta: user,
label: `${ label: `${user.corporateInformation?.companyInformation?.name || user.name} - ${
user.corporateInformation?.companyInformation user.email
?.name || user.name }`,
} - ${user.email}`,
} }
: undefined : undefined
} }
isDisabled={user.type === "corporate"} isDisabled={user.type === "corporate"}
onChange={(value) => onChange={(value) => setCorporate((value as any)?.meta ?? undefined)}
setCorporate((value as any)?.meta ?? undefined)
}
menuPortalTarget={document?.body} menuPortalTarget={document?.body}
styles={{ styles={{
menuPortal: (base) => ({...base, zIndex: 9999}), menuPortal: (base) => ({...base, zIndex: 9999}),
@@ -1224,11 +1025,7 @@ export default function PaymentRecord() {
}), }),
option: (styles, state) => ({ option: (styles, state) => ({
...styles, ...styles,
backgroundColor: state.isFocused backgroundColor: state.isFocused ? "#D5D9F0" : state.isSelected ? "#7872BF" : "white",
? "#D5D9F0"
: state.isSelected
? "#7872BF"
: "white",
color: state.isFocused ? "black" : styles.color, color: state.isFocused ? "black" : styles.color,
}), }),
}} }}
@@ -1236,21 +1033,15 @@ export default function PaymentRecord() {
</div> </div>
{user.type !== "corporate" && ( {user.type !== "corporate" && (
<div className="flex flex-col gap-3 w-full"> <div className="flex flex-col gap-3 w-full">
<label className="font-normal text-base text-mti-gray-dim"> <label className="font-normal text-base text-mti-gray-dim">Country manager *</label>
Country manager *
</label>
<Select <Select
isClearable isClearable
isDisabled={user.type === "agent"} isDisabled={user.type === "agent"}
className={clsx( className={clsx(
"px-4 py-4 w-full text-sm font-normal placeholder:text-mti-gray-cool disabled:bg-mti-gray-platinum/40 disabled:text-mti-gray-dim disabled:cursor-not-allowed rounded-full border border-mti-gray-platinum focus:outline-none", "px-4 py-4 w-full text-sm font-normal placeholder:text-mti-gray-cool disabled:bg-mti-gray-platinum/40 disabled:text-mti-gray-dim disabled:cursor-not-allowed rounded-full border border-mti-gray-platinum focus:outline-none",
user.type === "agent" user.type === "agent" ? "bg-mti-gray-platinum/40" : "bg-white",
? "bg-mti-gray-platinum/40"
: "bg-white"
)} )}
options={( options={(users.filter((u) => u.type === "agent") as AgentUser[]).map((user) => ({
users.filter((u) => u.type === "agent") as AgentUser[]
).map((user) => ({
value: user.id, value: user.id,
meta: user, meta: user,
label: `${user.name} - ${user.email}`, label: `${user.name} - ${user.email}`,
@@ -1263,11 +1054,7 @@ export default function PaymentRecord() {
} }
: undefined : undefined
} }
onChange={(value) => onChange={(value) => setAgent(value !== null ? (value as any).meta : undefined)}
setAgent(
value !== null ? (value as any).meta : undefined
)
}
menuPortalTarget={document?.body} menuPortalTarget={document?.body}
styles={{ styles={{
menuPortal: (base) => ({...base, zIndex: 9999}), menuPortal: (base) => ({...base, zIndex: 9999}),
@@ -1282,11 +1069,7 @@ export default function PaymentRecord() {
}), }),
option: (styles, state) => ({ option: (styles, state) => ({
...styles, ...styles,
backgroundColor: state.isFocused backgroundColor: state.isFocused ? "#D5D9F0" : state.isSelected ? "#7872BF" : "white",
? "#D5D9F0"
: state.isSelected
? "#7872BF"
: "white",
color: state.isFocused ? "black" : styles.color, color: state.isFocused ? "black" : styles.color,
}), }),
}} }}
@@ -1294,16 +1077,12 @@ export default function PaymentRecord() {
</div> </div>
)} )}
<div className="flex flex-col gap-3 w-full"> <div className="flex flex-col gap-3 w-full">
<label className="font-normal text-base text-mti-gray-dim"> <label className="font-normal text-base text-mti-gray-dim">Paid</label>
Paid
</label>
<Select <Select
isClearable isClearable
className={clsx( className={clsx(
"px-4 py-4 w-full text-sm font-normal placeholder:text-mti-gray-cool disabled:bg-mti-gray-platinum/40 disabled:text-mti-gray-dim disabled:cursor-not-allowed rounded-full border border-mti-gray-platinum focus:outline-none", "px-4 py-4 w-full text-sm font-normal placeholder:text-mti-gray-cool disabled:bg-mti-gray-platinum/40 disabled:text-mti-gray-dim disabled:cursor-not-allowed rounded-full border border-mti-gray-platinum focus:outline-none",
user.type === "agent" user.type === "agent" ? "bg-mti-gray-platinum/40" : "bg-white",
? "bg-mti-gray-platinum/40"
: "bg-white"
)} )}
options={IS_PAID_OPTIONS} options={IS_PAID_OPTIONS}
value={IS_PAID_OPTIONS.find((e) => e.value === paid)} value={IS_PAID_OPTIONS.find((e) => e.value === paid)}
@@ -1325,20 +1104,14 @@ export default function PaymentRecord() {
}), }),
option: (styles, state) => ({ option: (styles, state) => ({
...styles, ...styles,
backgroundColor: state.isFocused backgroundColor: state.isFocused ? "#D5D9F0" : state.isSelected ? "#7872BF" : "white",
? "#D5D9F0"
: state.isSelected
? "#7872BF"
: "white",
color: state.isFocused ? "black" : styles.color, color: state.isFocused ? "black" : styles.color,
}), }),
}} }}
/> />
</div> </div>
<div className="flex flex-col gap-3 w-full"> <div className="flex flex-col gap-3 w-full">
<label className="font-normal text-base text-mti-gray-dim"> <label className="font-normal text-base text-mti-gray-dim">Date</label>
Date
</label>
<ReactDatePicker <ReactDatePicker
dateFormat="dd/MM/yyyy" dateFormat="dd/MM/yyyy"
className="px-4 py-6 w-full text-sm text-center font-normal placeholder:text-mti-gray-cool disabled:bg-mti-gray-platinum/40 disabled:text-mti-gray-dim disabled:cursor-not-allowed rounded-full border border-mti-gray-platinum focus:outline-none" className="px-4 py-6 w-full text-sm text-center font-normal placeholder:text-mti-gray-cool disabled:bg-mti-gray-platinum/40 disabled:text-mti-gray-dim disabled:cursor-not-allowed rounded-full border border-mti-gray-platinum focus:outline-none"
@@ -1347,13 +1120,9 @@ export default function PaymentRecord() {
endDate={endDate} endDate={endDate}
selectsRange selectsRange
showMonthDropdown showMonthDropdown
filterDate={(date: Date) => filterDate={(date: Date) => moment(date).isSameOrBefore(moment(new Date()))}
moment(date).isSameOrBefore(moment(new Date()))
}
onChange={([initialDate, finalDate]: [Date, Date]) => { onChange={([initialDate, finalDate]: [Date, Date]) => {
setStartDate( setStartDate(initialDate ?? moment("01/01/2023").toDate());
initialDate ?? moment("01/01/2023").toDate()
);
if (finalDate) { if (finalDate) {
// basicly selecting a final day works as if I'm selecting the first // basicly selecting a final day works as if I'm selecting the first
// minute of that day. this way it covers the whole day // minute of that day. this way it covers the whole day
@@ -1366,18 +1135,14 @@ export default function PaymentRecord() {
</div> </div>
{user.type !== "corporate" && ( {user.type !== "corporate" && (
<div className="flex flex-col gap-3 w-full"> <div className="flex flex-col gap-3 w-full">
<label className="font-normal text-base text-mti-gray-dim"> <label className="font-normal text-base text-mti-gray-dim">Commission transfer</label>
Commission transfer
</label>
<Select <Select
isClearable isClearable
className={clsx( className={clsx(
"px-4 py-4 w-full text-sm font-normal placeholder:text-mti-gray-cool disabled:bg-mti-gray-platinum/40 disabled:text-mti-gray-dim disabled:cursor-not-allowed rounded-full border border-mti-gray-platinum focus:outline-none" "px-4 py-4 w-full text-sm font-normal placeholder:text-mti-gray-cool disabled:bg-mti-gray-platinum/40 disabled:text-mti-gray-dim disabled:cursor-not-allowed rounded-full border border-mti-gray-platinum focus:outline-none",
)} )}
options={IS_FILE_SUBMITTED_OPTIONS} options={IS_FILE_SUBMITTED_OPTIONS}
value={IS_FILE_SUBMITTED_OPTIONS.find( value={IS_FILE_SUBMITTED_OPTIONS.find((e) => e.value === commissionTransfer)}
(e) => e.value === commissionTransfer
)}
onChange={(value) => { onChange={(value) => {
if (value) return setCommissionTransfer(value.value); if (value) return setCommissionTransfer(value.value);
setCommissionTransfer(null); setCommissionTransfer(null);
@@ -1396,11 +1161,7 @@ export default function PaymentRecord() {
}), }),
option: (styles, state) => ({ option: (styles, state) => ({
...styles, ...styles,
backgroundColor: state.isFocused backgroundColor: state.isFocused ? "#D5D9F0" : state.isSelected ? "#7872BF" : "white",
? "#D5D9F0"
: state.isSelected
? "#7872BF"
: "white",
color: state.isFocused ? "black" : styles.color, color: state.isFocused ? "black" : styles.color,
}), }),
}} }}
@@ -1408,18 +1169,14 @@ export default function PaymentRecord() {
</div> </div>
)} )}
<div className="flex flex-col gap-3 w-full"> <div className="flex flex-col gap-3 w-full">
<label className="font-normal text-base text-mti-gray-dim"> <label className="font-normal text-base text-mti-gray-dim">Corporate transfer</label>
Corporate transfer
</label>
<Select <Select
isClearable isClearable
className={clsx( className={clsx(
"px-4 py-4 w-full text-sm font-normal placeholder:text-mti-gray-cool disabled:bg-mti-gray-platinum/40 disabled:text-mti-gray-dim disabled:cursor-not-allowed rounded-full border border-mti-gray-platinum focus:outline-none" "px-4 py-4 w-full text-sm font-normal placeholder:text-mti-gray-cool disabled:bg-mti-gray-platinum/40 disabled:text-mti-gray-dim disabled:cursor-not-allowed rounded-full border border-mti-gray-platinum focus:outline-none",
)} )}
options={IS_FILE_SUBMITTED_OPTIONS} options={IS_FILE_SUBMITTED_OPTIONS}
value={IS_FILE_SUBMITTED_OPTIONS.find( value={IS_FILE_SUBMITTED_OPTIONS.find((e) => e.value === corporateTransfer)}
(e) => e.value === corporateTransfer
)}
onChange={(value) => { onChange={(value) => {
if (value) return setCorporateTransfer(value.value); if (value) return setCorporateTransfer(value.value);
setCorporateTransfer(null); setCorporateTransfer(null);
@@ -1438,11 +1195,7 @@ export default function PaymentRecord() {
}), }),
option: (styles, state) => ({ option: (styles, state) => ({
...styles, ...styles,
backgroundColor: state.isFocused backgroundColor: state.isFocused ? "#D5D9F0" : state.isSelected ? "#7872BF" : "white",
? "#D5D9F0"
: state.isSelected
? "#7872BF"
: "white",
color: state.isFocused ? "black" : styles.color, color: state.isFocused ? "black" : styles.color,
}), }),
}} }}