diff --git a/src/components/UserCard.tsx b/src/components/UserCard.tsx index c6b5db64..f72591aa 100644 --- a/src/components/UserCard.tsx +++ b/src/components/UserCard.tsx @@ -48,7 +48,7 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers, const [referralAgent, setReferralAgent] = useState(user.type === "corporate" ? user.corporateInformation?.referralAgent : undefined); const [companyName, setCompanyName] = useState( user.type === "corporate" - ? user.corporateInformation?.companyInformation.companyName + ? user.corporateInformation?.companyInformation.name : user.type === "agent" ? user.agentInformation.companyName : undefined, @@ -90,7 +90,7 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers, agentInformation: type === "agent" ? { - companyName, + name: companyName, commercialRegistration, } : undefined, @@ -100,13 +100,13 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers, referralAgent, monthlyDuration, companyInformation: { - companyName, + name: companyName, userAmount, }, payment: { value: paymentValue, currency: paymentCurrency, - ...referralAgent === '' ? {} : { commission: commissionValue } + ...(referralAgent === "" ? {} : {commission: commissionValue}), }, } : undefined, @@ -219,54 +219,56 @@ const UserCard = ({user, loggedInUser, onClose, onViewStudents, onViewTeachers,
-
- - {referralAgentLabel && ( - u.type === "agent").map((x) => ({value: x.id, label: `${x.name} - ${x.email}`})), + ]} + defaultValue={{ + value: referralAgent, + label: referralAgentLabel, + }} + onChange={(value) => setReferralAgent(value?.value)} + styles={{ + control: (styles) => ({ + ...styles, + paddingLeft: "4px", + border: "none", + outline: "none", + ":focus": { outline: "none", - ":focus": { - outline: "none", - }, - }), - option: (styles, state) => ({ - ...styles, - backgroundColor: state.isFocused ? "#D5D9F0" : state.isSelected ? "#7872BF" : "white", - color: state.isFocused ? "black" : styles.color, - }), - }} - /> - )} -
-
- {referralAgent !== '' ? ( - <> - - setCommission(e ? parseInt(e) : undefined)} - type="number" - defaultValue={commissionValue || 0} - className="col-span-3" - /> - - ) :
} -
+ }, + }), + option: (styles, state) => ({ + ...styles, + backgroundColor: state.isFocused ? "#D5D9F0" : state.isSelected ? "#7872BF" : "white", + color: state.isFocused ? "black" : styles.color, + }), + }} + /> + )}
+
+ {referralAgent !== "" ? ( + <> + + setCommission(e ? parseInt(e) : undefined)} + type="number" + defaultValue={commissionValue || 0} + className="col-span-3" + /> + + ) : ( +
+ )} +
+
)} diff --git a/src/dashboards/Admin.tsx b/src/dashboards/Admin.tsx index 7db04b84..37514f3d 100644 --- a/src/dashboards/Admin.tsx +++ b/src/dashboards/Admin.tsx @@ -48,7 +48,7 @@ export default function AdminDashboard({user}: Props) {
{displayUser.type === "corporate" - ? displayUser.corporateInformation?.companyInformation?.companyName || displayUser.name + ? displayUser.corporateInformation?.companyInformation?.name || displayUser.name : displayUser.name} {displayUser.email} diff --git a/src/dashboards/Agent.tsx b/src/dashboards/Agent.tsx index c99e0d4d..dbfb56cc 100644 --- a/src/dashboards/Agent.tsx +++ b/src/dashboards/Agent.tsx @@ -7,11 +7,7 @@ import UserList from "@/pages/(admin)/Lists/UserList"; import {dateSorter} from "@/utils"; import moment from "moment"; import {useEffect, useState} from "react"; -import { - BsArrowLeft, - BsPersonFill, - BsBank -} from "react-icons/bs"; +import {BsArrowLeft, BsPersonFill, BsBank} from "react-icons/bs"; import UserCard from "@/components/UserCard"; import useGroups from "@/hooks/useGroups"; import {calculateAverageLevel, calculateBandScore} from "@/utils/score"; @@ -41,7 +37,8 @@ export default function AgentDashboard({user}: Props) { const corporateFilter = (user: User) => user.type === "corporate"; const referredCorporateFilter = (x: User) => x.type === "corporate" && !!x.corporateInformation && x.corporateInformation.referralAgent === user.id; - const inactiveReferredCorporateFilter = (x: User) => referredCorporateFilter(x) && (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate)); + const inactiveReferredCorporateFilter = (x: User) => + referredCorporateFilter(x) && (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate)); const UserDisplay = (displayUser: User) => (
{displayUser.type === "corporate" - ? displayUser.corporateInformation?.companyInformation?.companyName || displayUser.name + ? displayUser.corporateInformation?.companyInformation?.name || displayUser.name : displayUser.name} {displayUser.email} diff --git a/src/interfaces/user.ts b/src/interfaces/user.ts index b13089fa..cd337ac5 100644 --- a/src/interfaces/user.ts +++ b/src/interfaces/user.ts @@ -68,7 +68,7 @@ export interface AgentInformation { } export interface CompanyInformation { - companyName: string; + name: string; userAmount: number; } diff --git a/src/pages/(admin)/Lists/UserList.tsx b/src/pages/(admin)/Lists/UserList.tsx index 16efd641..5d83a17c 100644 --- a/src/pages/(admin)/Lists/UserList.tsx +++ b/src/pages/(admin)/Lists/UserList.tsx @@ -294,7 +294,7 @@ export default function UserList({user, filters = []}: {user: User; filters?: (( "underline text-mti-purple-light hover:text-mti-purple-dark transition ease-in-out duration-300 cursor-pointer", )} onClick={() => (PERMISSIONS.updateExpiryDate[row.original.type].includes(user.type) ? setSelectedUser(row.original) : null)}> - {row.original.type === "corporate" ? row.original.corporateInformation?.companyInformation?.companyName || getValue() : getValue()} + {row.original.type === "corporate" ? row.original.corporateInformation?.companyInformation?.name || getValue() : getValue()}
), }), diff --git a/src/pages/payment-record.tsx b/src/pages/payment-record.tsx index 1faaf88a..aeb5400f 100644 --- a/src/pages/payment-record.tsx +++ b/src/pages/payment-record.tsx @@ -25,7 +25,7 @@ import Input from "@/components/Low/Input"; import ReactDatePicker from "react-datepicker"; import moment from "moment"; import PaymentAssetManager from "@/components/PaymentAssetManager"; -import { toFixedNumber } from "@/utils/number"; +import {toFixedNumber} from "@/utils/number"; export const getServerSideProps = withIronSessionSsr(({req, res}) => { const user = req.session.user; @@ -59,7 +59,7 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => { const columnHelper = createColumnHelper(); -const PaymentCreator = ({onClose, reload, showComission = false}: {onClose: () => void; reload: () => void, showComission: boolean}) => { +const PaymentCreator = ({onClose, reload, showComission = false}: {onClose: () => void; reload: () => void; showComission: boolean}) => { const [corporate, setCorporate] = useState(); const [price, setPrice] = useState(0); const [currency, setCurrency] = useState("EUR"); @@ -117,7 +117,7 @@ const PaymentCreator = ({onClose, reload, showComission = false}: {onClose: () = options={(users.filter((u) => u.type === "corporate") as CorporateUser[]).map((user) => ({ value: user.id, meta: user, - label: `${user.corporateInformation.companyInformation.companyName || user.name} - ${user.email}`, + label: `${user.corporateInformation.companyInformation.name || user.name} - ${user.email}`, }))} defaultValue={{value: "undefined", label: "Select an account"}} onChange={(value) => setCorporate((value as any)?.meta ?? undefined)} @@ -420,9 +420,11 @@ export default function PaymentRecord() { const user = users.find((x) => x.id === info.row.original.corporate) as CorporateUser; return (
setSelectedUser(user)}> - {user?.corporateInformation.companyInformation.companyName || user?.name} + {user?.corporateInformation.companyInformation.name || user?.name}
); }, @@ -551,7 +553,7 @@ export default function PaymentRecord() { options={(users.filter((u) => u.type === "corporate") as CorporateUser[]).map((user) => ({ value: user.id, meta: user, - label: `${user.corporateInformation.companyInformation.companyName || user.name} - ${user.email}`, + label: `${user.corporateInformation.companyInformation.name || user.name} - ${user.email}`, }))} onChange={(value) => setCorporate((value as any)?.meta ?? undefined)} styles={{