From f4a2fd2889b72692a97526ff94458daa191d09e9 Mon Sep 17 00:00:00 2001 From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com> Date: Tue, 21 Jan 2025 16:25:38 +0530 Subject: [PATCH 1/3] [ update amount reseversl ] --- .../BankDepositRequest/BankDepositRequest.jsx | 22 +++++++++++++++---- .../ReversalFawateerDeposit.jsx | 14 ++++++++++++ 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/src/Pages/BankDepositRequest/BankDepositRequest.jsx b/src/Pages/BankDepositRequest/BankDepositRequest.jsx index 8173965..8c9d4ae 100644 --- a/src/Pages/BankDepositRequest/BankDepositRequest.jsx +++ b/src/Pages/BankDepositRequest/BankDepositRequest.jsx @@ -117,6 +117,7 @@ const BankDepositRequest = () => { "Last Name", "Country", "Phone Number", + "Deposit Amount", "Action", ]; @@ -212,17 +213,30 @@ const BankDepositRequest = () => { ), Country: ( - + {item?.countryName} ), "Phone Number": ( - + - {/* {item?.mobileNumber} */} - {item?.ISDcode + " " + item?.mobileNumber} + {item?.ISDCode} {item?.mobileNumber} + {/* {item?.ISDcode + " " + item?.mobileNumber} */} + + + ), + "Deposit Amount": ( + + + {parseFloat(item?.investorAmount || 0).toLocaleString(undefined, { + minimumFractionDigits: 2, + maximumFractionDigits: 2, + })} + + {item?.currencyCode} + ), diff --git a/src/Pages/ReversalFawateerDeposit/ReversalFawateerDeposit.jsx b/src/Pages/ReversalFawateerDeposit/ReversalFawateerDeposit.jsx index f038e2e..6eb8c3c 100644 --- a/src/Pages/ReversalFawateerDeposit/ReversalFawateerDeposit.jsx +++ b/src/Pages/ReversalFawateerDeposit/ReversalFawateerDeposit.jsx @@ -130,6 +130,7 @@ const ReversalFawateerDeposit = () => { "First Name", "Last Name", "Phone Number", + "Deposit Amount (BHD)", "Action", ]; @@ -193,6 +194,19 @@ const ReversalFawateerDeposit = () => { ), + "Deposit Amount (BHD)": ( + + + {parseFloat(item?.transaction_details?.investorAmount || 0).toLocaleString(undefined, { + minimumFractionDigits: 2, + maximumFractionDigits: 2, + })} + + {item?.currencyCode} + + + + ), Action: ( Date: Tue, 21 Jan 2025 16:42:57 +0530 Subject: [PATCH 2/3] [ Approve Historty maker search ] --- .../ApproveHistory/ApproveHistoryChecker.jsx | 23 +++++++++++++++++-- .../ApproveHistory/ApproveHistoryMaker.jsx | 2 +- src/Services/fawateer.request.service.js | 15 ++++++++++-- 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/src/Pages/FawateerChecker/ApproveHistory/ApproveHistoryChecker.jsx b/src/Pages/FawateerChecker/ApproveHistory/ApproveHistoryChecker.jsx index 58d792e..b1286e5 100644 --- a/src/Pages/FawateerChecker/ApproveHistory/ApproveHistoryChecker.jsx +++ b/src/Pages/FawateerChecker/ApproveHistory/ApproveHistoryChecker.jsx @@ -37,6 +37,7 @@ const ApproveHistory = () => { const [actionId, setActionId] = useState(false); const [mouseEntered, setMouseEntered] = useState(false); const [mouseEnteredId, setMouseEnteredId] = useState(""); + const [debouncedSearchTerm, setDebouncedSearchTerm] = useState(""); const [pageSize, setPageSize] = useState(TABLE_PAGINATION?.size); const [currentPage, setCurrentPage] = useState(TABLE_PAGINATION?.page); @@ -65,7 +66,16 @@ const ApproveHistory = () => { isLoading: drawalRequestLoading, error, refetch, - } = useGetApproveHistoryQuery(); + } = useGetApproveHistoryQuery( + { + page: debouncedSearchTerm ? undefined : currentPage, // Omit pagination for search + size: debouncedSearchTerm ? undefined : pageSize, // Omit pagination for search + searchTerm: debouncedSearchTerm, + }, + { + skip: debouncedSearchTerm === "" && searchTerm !== "", // Skip if search is empty and it's not the initial request + } + ); console.log(data?.data?.rows); @@ -84,6 +94,15 @@ const ApproveHistory = () => { return () => clearTimeout(timer); }, []); + + useEffect(() => { + const handler = setTimeout(() => { + setDebouncedSearchTerm(searchTerm); + }, 500); // Adjust delay as needed + return () => { + clearTimeout(handler); + }; + }, [searchTerm]); // ====================================================[Table Filter]================================================================ const filteredData = data?.data?.rows?.filter((item) => { // Filter by name (case insensitive) @@ -117,7 +136,7 @@ const ApproveHistory = () => { "Status", ]; - const extractedArray = filteredData?.map((item, idx) => ({ + const extractedArray = data?.data?.rows?.map((item, idx) => ({ // id: item?.id, "Sr.no": ( { skip: debouncedSearchTerm === "" && searchTerm !== "", // Skip if search is empty and it's not the initial request } ); - + useEffect(() => { const handler = setTimeout(() => { setDebouncedSearchTerm(searchTerm); diff --git a/src/Services/fawateer.request.service.js b/src/Services/fawateer.request.service.js index 1a5e90a..2d5a79c 100644 --- a/src/Services/fawateer.request.service.js +++ b/src/Services/fawateer.request.service.js @@ -50,8 +50,19 @@ export const fawateerRequest = createApi({ providesTags: ["getFawateerMakerRequest"], }), + // getApproveHistory: builder.query({ + // query: () => `/fawateer/admin/getAll`, + // providesTags: ["getApproveHistory"], + // }), + getApproveHistory: builder.query({ - query: () => `/fawateer/admin/getAll`, + query: ({ page, size, searchTerm }) => { + let baseURL = `/fawateer/admin/getAll?search=${searchTerm || ""}`; + if (page !== undefined && size !== undefined) { + baseURL += `&page=${page}&size=${size}`; // Only add pagination if both are defined + } + return baseURL; + }, providesTags: ["getApproveHistory"], }), @@ -72,7 +83,7 @@ export const fawateerRequest = createApi({ }), invalidatesTags: ["getFawateerRequest"], }), - + }), }); From 04a5d1280f454867ad68613afd6b17c7807dda01 Mon Sep 17 00:00:00 2001 From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com> Date: Tue, 21 Jan 2025 16:44:01 +0530 Subject: [PATCH 3/3] approve history maker [ Search ] --- .../FawateerChecker/ApproveHistory/ApproveHistoryMaker.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Pages/FawateerChecker/ApproveHistory/ApproveHistoryMaker.jsx b/src/Pages/FawateerChecker/ApproveHistory/ApproveHistoryMaker.jsx index 7f3de1a..b2e2739 100644 --- a/src/Pages/FawateerChecker/ApproveHistory/ApproveHistoryMaker.jsx +++ b/src/Pages/FawateerChecker/ApproveHistory/ApproveHistoryMaker.jsx @@ -92,7 +92,7 @@ const ApproveHistoryMaker = () => { skip: debouncedSearchTerm === "" && searchTerm !== "", // Skip if search is empty and it's not the initial request } ); - + useEffect(() => { const handler = setTimeout(() => { setDebouncedSearchTerm(searchTerm);