diff --git a/src/pages/payment-record.tsx b/src/pages/payment-record.tsx index 1c924bfc..d42a7e18 100644 --- a/src/pages/payment-record.tsx +++ b/src/pages/payment-record.tsx @@ -62,28 +62,27 @@ const columnHelper = createColumnHelper(); 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"); - const [commission, setCommission] = useState(0); - const [referralAgent, setReferralAgent] = useState(); const [date, setDate] = useState(new Date()); const {users} = useUsers(); - useEffect(() => { - if (!corporate) return setReferralAgent(undefined); - if (!corporate.corporateInformation?.referralAgent) return setReferralAgent(undefined); + const price = corporate?.corporateInformation?.payment?.value || 0; + const commission = corporate?.corporateInformation?.payment?.commission || 0; + const currency = corporate?.corporateInformation?.payment?.currency || 'EUR'; - const referralAgent = users.find((u) => u.id === corporate.corporateInformation.referralAgent); - setReferralAgent(referralAgent as AgentUser | undefined); - }, [corporate, users]); + const referralAgent = useMemo(() => { + if(corporate?.corporateInformation?.referralAgent) { + return users.find((u) => u.id === corporate.corporateInformation.referralAgent); + } - useEffect(() => { - const payment = corporate?.corporateInformation?.payment; + return undefined; + }, [corporate?.corporateInformation?.referralAgent, users]); + // useEffect(() => { + // const payment = corporate?.corporateInformation?.payment; - setPrice(payment?.value || 0); - setCurrency(payment?.currency || "EUR"); - }, [corporate]); + // // setPrice(payment?.value || 0); + // setCurrency(payment?.currency || "EUR"); + // }, [corporate]); const submit = () => { axios @@ -91,7 +90,7 @@ const PaymentCreator = ({onClose, reload, showComission = false}: {onClose: () = corporate: corporate?.id, agent: referralAgent?.id, agentCommission: commission, - agentValue: toFixedNumber((commission / 100) * price, 2), + agentValue: toFixedNumber((commission! / 100) * price!, 2), currency, value: price, isPaid: false, @@ -146,16 +145,18 @@ const PaymentCreator = ({onClose, reload, showComission = false}: {onClose: () =
setPrice(e ? parseInt(e) : 0)} + onChange={() => {}} type="number" value={price} + defaultValue={0} className="col-span-3" + disabled /> setCommission(e ? parseInt(e) : 0)} type="number" defaultValue={0} /> + {}} + type="number" + defaultValue={0} + value={commission} + disabled + />
c.currency === currency)?.label}`} + value={`${(commission! / 100) * price!} ${CURRENCIES.find((c) => c.currency === currency)?.label}`} onChange={() => null} type="text" defaultValue={0}