From 43f59e8e84951e3c7480a10560654aafcbaee5d3 Mon Sep 17 00:00:00 2001 From: victorAnumudu Date: Fri, 12 Jul 2024 19:33:59 +0100 Subject: [PATCH] added completed job histroy API --- src/components/History/JobsCompleted.jsx | 56 +++++++++---------- src/components/History/RewardsTable.jsx | 4 +- .../WalletComponent/PurchasesTable.jsx | 8 +-- .../WalletComponent/RecentActivityTable.jsx | 4 +- src/services/UsersService.js | 14 +++++ 5 files changed, 50 insertions(+), 36 deletions(-) diff --git a/src/components/History/JobsCompleted.jsx b/src/components/History/JobsCompleted.jsx index 832b6f3..c70293e 100644 --- a/src/components/History/JobsCompleted.jsx +++ b/src/components/History/JobsCompleted.jsx @@ -13,7 +13,7 @@ function JobsCompleted() { const apiCall = new usersService() - let [familyRewardHistory, setFamilyRewardHistory] = useState({ // FOR PURCHASE HISTORY + let [jobHistory, setJobHistory] = useState({ // FOR PURCHASE HISTORY loading: true, data: [], error: false @@ -22,7 +22,7 @@ function JobsCompleted() { const [currentPage, setCurrentPage] = useState(0); const indexOfFirstItem = Number(currentPage); const indexOfLastItem = Number(indexOfFirstItem)+Number(process.env.REACT_APP_ITEM_PER_PAGE); - const currentReward = familyRewardHistory?.data?.slice(indexOfFirstItem, indexOfLastItem); + const currentReward = jobHistory?.data?.slice(indexOfFirstItem, indexOfLastItem); const handlePagination = (e) => { handlePagingFunc(e,setCurrentPage) @@ -31,17 +31,17 @@ function JobsCompleted() { //FUNCTION TO GET FAMILY REWARD HISTORY const getJobCompletedHistory = ()=>{ - // apiCall.getFamilyRewardHx().then((res)=>{ - // if(res.data.internal_return < 0){ // success but no data - // setFamilyRewardHistory(prev => ({...prev, loading: false})) - // return - // } - // setFamilyRewardHistory(prev => ({...prev, loading: false, data: res.data.result_list})) - // }).catch((error)=>{ - // setFamilyRewardHistory(prev => ({...prev, loading: false, error: true})) - // }) + apiCall.getContractHx().then((res)=>{ + if(res.data.internal_return < 0){ // success but no data + setJobHistory(prev => ({...prev, loading: false})) + return + } + setJobHistory(prev => ({...prev, loading: false, data: res.data.result_list})) + }).catch((error)=>{ + setJobHistory(prev => ({...prev, loading: false, error: true})) + }) setTimeout(()=>{ - setFamilyRewardHistory(prev => ({...prev, loading: false, error:true})) + setJobHistory(prev => ({...prev, loading: false, error:true})) },3000) } @@ -51,42 +51,42 @@ function JobsCompleted() { return (
- {familyRewardHistory.loading ? + {jobHistory.loading ? - : familyRewardHistory.data.length ? + : jobHistory.data.length ? - - - - + + + {/* + */} {currentReward.map((item, index) => { - let date = new Date(item.added).toLocaleDateString() + let date = new Date(item?.delivery_date).toLocaleDateString() return ( - - - - + + {/* + */} ) } )}
AmountDateConfirmationTitleAmountDateContract
+
- Reward Logo + {/* Reward Logo */}
-

Reward to {item.rec_firstname} {item.rec_lastname}

-

{item.description}

+

{item?.title}

+

{item?.description}

{AmountTo2DP(item.amount*0.01)} {item.currency}{date}{item.confirmation}{AmountTo2DP(item?.price*0.01)} {item?.currency}{date}{item?.contract}
- :familyRewardHistory.error ? + :jobHistory.error ?
Opps! an error occurred. Please try again!
@@ -97,7 +97,7 @@ function JobsCompleted() { } {/* PAGINATION BUTTON */} - = familyRewardHistory?.data?.length ? true : false} data={familyRewardHistory?.data} start={indexOfFirstItem} stop={indexOfLastItem} /> + = jobHistory?.data?.length ? true : false} data={jobHistory?.data} start={indexOfFirstItem} stop={indexOfLastItem} /> {/* END OF PAGINATION BUTTON */}
) diff --git a/src/components/History/RewardsTable.jsx b/src/components/History/RewardsTable.jsx index a287d2b..e22ab19 100644 --- a/src/components/History/RewardsTable.jsx +++ b/src/components/History/RewardsTable.jsx @@ -55,7 +55,7 @@ export const RewardsTable = memo(() => { - Amount + Amount Date Confirmation @@ -74,7 +74,7 @@ export const RewardsTable = memo(() => { - {AmountTo2DP(item.amount*0.01)} {item.currency} + {AmountTo2DP(item.amount*0.01)} {item.currency} {date} {item.confirmation} diff --git a/src/components/MyWallet/WalletComponent/PurchasesTable.jsx b/src/components/MyWallet/WalletComponent/PurchasesTable.jsx index b04f765..e7115fa 100644 --- a/src/components/MyWallet/WalletComponent/PurchasesTable.jsx +++ b/src/components/MyWallet/WalletComponent/PurchasesTable.jsx @@ -21,8 +21,8 @@ function PurchasesTable({purchase}) { Trx. - Amount - Fee + Amount + Fee @@ -31,8 +31,8 @@ function PurchasesTable({purchase}) { {item.added_date}
{item.confirmation} - {item.amount} - {item.fee} + {item.amount} + {item.fee} ))} diff --git a/src/components/MyWallet/WalletComponent/RecentActivityTable.jsx b/src/components/MyWallet/WalletComponent/RecentActivityTable.jsx index 9dc83e8..ae7a06e 100644 --- a/src/components/MyWallet/WalletComponent/RecentActivityTable.jsx +++ b/src/components/MyWallet/WalletComponent/RecentActivityTable.jsx @@ -25,7 +25,7 @@ function RecentActivityTable({ payment }) { Date Trx. - Amnt./Fee + Amnt./Fee Status @@ -37,7 +37,7 @@ function RecentActivityTable({ payment }) { className="p-4" dangerouslySetInnerHTML={{ __html: item.recipient }} > - + {item.amount}
{item.fee} diff --git a/src/services/UsersService.js b/src/services/UsersService.js index 98e9431..ef89adc 100644 --- a/src/services/UsersService.js +++ b/src/services/UsersService.js @@ -570,6 +570,20 @@ class usersService { return this.postAuxEnd("/familyrewardhx", postData); } + // API FUNCTION TO GET CONTRACT HISTORY + getContractHx() { + var postData = { + uid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + offset: 1, + limit: 20, + // action: apiConst.WRENCHBOARD_FAMILY_TRANSFERHX, + action: "", + }; + return this.postAuxEnd("/contracthx", postData); + } + // API FUNCTION TO GET PAYMENT HISTORY getPaymentHx() { var postData = { -- 2.34.1