From 9163c42d779c0e5bd4529c3c80c086f47c9394cf Mon Sep 17 00:00:00 2001 From: victorAnumudu Date: Tue, 20 Jun 2023 20:15:05 +0100 Subject: [PATCH 1/2] API for paycard listing added --- src/components/MyWallet/AddFundDollars.jsx | 38 ++++++++++++++++------ src/services/UsersService.js | 10 ++++++ 2 files changed, 38 insertions(+), 10 deletions(-) diff --git a/src/components/MyWallet/AddFundDollars.jsx b/src/components/MyWallet/AddFundDollars.jsx index c79980a..7a5a903 100644 --- a/src/components/MyWallet/AddFundDollars.jsx +++ b/src/components/MyWallet/AddFundDollars.jsx @@ -1,8 +1,10 @@ -import React,{useState} from 'react' +import React,{useEffect, useState} from 'react' import { useNavigate } from 'react-router-dom' import InputCom from '../Helpers/Inputs/InputCom'; import PaginatedList from '../Pagination/PaginatedList'; import { handlePagingFunc } from '../Pagination/HandlePagination'; +import LoadingSpinner from '../Spinners/LoadingSpinner'; +import usersService from '../../services/UsersService'; import { Form, Formik } from "formik"; import * as Yup from "yup"; @@ -56,17 +58,18 @@ const initialValues = { function AddFundDollars(props) { const navigate = useNavigate() + let apiCall = new usersService() let [tab, setTab] = useState("previous"); //STATE FOR SWITCHING BETWEEN TABS let [prevCardDetails, setPrevCardDetails] = useState(null) // STATE TO HOLD PREVIOUS CARD SELECTED - let previousCards = {data:[1,2]} //USER PREVIOUS CARDS // TO BE REPLACED LATER FROM DATA FROM API + let [payListCard, setPayListCard] = useState({loading: true, data:[]}) //USER PREVIOUS CARDS const [currentPage, setCurrentPage] = useState(0); const indexOfFirstItem = Number(currentPage); const indexOfLastItem = Number(indexOfFirstItem)+Number(process.env.REACT_APP_ITEM_PER_PAGE); - const currentPreviousCards = previousCards?.data?.slice(indexOfFirstItem, indexOfLastItem); + const currentPreviousCards = payListCard?.data?.slice(indexOfFirstItem, indexOfLastItem); const handlePagination = (e) => { handlePagingFunc(e,setCurrentPage) @@ -95,6 +98,15 @@ function AddFundDollars(props) { props.setInput('') } + useEffect(()=>{ + apiCall.payListCard().then(res => { + setPayListCard({loading: false, data: res.data.result_list}) + }).catch(err => { + console.log('PAYCARDLIST ERROR', err) + setPayListCard({loading: false, data: []}) + }) + }, []) + return ( <>

Payment Method

@@ -125,18 +137,24 @@ function AddFundDollars(props) { {/* previous tab */} {tab == 'previous' ?
- {previousCards?.data?.length ? + { payListCard.loading ? + + : + payListCard?.data?.length ? {currentPreviousCards.map((item, index)=>( - + @@ -168,7 +186,7 @@ function AddFundDollars(props) { } {/* PAGINATION BUTTON */}
- = previousCards?.data?.length ? true : false} data={previousCards?.data} start={indexOfFirstItem} stop={indexOfLastItem} /> + = payListCard?.data?.length ? true : false} data={payListCard?.data} start={indexOfFirstItem} stop={indexOfLastItem} />
{/* END OF PAGINATION BUTTON */} diff --git a/src/services/UsersService.js b/src/services/UsersService.js index 7d796bc..d9546c5 100644 --- a/src/services/UsersService.js +++ b/src/services/UsersService.js @@ -719,6 +719,16 @@ class usersService { return this.postAuxEnd("/faq", postData); } + // END POINT TO GET LIST OF USER PREVIOUS CARDS + payListCard() { + var postData = { + uid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + action: 11055 + }; + return this.postAuxEnd("/paylistcard", postData); + } /* - 20:27:30.118 FLOG_MAX [757411]: REQ_STRING(username) - 20:27:30.118 FLOG_MAX [757411]: REQ_STRING(password) From 4ce8f813c4b7a55c2a8de96c176800bc4eae8b56 Mon Sep 17 00:00:00 2001 From: victorAnumudu Date: Tue, 20 Jun 2023 20:22:08 +0100 Subject: [PATCH 2/2] added svg images --- src/assets/images/card.svg | 9 +++++++++ src/assets/images/grid-view.svg | 2 ++ src/assets/images/list-view.png | Bin 0 -> 2989 bytes src/assets/images/master.svg | 9 +++++++++ src/assets/images/visa.svg | 9 +++++++++ 5 files changed, 29 insertions(+) create mode 100644 src/assets/images/card.svg create mode 100644 src/assets/images/grid-view.svg create mode 100644 src/assets/images/list-view.png create mode 100644 src/assets/images/master.svg create mode 100644 src/assets/images/visa.svg diff --git a/src/assets/images/card.svg b/src/assets/images/card.svg new file mode 100644 index 0000000..443c6ff --- /dev/null +++ b/src/assets/images/card.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/assets/images/grid-view.svg b/src/assets/images/grid-view.svg new file mode 100644 index 0000000..e3f02b5 --- /dev/null +++ b/src/assets/images/grid-view.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/assets/images/list-view.png b/src/assets/images/list-view.png new file mode 100644 index 0000000000000000000000000000000000000000..8d3b049aed53d408c63874445415a052cf1787d7 GIT binary patch literal 2989 zcmeAS@N?(olHy`uVBq!ia0y~yU;;9k7&zE~)R&4Yzkn2Hfk$L90|U1(2s1Lwnj-;Z z#Cy6phE&XXd+lIms=J8m#pzAS0v1i@9Gd5qDo9zgt1j62IWTCGkN^KOd(N(WzcrDy zKvUyfsplk>VS+BzzyEt%{CGv}pPubsDj&--EdQ}%o(b~<9X1As(+mksj0_iy7-l3e zFl^yrPy+^-E^`CtsMKg^44Jf1b&K&s+24OJED!e|KVRWpf4_qLfabqlRL#Gac=y&+ zKb5GrsXG?^s}P)tK3843x4*Wq=Q_yJ`R4Z+3%dGWdm1yGOB&5eqXo+_C`;Eamu0YD ze_y%5cn>JqSMC1D*AV=N+WG45pKs?3+Zb^%D8p0{zweoOnh=B6d gFlk->6aUMscEISs$mdKI;Vst0G_4!?EnA( literal 0 HcmV?d00001 diff --git a/src/assets/images/master.svg b/src/assets/images/master.svg new file mode 100644 index 0000000..f5c1a88 --- /dev/null +++ b/src/assets/images/master.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/assets/images/visa.svg b/src/assets/images/visa.svg new file mode 100644 index 0000000..c1b6e91 --- /dev/null +++ b/src/assets/images/visa.svg @@ -0,0 +1,9 @@ + + + + + + + + +
-
+
-

Master Card

-

Bank **************3535

-

Verified

+

{item.description} Card

+

Bank **************{item.digits}

+
+

{item.added}

+

Verified

+