From b995c36a8e8b26596823b81375881ac4b4c6678c Mon Sep 17 00:00:00 2001
From: victorAnumudu <anumuduchukwuebuka@gmail.com>
Date: Thu, 17 Oct 2024 21:00:17 +0100
Subject: [PATCH 1/2] virtual card form country and state added

---
 .../FamilyAcc/Tabs/wallet/Wallet.jsx          |   2 +-
 .../walletvirtual/VirtualAddCardPopout.jsx    | 137 +++++++++++-------
 src/services/UsersService.js                  |  12 ++
 3 files changed, 100 insertions(+), 51 deletions(-)

diff --git a/src/components/FamilyAcc/Tabs/wallet/Wallet.jsx b/src/components/FamilyAcc/Tabs/wallet/Wallet.jsx
index 3b4f50d..9e3fe60 100644
--- a/src/components/FamilyAcc/Tabs/wallet/Wallet.jsx
+++ b/src/components/FamilyAcc/Tabs/wallet/Wallet.jsx
@@ -53,7 +53,7 @@ function Wallet({wallet, familyData, setFamilyWalletReload}) {
                 name="plan"
                 // onClick={onClose}
             >
-                Plan Wallet
+                Add Card
             </button>
         </div>
       </div>
diff --git a/src/components/MyWallet/walletvirtual/VirtualAddCardPopout.jsx b/src/components/MyWallet/walletvirtual/VirtualAddCardPopout.jsx
index 68bc0f0..187faec 100644
--- a/src/components/MyWallet/walletvirtual/VirtualAddCardPopout.jsx
+++ b/src/components/MyWallet/walletvirtual/VirtualAddCardPopout.jsx
@@ -37,7 +37,7 @@ const validationSchema = Yup.object().shape({
     .required("Required"),
   zipCode: Yup.string()
     .min(1, "Minimum 3 characters")
-    .max(10, "Maximum 25 characters")
+    .max(8, "Maximum 8 characters")
     .required("Required"),
 });
 
@@ -45,15 +45,20 @@ const VirtualAddCardPopout = ({ details, onClose, situation, walletItem }) => {
 
   const { userDetails } = useSelector((state) => state.userDetails);
 
+  const countryCode = userDetails?.country
+
   const userApi = new usersService()
 
   const [requestStatus, setRequestStatus] = useState({loading: false, status:false, message: ''})
 
   const [allCountries, setAllCountries] = useState({loading: true, data: []}) // VARIABLE TO HOLD COUNTRY LIST
 
+  const [state, setState] = useState({loading: true, data: {}}) // VARIABLE TO HOLD STATE LIST
+
+  
   let initialValues = {
     // initial values for formik
-    country: '',
+    country: countryCode ? countryCode : '',
     phone_number: '',
     email: userDetails?.email,
     firstname: userDetails?.firstname,
@@ -67,6 +72,7 @@ const VirtualAddCardPopout = ({ details, onClose, situation, walletItem }) => {
     zipCode: ''
   };
 
+  
   const handleSubmit = (values) => {
     const reqData = {
       name: values.firstname + ' ' + values.firstname,
@@ -98,6 +104,9 @@ const VirtualAddCardPopout = ({ details, onClose, situation, walletItem }) => {
     if(!res?.data?.result_list){
       return setAllCountries({ loading: false, data: [] });
     }
+    // if(countryCode){
+    //   return setAllCountries({ loading: false, data: res?.data?.result_list?.filter(item => item?.code == countryCode) });
+    // }
     setAllCountries({ loading: false, data: res?.data?.result_list });
     }).catch(err => {
       setAllCountries({ loading: false, data: [] });
@@ -105,6 +114,20 @@ const VirtualAddCardPopout = ({ details, onClose, situation, walletItem }) => {
     })
   },[])
 
+  useEffect(()=>{
+    // GET STATE API
+    setState({loading: true, data: {}})
+  userApi.getStateFromCountry({country: countryCode, action: '649'}).then(res =>{
+  if(!res?.data?.country_state){
+    return setState({ loading: false, data: {} });
+  }
+  setState({ loading: false, data: res?.data?.country_state});
+  }).catch(err => {
+    setState({ loading: false, data: {} });
+    console.log('err', err)
+  })
+},[initialValues.country])
+
   return (
     <ModalCom
       action={onClose}
@@ -171,6 +194,7 @@ const VirtualAddCardPopout = ({ details, onClose, situation, walletItem }) => {
                           value={props.values.country}
                           className={`input-field p-2 mt-3 rounded-full placeholder:text-base text-dark-gray w-full h-[42px] bg-slate-100 focus:ring-0 focus:outline-none border`}
                           onChange={props.handleChange}
+                          disabled={countryCode ? true : false}
                         >
                           {allCountries.loading ?
                             <option className="text-slate-500 text-lg" value="">
@@ -386,50 +410,63 @@ const VirtualAddCardPopout = ({ details, onClose, situation, walletItem }) => {
                     inputHandler={props.handleChange}
                     error={(props.errors.state && props.touched.state) && props.errors.state}
                   /> */}
-                  <div className="field w-full">
-                    <label
-                      htmlFor="state"
-                      className="job-label job-label-flex"
-                    >
-                      <span>State/Province</span>
-                      {props.errors.state && props.touched.state && (
-                        <span className="text-[12px] text-red-500">
-                          {props.errors.state}
-                        </span>
-                      )}
-                    </label>
-                    <select
-                      id="state"
-                      name="state"
-                      value={props.values.state}
-                      className={`input-field p-2 mt-3 rounded-full placeholder:text-base text-dark-gray w-full h-[42px] bg-slate-100 focus:ring-0 focus:outline-none border`}
-                      onChange={props.handleChange}
-                    >
-                      <>
-                      <option className="text-slate-500 text-lg" value=''>
-                          select
-                      </option>
-                      {state.map(item => (
-                        <option key={item.value} className="text-slate-500 text-lg" value={item.value}>
-                          {item.name}
-                        </option>
-                      ))}
-                      </>
-                    </select>
+
+                  <div className="field w-full grid md:grid-cols-2 gap-4">
+                    <div className="field w-full">
+                      <label
+                        htmlFor="state"
+                        className="job-label job-label-flex"
+                      >
+                        <span>State/Province</span>
+                        {props.errors.state && props.touched.state && (
+                          <span className="text-[12px] text-red-500">
+                            {props.errors.state}
+                          </span>
+                        )}
+                      </label>
+                      <select
+                        id="state"
+                        name="state"
+                        value={props.values.state}
+                        className={`input-field p-2 mt-3 rounded-full placeholder:text-base text-dark-gray w-full h-[42px] bg-slate-100 focus:ring-0 focus:outline-none border`}
+                        onChange={props.handleChange}
+                      >
+                        {state.loading ?
+                            <option className="text-slate-500 text-lg" value="">
+                              Loading...
+                            </option>
+                          : Object.keys(state.data)?.length > 0 ?
+                          <>
+                            <option className="text-slate-500 text-lg" value="">
+                              Select State
+                            </option>
+                            {Object.keys(state.data)?.map((item, index) => (
+                              <option key={index} className="text-slate-500 text-lg" value={item}>
+                                {state?.data[item]}
+                              </option>
+                            ))}
+                          </>
+                          :
+                            <option className="text-slate-500 text-lg" value="">
+                              Not Found
+                            </option>
+                          }
+                      </select>
+                    </div>
+                
+                    <InputCom
+                      fieldClass="px-6"
+                      label="Zip Code"
+                      labelClass="tracking-wide"
+                      inputBg="bg-slate-100"
+                      inputClass="input-curve lg border border-light-purple"
+                      type="text"
+                      name="zipCode"
+                      value={props.values.zipCode}
+                      inputHandler={props.handleChange}
+                      error={(props.errors.zipCode && props.touched.zipCode) && props.errors.zipCode}
+                    />
                   </div>
-               
-                  <InputCom
-                    fieldClass="px-6"
-                    label="Zip Code"
-                    labelClass="tracking-wide"
-                    inputBg="bg-slate-100"
-                    inputClass="input-curve lg border border-light-purple"
-                    type="text"
-                    name="zipCode"
-                    value={props.values.zipCode}
-                    inputHandler={props.handleChange}
-                    error={(props.errors.zipCode && props.touched.zipCode) && props.errors.zipCode}
-                  />
                 </div>
               </div>
               <div className="modal-footer-wrapper grid grid-cols-1 xxs:grid-cols-3">
@@ -488,8 +525,8 @@ const date = new Date().getFullYear()
 
 const year = new Array(100).fill(0).map((_,i) =>  (date-2) - i+1 )
 
-const state = [
-  {value: 'abia', name: 'Abia'},
-  {value: 'imo', name: 'Imo'},
-  {value: 'anambra', name: 'Anambra'},
-]
\ No newline at end of file
+// const state = [
+//   {value: 'abia', name: 'Abia'},
+//   {value: 'imo', name: 'Imo'},
+//   {value: 'anambra', name: 'Anambra'},
+// ]
\ No newline at end of file
diff --git a/src/services/UsersService.js b/src/services/UsersService.js
index 4bf2560..0b149b5 100644
--- a/src/services/UsersService.js
+++ b/src/services/UsersService.js
@@ -1536,6 +1536,18 @@ class usersService {
     return this.postAuxEnd("/recentpastdue", postData);
   }
 
+  //API TO GET STATES FROM COUNTRY
+  getStateFromCountry(reqData){
+    var postData = {
+      member_uid: localStorage.getItem("uid"),
+      member_id: localStorage.getItem("member_id"),
+      sessionid: localStorage.getItem("session_token"),
+      // action: apiConst.WRENCHBOARD_LOGIN_PROMO,
+      ...reqData
+    };
+    return this.postAuxEnd("/countrystate", postData);
+  }
+
   /*
     - 20:27:30.118 FLOG_MAX [757411]: 	REQ_STRING(username)
     - 20:27:30.118 FLOG_MAX [757411]: 	REQ_STRING(password)

From 858bd7c0f7e344eec6c1b0a6753a63f6fc816d79 Mon Sep 17 00:00:00 2001
From: victorAnumudu <anumuduchukwuebuka@gmail.com>
Date: Thu, 17 Oct 2024 21:06:29 +0100
Subject: [PATCH 2/2] virtual card form country and state added

---
 .../walletvirtual/VirtualAddCardPopout.jsx       | 16 +++++++---------
 src/lib/apiConst.js                              |  2 ++
 src/services/UsersService.js                     |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/MyWallet/walletvirtual/VirtualAddCardPopout.jsx b/src/components/MyWallet/walletvirtual/VirtualAddCardPopout.jsx
index 187faec..5afa00f 100644
--- a/src/components/MyWallet/walletvirtual/VirtualAddCardPopout.jsx
+++ b/src/components/MyWallet/walletvirtual/VirtualAddCardPopout.jsx
@@ -24,20 +24,18 @@ const validationSchema = Yup.object().shape({
   birthDay: Yup.string()
     .required("Required"),
   address: Yup.string()
-    .min(5, "Minimum 3 characters")
-    .max(50, "Maximum 25 characters")
+    .min(5, "Min 3 characters")
+    .max(50, "Max 25 characters")
     .required("Required"),
   city: Yup.string()
-    .min(2, "Minimum 3 characters")
-    .max(25, "Maximum 25 characters")
+    .min(2, "Min 3 characters")
+    .max(25, "Max 25 characters")
     .required("Required"),
   state: Yup.string()
-    .min(2, "Minimum 3 characters")
-    .max(25, "Maximum 25 characters")
     .required("Required"),
   zipCode: Yup.string()
-    .min(1, "Minimum 3 characters")
-    .max(8, "Maximum 8 characters")
+    .min(1, "Min 3 characters")
+    .max(8, "Max 8 characters")
     .required("Required"),
 });
 
@@ -117,7 +115,7 @@ const VirtualAddCardPopout = ({ details, onClose, situation, walletItem }) => {
   useEffect(()=>{
     // GET STATE API
     setState({loading: true, data: {}})
-  userApi.getStateFromCountry({country: countryCode, action: '649'}).then(res =>{
+  userApi.getStateFromCountry({country: countryCode}).then(res =>{
   if(!res?.data?.country_state){
     return setState({ loading: false, data: {} });
   }
diff --git a/src/lib/apiConst.js b/src/lib/apiConst.js
index 4278483..6d9c427 100644
--- a/src/lib/apiConst.js
+++ b/src/lib/apiConst.js
@@ -78,6 +78,8 @@ export const apiConst = {
     WRENCHBOARD_START_JOBLIST:      11028,
     WRENCHBOARD_ACCOUNT_DASHDATA:   11029,
 
+    WRENCHBOARD_COUNTRY_STATE: 649,
+
     WRENCHBOARD_SEND_CONTACTUS:      11030,
     WRENCHBOARD_ACCOUNT_SENDREFER:   11032,
     WRENCHBOARD_ACCOUNT_REFERLINK:   11033,
diff --git a/src/services/UsersService.js b/src/services/UsersService.js
index 0b149b5..823d4b9 100644
--- a/src/services/UsersService.js
+++ b/src/services/UsersService.js
@@ -1542,7 +1542,7 @@ class usersService {
       member_uid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
-      // action: apiConst.WRENCHBOARD_LOGIN_PROMO,
+      action: apiConst.WRENCHBOARD_COUNTRY_STATE,
       ...reqData
     };
     return this.postAuxEnd("/countrystate", postData);