From 48faee07f631ca86bca0e3bcafc53221e2f589ef Mon Sep 17 00:00:00 2001 From: Joao Ramos Date: Mon, 5 Aug 2024 19:32:53 +0100 Subject: [PATCH] Added missing fussy search fileds and support for number --- src/hooks/useListSearch.tsx | 4 ++++ src/pages/payment-record.tsx | 18 +++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/hooks/useListSearch.tsx b/src/hooks/useListSearch.tsx index ff3ddb85..9ed5abfb 100644 --- a/src/hooks/useListSearch.tsx +++ b/src/hooks/useListSearch.tsx @@ -27,6 +27,10 @@ export function useListSearch(fields: string[][], rows: T[]) { if (typeof value === "string") { return value.toLowerCase().includes(searchText); } + + if (typeof value === "number") { + return (value as Number).toString().includes(searchText); + } }); }); }, [fields, rows, text]); diff --git a/src/pages/payment-record.tsx b/src/pages/payment-record.tsx index a3f0de44..3eae246a 100644 --- a/src/pages/payment-record.tsx +++ b/src/pages/payment-record.tsx @@ -390,7 +390,7 @@ interface PaypalPaymentWithUserData extends PaypalPayment { email: string; } -const paypalFilterRows = [["email"], ["name"]]; +const paypalFilterRows = [["email"], ["name"], ["orderId"], ["value"]]; export default function PaymentRecord() { const [selectedCorporateUser, setSelectedCorporateUser] = useState(); const [selectedAgentUser, setSelectedAgentUser] = useState(); @@ -874,13 +874,15 @@ export default function PaymentRecord() { const updatedPaypalPayments = useMemo( () => - paypalPayments.filter((p) => { + paypalPayments + .filter((p) => { const date = moment(p.createdAt); return date.isAfter(startDatePaymob) && date.isBefore(endDatePaymob); - }).map((p) => { - const user = users.find((x) => x.id === p.userId) as User; - return { ...p, name: user?.name, email: user?.email }; - }), + }) + .map((p) => { + const user = users.find((x) => x.id === p.userId) as User; + return { ...p, name: user?.name, email: user?.email }; + }), [paypalPayments, users, startDatePaymob, endDatePaymob] ); @@ -1508,7 +1510,9 @@ export default function PaymentRecord() { if (finalDate) { // basicly selecting a final day works as if I'm selecting the first // minute of that day. this way it covers the whole day - setEndDatePaymob(moment(finalDate).endOf("day").toDate()); + setEndDatePaymob( + moment(finalDate).endOf("day").toDate() + ); return; } setEndDatePaymob(null);