@jimrising/easymerchantsdk-react-native 1.3.9 → 1.4.2

package/ios/Pods/ViewControllers/BillingInfoVC/BillingInfoVC.swift

@@ -15,7 +15,7 @@ protocol BillingInfoVCDelegate: AnyObject {
 
 class BillingInfoVC: BaseVC {
     
-    @IBOutlet weak var viewBillingInfo: UIView!
+//    @IBOutlet weak var viewBillingInfo: UIView!
     @IBOutlet weak var btnPrevious: UIButton!
     @IBOutlet weak var viewCountryList: UIView!
     @IBOutlet weak var tblViewCountryList: UITableView!
@@ -51,12 +51,14 @@ class BillingInfoVC: BaseVC {
     var stateList: [[String: Any]] = []
     var cityList: [[String: Any]] = []
     
-    var billingInfoData: [String: Any]?
+    // var billingInfoData: [String: Any]?
+    var billingInfoData: Data?
     
     var cardNumber: String?
     var expiryDate: String?
     var cvv: String?
     var nameOnCard: String?
+    var userEmail: String?
     
     //Banking Params
     var accountName: String?
@@ -77,6 +79,7 @@ class BillingInfoVC: BaseVC {
     var cvvText: String?
     
     var isFrom = String()
+    var isFromm = String()
     
     //From Regular Saved Bank Accounts
     var customerID: String?
@@ -89,13 +92,26 @@ class BillingInfoVC: BaseVC {
     var chosenPlan: String?
     var startDate: String?
     
+    //GrailPay Params
+    var grailPayAccountID: String?
+    var selectedGrailPayAccountType: String?
+    var selectedGrailPayAccountName: String?
+    
+    var billingInfo: [FieldItem]?
+    var additionalInfo: [FieldItem]?
+    var visibility: FieldsVisibility?
+    var fieldSection: FieldSection?
+    
+    var easyPayDelegate: EasyPayViewControllerDelegate?
+    
     override func viewDidLoad() {
         super.viewDidLoad()
+        updateNextButtonTitle()
         btnSelectState.isHidden = true
         btnSelectCity.isHidden = true
         
         uiFinishingTouchElements()
-        configureFieldVisibility()
+        //        configureFieldVisibility()
         setupShadowForListViews()
         
         tblViewCountryList.delegate = self
@@ -123,37 +139,44 @@ class BillingInfoVC: BaseVC {
         tapGesture.cancelsTouchesInView = false
         self.view.addGestureRecognizer(tapGesture)
         
-        // Print data for verification
-        if let billingInfoData = billingInfoData {
-            print("Billing Info Data: \(billingInfoData)")
-            
-            if let address = billingInfoData["address"] as? String {
-                txtFieldAddress.text = address
-            }
-            
-            if let country = billingInfoData["country"] as? String {
-                txtFieldCountry.text = country
-            }
-            
-            if let state = billingInfoData["state"] as? String {
-                txtFieldState.text = state
-            }
+        guard let billingInfoData = billingInfoData else {
+            print("No billing info data")
+            return
+        }
+        
+        do {
+            let decodedFieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
+            self.fieldSection = decodedFieldSection  // <--- Assign here!
             
-            if let city = billingInfoData["city"] as? String {
-                txtFieldCity.text = city
+            // Fill Billing Fields UI
+            for item in decodedFieldSection.billing {
+                switch item.name {
+                case "address":
+                    txtFieldAddress.text = item.value
+                case "country":
+                    txtFieldCountry.text = item.value
+                case "state":
+                    txtFieldState.text = item.value
+                case "city":
+                    txtFieldCity.text = item.value
+                case "postal_code":
+                    txtFieldPostalCode.text = item.value
+                default:
+                    break
+                }
             }
+            // Now that fieldSection is set, update star labels visibility
+            configureFieldVisibility()
             
-            if let postalCode = billingInfoData["postal_code"] as? String {
-                txtFieldPostalCode.text = postalCode
-            }
+        } catch {
+            print("Failed to decode billing info data: \(error)")
         }
         
-        print(selectedCard ?? "")
     }
     
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        
+        updateNextButtonTitle()
         uiFinishingTouchElements()
         
         keyboardObserver.animateChanges({ [self] height in
@@ -171,6 +194,38 @@ class BillingInfoVC: BaseVC {
         keyboardObserver.invalidate()
     }
     
+    private func updateNextButtonTitle() {
+        guard let request = request else { return }
+        
+        if let billingInfoData = request.billingInfoData,
+           let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
+            
+            let isAdditionalVisible = fieldSection.visibility.additional
+            let isBillingVisible = fieldSection.visibility.billing
+            let amountText = String(format: "$%.2f", request.amount ?? 0)
+            let submitText = request.submitButtonText ?? "Submit"
+            
+            if !isAdditionalVisible {
+                // Only billing info is visible
+                btnNext.setTitle("\(submitText) (\(amountText))", for: .normal)
+            } else {
+                // Additional info is visible
+                let suffix = isBillingVisible ? "(Additional Info)" : ""
+                btnNext.setTitle("\(submitText) \(suffix)", for: .normal)
+            }
+        } else {
+            let amountValue = request.amount ?? 0
+            let amountText = String(format: "$%.2f", amountValue)
+            let submitText = request.submitButtonText
+            
+            let defaultTitle = (submitText?.isEmpty == false)
+            ? "\(submitText!) (\(amountText))"
+            : "Pay Now (\(amountText))"
+            
+            btnNext.setTitle(defaultTitle, for: .normal)
+        }
+    }
+    
     func uiFinishingTouchElements() {
         // Set background color for the main view
         if let containerBGcolor = UserStoreSingleton.shared.container_bg_col,
@@ -199,10 +254,10 @@ class BillingInfoVC: BaseVC {
         if let secondaryFontColor = UserStoreSingleton.shared.secondary_font_col,
            let placeholderColor = UIColor(hex: secondaryFontColor) {
             lblEasyMerchant.textColor = placeholderColor
-            viewBillingInfo.layer.borderColor = placeholderColor.cgColor
+//            viewBillingInfo.layer.borderColor = placeholderColor.cgColor
         }
         else {
-            viewBillingInfo.layer.borderColor = UIColor.systemGray.cgColor
+//            viewBillingInfo.layer.borderColor = UIColor.systemGray.cgColor
         }
         
         if let borderRadiusString = UserStoreSingleton.shared.border_radious,
@@ -210,17 +265,17 @@ class BillingInfoVC: BaseVC {
             btnNext.layer.cornerRadius = CGFloat(borderRadius) // Set corner radius
             btnPrevious.layer.cornerRadius = CGFloat(borderRadius)
             btnPrevious.layer.borderWidth = 1
-            viewBillingInfo.layer.cornerRadius = CGFloat(borderRadius)
-            viewBillingInfo.layer.borderWidth = 1
+//            viewBillingInfo.layer.cornerRadius = CGFloat(borderRadius)
+//            viewBillingInfo.layer.borderWidth = 1
         } else {
             btnNext.layer.cornerRadius = 8 // Default value
             btnPrevious.layer.cornerRadius = 8
-            viewBillingInfo.layer.borderWidth = 1
-            viewBillingInfo.layer.cornerRadius = 8
+//            viewBillingInfo.layer.borderWidth = 1
+//            viewBillingInfo.layer.cornerRadius = 8
         }
         btnNext.layer.masksToBounds = true // Ensure the corners are clipped properly
         btnPrevious.layer.masksToBounds = true
-        viewBillingInfo.layer.masksToBounds = true
+//        viewBillingInfo.layer.masksToBounds = true
         
         if let primaryFontColor = UserStoreSingleton.shared.primary_font_col,
            let uiColor = UIColor(hex: primaryFontColor) {
@@ -236,19 +291,34 @@ class BillingInfoVC: BaseVC {
         }
     }
     
+    private func getFieldValue(for name: String) -> String? {
+        return fieldSection?.billing.first(where: { $0.name == name })?.value
+    }
+    
+    private func setFieldValue(_ name: String, to value: String?) {
+        guard let index = fieldSection?.billing.firstIndex(where: { $0.name == name }) else { return }
+        fieldSection?.billing[index].value = value ?? ""
+    }
+    
     private func configureFieldVisibility() {
-        let address = billingInfoData?["address"] as? String
-        let country = billingInfoData?["country"] as? String
-        let state = billingInfoData?["state"] as? String
-        let city = billingInfoData?["city"] as? String
-        let postalCode = billingInfoData?["postal_code"] as? String
+        guard let billingFields = fieldSection?.billing else {
+            print("No billing fields found")
+            return
+        }
+        
+        func isFieldRequired(_ name: String) -> Bool {
+            let required = billingFields.first(where: { $0.name == name })?.required == true
+            print("Field \(name) required: \(required)")
+            return required
+        }
         
         DispatchQueue.main.async {
-            self.lblStarAddressField.isHidden = (address ?? "").trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
-            self.lblStarCountryField.isHidden = (country ?? "").trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
-            self.lblStarStateField.isHidden = (state ?? "").trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
-            self.lblStarCityField.isHidden = (city ?? "").trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
-            self.lblStarPostalCodeField.isHidden = (postalCode ?? "").trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
+            self.lblStarAddressField.isHidden = !isFieldRequired("address")
+            self.lblStarCountryField.isHidden = !isFieldRequired("country")
+            self.lblStarStateField.isHidden = !isFieldRequired("state")
+            self.lblStarCityField.isHidden = !isFieldRequired("city")
+            self.lblStarPostalCodeField.isHidden = !isFieldRequired("postal_code")
+            print("Star visibility set")
             self.view.layoutIfNeeded()
         }
     }
@@ -502,11 +572,13 @@ class BillingInfoVC: BaseVC {
     }
     
     func updateBillingInfoData() {
-        billingInfoData?["address"] = txtFieldAddress.text
-        billingInfoData?["country"] = txtFieldCountry.text
-        billingInfoData?["state"] = txtFieldState.text
-        billingInfoData?["city"] = txtFieldCity.text
-        billingInfoData?["postal_code"] = txtFieldPostalCode.text
+        setFieldValue("address", to: txtFieldAddress.text)
+        setFieldValue("country", to: txtFieldCountry.text)
+        setFieldValue("state", to: txtFieldState.text)
+        setFieldValue("city", to: txtFieldCity.text)
+        setFieldValue("postal_code", to: txtFieldPostalCode.text)
+        
+        billingInfo = fieldSection?.billing
     }
     
     @IBAction func actionBtnSelectCountry(_ sender: UIButton) {
@@ -534,190 +606,1925 @@ class BillingInfoVC: BaseVC {
     }
     
     @IBAction func actionBtnNext(_ sender: UIButton) {
+        guard let request = request else { return }
+        
+        // MARK: - Validate Billing Fields
         if !lblStarAddressField.isHidden &&
             txtFieldAddress.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
             showAlert(title: "Missing Information", message: "Please enter your address.")
             return
-        }
-        else if !lblStarCountryField.isHidden &&
+        } else if !lblStarCountryField.isHidden &&
                     txtFieldCountry.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
             showAlert(title: "Missing Information", message: "Please select your country.")
             return
-        }
-        else if !lblStarStateField.isHidden &&
+        } else if !lblStarStateField.isHidden &&
                     txtFieldState.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
             showAlert(title: "Missing Information", message: "Please select your state.")
             return
-        }
-        else if !lblStarCityField.isHidden &&
+        } else if !lblStarCityField.isHidden &&
                     txtFieldCity.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
             showAlert(title: "Missing Information", message: "Please select your city.")
             return
-        }
-        else if !lblStarPostalCodeField.isHidden &&
+        } else if !lblStarPostalCodeField.isHidden &&
                     txtFieldPostalCode.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
             showAlert(title: "Missing Information", message: "Please enter your postal code.")
             return
         }
-        else {
-            let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
-            // Set properties on AdditionalInfoVC
-            vc.cardNumber = cardNumber
-            vc.expiryDate = expiryDate
-            vc.cvv = cvv
-            vc.nameOnCard = nameOnCard
-            updateBillingInfoData()
-            vc.billingInfoData = billingInfoData
-            // Pass the selected payment method
-            vc.selectedPaymentMethod = selectedPaymentMethod
-            vc.isSavedForFuture = isSavedForFuture
-            
-            //Banking Case
-            vc.accountName = accountName
-            vc.routingNumber = routingNumber
-            vc.accountType = accountType
-            vc.accountNumber = accountNumber
-            
-            vc.customerID = customerID
-            vc.accountID = accountID
-            vc.isFrom = isFrom
-            
-            vc.isSavedNewAccount = isSavedNewAccount
-            vc.amount = Int(request.amount)
-            
-            vc.request = self.request
-            
-            vc.chosenPlan = chosenPlan
-            vc.startDate = startDate
-            
-            if isFrom == "SavedCards" {
-                vc.isFrom = "SavedCards"
-                vc.selectedCard = selectedCard // Passing the selected card data
-                vc.cvvText = cvvText // Passing the CVV text
-                vc.amount = Int(request.amount)
+        
+        // Update billing info
+        updateBillingInfoData()
+        
+        guard let updatedFieldSection = fieldSection else {
+            print("Missing updated fieldSection")
+            return
+        }
+        
+        let isAdditionalVisible = updatedFieldSection.visibility.additional
+        
+        // Get updated billingInfoData after updateBillingInfoData()
+        guard let updatedBillingData = try? JSONEncoder().encode(fieldSection),
+              let updatedFieldSection = try? JSONDecoder().decode(FieldSection.self, from: updatedBillingData) else {
+            print("Failed to encode or decode updated billing info")
+            return
+        }
+        
+        // MARK: - Card Flow
+        if selectedPaymentMethod == "Card" {
+            
+            if isAdditionalVisible {
+                // ✅ Go to AdditionalInfoVC
+                let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
+                vc.cardNumber = cardNumber
+                vc.expiryDate = expiryDate
+                vc.cvv = cvv
+                vc.nameOnCard = nameOnCard
+                vc.userEmail = userEmail
+                vc.billingInfoData = updatedBillingData
+                vc.fieldSection = updatedFieldSection
+                vc.billingInfo = updatedFieldSection.billing
+                vc.additionalInfo = updatedFieldSection.additional
+                vc.visibility = updatedFieldSection.visibility
+                vc.selectedPaymentMethod = selectedPaymentMethod
+                vc.isSavedForFuture = isSavedForFuture
+                vc.amount = Int(request.amount ?? 0)
+                vc.request = request
+                vc.chosenPlan = chosenPlan
+                vc.startDate = startDate
+                vc.isFrom = isFrom
+                if isFrom == "SavedCards" {
+                    vc.selectedCard = selectedCard
+                    vc.cvvText = cvvText
+                }
+                else if isFrom == "AddNewCard" {
+                    vc.isSavedNewCard = isSavedNewCard
+                }
+                navigationController?.pushViewController(vc, animated: true)
                 
-                vc.request = self.request
+            }
+            else if !isAdditionalVisible && isSavedForFuture {
+                let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
+                vc.cardNumber = cardNumber
+                vc.expiryDate = expiryDate
+                vc.cvv = cvv
+                vc.nameOnCard = nameOnCard
+                vc.userEmail = userEmail
+                vc.billingInfoData = updatedBillingData
+                vc.fieldSection = updatedFieldSection
+                vc.selectedPaymentMethod = selectedPaymentMethod
+                vc.easyPayDelegate = easyPayDelegate
+                vc.request = request
                 vc.chosenPlan = chosenPlan
                 vc.startDate = startDate
+                vc.billingInfo = updatedFieldSection.billing
+                vc.additionalInfo = updatedFieldSection.additional
+                vc.visibility = updatedFieldSection.visibility
+                vc.isSavedForFuture = true
+                vc.amount = amount
+                navigationController?.pushViewController(vc, animated: true)
             }
-            
-            if isFrom == "AddNewCard" {
-                vc.isFrom = "AddNewCard"
-                vc.amount = Int(request.amount)
-                vc.isSavedNewCard = isSavedNewCard
-                
-                vc.request = self.request
+            else if !isAdditionalVisible && isFrom == "SavedCards" {
+                paymentIntentFromShowCardApi()
+            }
+            else if !isAdditionalVisible && isSavedNewCard {
+                if isFrom == "AddNewCard" {
+                    if request.secureAuthentication == true {
+                        threeDSecurePaymentAddNewCardApi(customerId: UserStoreSingleton.shared.customerId)
+                    }
+                    else {
+                        paymentIntentAddNewCardApi(customerId: UserStoreSingleton.shared.customerId)
+                    }
+                }
+            }
+            else {
+                // ✅ Skip to Payment directly
+                if request.secureAuthentication == true {
+                    threeDSecurePaymentApi()
+                } else {
+                    paymentIntentApi()
+                }
+            }
+        }
+        else if selectedPaymentMethod == "Bank" {
+            if isAdditionalVisible {
+                // ✅ Go to AdditionalInfoVC
+                let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
+                vc.userEmail = userEmail
+                vc.billingInfoData = updatedBillingData
+                vc.fieldSection = updatedFieldSection
+                vc.billingInfo = updatedFieldSection.billing
+                vc.additionalInfo = updatedFieldSection.additional
+                vc.visibility = updatedFieldSection.visibility
+                vc.selectedPaymentMethod = selectedPaymentMethod
+                vc.isSavedForFuture = isSavedForFuture
+                vc.accountName = accountName
+                vc.routingNumber = routingNumber
+                vc.accountType = accountType
+                vc.accountNumber = accountNumber
+                vc.customerID = customerID
+                vc.accountID = accountID
+                vc.isFrom = isFrom
+                vc.isSavedNewAccount = isSavedNewAccount
+                vc.amount = Int(request.amount ?? 0)
+                vc.request = request
                 vc.chosenPlan = chosenPlan
                 vc.startDate = startDate
+                vc.grailPayAccountID = grailPayAccountID
+                vc.selectedGrailPayAccountType = selectedGrailPayAccountType
+                vc.selectedGrailPayAccountName = selectedGrailPayAccountName
+                navigationController?.pushViewController(vc, animated: true)
+            }
+            else if !isAdditionalVisible && isSavedForFuture {
+                let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
+                vc.accountName = accountName
+                vc.routingNumber = routingNumber
+                vc.accountType = accountType
+                vc.accountNumber = accountNumber
+                vc.userEmail = userEmail
+                vc.billingInfoData = updatedBillingData
+                vc.fieldSection = updatedFieldSection
+                vc.selectedPaymentMethod = selectedPaymentMethod
+                vc.easyPayDelegate = easyPayDelegate
+                vc.request = request
+                vc.chosenPlan = chosenPlan
+                vc.startDate = startDate
+                vc.billingInfo = updatedFieldSection.billing
+                vc.additionalInfo = updatedFieldSection.additional
+                vc.visibility = updatedFieldSection.visibility
+                vc.isSavedForFuture = isSavedForFuture
+                vc.isSavedNewAccount = isSavedNewAccount
+                vc.amount = amount
+                vc.grailPayAccountID = grailPayAccountID
+                vc.selectedGrailPayAccountType = selectedGrailPayAccountType
+                vc.selectedGrailPayAccountName = selectedGrailPayAccountName
+                navigationController?.pushViewController(vc, animated: true)
+            }
+            else if isFrom == "SavedBank" {
+                accountChargeSavedBankAccountApi()
+            }
+            else if isFrom == "NormalBankPayWithoutSave" {
+                accountChargeApi()
+            }
+            else if isFrom == "AddNewAccountWithoutSave" {
+                accountChargeApi()
+            }
+            else if isFrom == "AddNewAccountWithSave" {
+                accountChargeApi(customerId: UserStoreSingleton.shared.customerId)
+            }
+        }
+        else if selectedPaymentMethod == "GrailPay" {
+            if isAdditionalVisible {
+                // ✅ Go to AdditionalInfoVC
+                let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
+                vc.billingInfoData = updatedBillingData
+                vc.fieldSection = updatedFieldSection
+                vc.billingInfo = updatedFieldSection.billing
+                vc.additionalInfo = updatedFieldSection.additional
+                vc.visibility = updatedFieldSection.visibility
+                vc.selectedPaymentMethod = selectedPaymentMethod
+                vc.isSavedForFuture = isSavedForFuture
+                vc.isFrom = isFrom
+                vc.isSavedNewAccount = isSavedNewAccount
+                vc.amount = Int(request.amount ?? 0)
+                vc.request = request
+                vc.chosenPlan = chosenPlan
+                vc.startDate = startDate
+                vc.grailPayAccountID = grailPayAccountID
+                vc.selectedGrailPayAccountType = selectedGrailPayAccountType
+                vc.selectedGrailPayAccountName = selectedGrailPayAccountName
+                navigationController?.pushViewController(vc, animated: true)
+            }
+            else if !isAdditionalVisible && isSavedForFuture {
+                let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
+                vc.billingInfoData = updatedBillingData
+                vc.fieldSection = updatedFieldSection
+                vc.billingInfo = updatedFieldSection.billing
+                vc.additionalInfo = updatedFieldSection.additional
+                vc.visibility = updatedFieldSection.visibility
+                vc.selectedPaymentMethod = selectedPaymentMethod
+                vc.isSavedForFuture = isSavedForFuture
+                vc.isFrom = isFrom
+                vc.isSavedNewAccount = isSavedNewAccount
+                vc.amount = Int(request.amount ?? 0)
+                vc.request = request
+                vc.chosenPlan = chosenPlan
+                vc.startDate = startDate
+                vc.grailPayAccountID = grailPayAccountID
+                vc.selectedGrailPayAccountType = selectedGrailPayAccountType
+                vc.selectedGrailPayAccountName = selectedGrailPayAccountName
+                navigationController?.pushViewController(vc, animated: true)
+            }
+            else {
+                grailPayAccountChargeApi()
+            }
+        }
+        else if selectedPaymentMethod == "NewGrailPayAccount" {
+            if isAdditionalVisible {
+                // ✅ Go to AdditionalInfoVC
+                let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
+                vc.billingInfoData = updatedBillingData
+                vc.fieldSection = updatedFieldSection
+                vc.billingInfo = updatedFieldSection.billing
+                vc.additionalInfo = updatedFieldSection.additional
+                vc.visibility = updatedFieldSection.visibility
+                vc.selectedPaymentMethod = selectedPaymentMethod
+                vc.isSavedForFuture = isSavedForFuture
+                vc.isFrom = isFrom
+                vc.isSavedNewAccount = isSavedNewAccount
+                vc.amount = Int(request.amount ?? 0)
+                vc.request = request
+                vc.chosenPlan = chosenPlan
+                vc.startDate = startDate
+                vc.grailPayAccountID = grailPayAccountID
+                vc.selectedGrailPayAccountType = selectedGrailPayAccountType
+                vc.selectedGrailPayAccountName = selectedGrailPayAccountName
+                navigationController?.pushViewController(vc, animated: true)
+            }
+            else if !isAdditionalVisible && isSavedForFuture {
+                let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
+                vc.billingInfoData = updatedBillingData
+                vc.fieldSection = updatedFieldSection
+                vc.billingInfo = updatedFieldSection.billing
+                vc.additionalInfo = updatedFieldSection.additional
+                vc.visibility = updatedFieldSection.visibility
+                vc.selectedPaymentMethod = selectedPaymentMethod
+                vc.isSavedForFuture = isSavedForFuture
+                vc.isFrom = isFrom
+                vc.isSavedNewAccount = isSavedNewAccount
+                vc.amount = Int(request.amount ?? 0)
+                vc.request = request
+                vc.chosenPlan = chosenPlan
+                vc.startDate = startDate
+                vc.grailPayAccountID = grailPayAccountID
+                vc.selectedGrailPayAccountType = selectedGrailPayAccountType
+                vc.selectedGrailPayAccountName = selectedGrailPayAccountName
+                navigationController?.pushViewController(vc, animated: true)
+            }
+            else {
+                grailPayAccountChargeApi()
             }
-            
-            self.navigationController?.pushViewController(vc, animated: true)
         }
     }
     
-}
-
-//MARK: - Table View
-@available(iOS 16.0, *)
-extension BillingInfoVC: UITableViewDelegate, UITableViewDataSource {
-    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        if tableView == tblViewCountryList {
-            return countryList.count
+    // MARK: - Credit Card Charge Api
+    func paymentIntentApi() {
+        showLoadingIndicator()
+        
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.charges.path()
+        
+        guard let serviceURL = URL(string: fullURL) else {
+            print("Invalid URL")
+            hideLoadingIndicator()
+            return
         }
-        else if tableView == tblViewStateList {
-            return stateList.count
+        
+        var urlRequest = URLRequest(url: serviceURL)
+        urlRequest.httpMethod = "POST"
+        urlRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        
+        let token = UserStoreSingleton.shared.clientToken
+        print("Setting clientToken header: \(token ?? "None")")
+        urlRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        
+        var params: [String: Any] = [
+            "name": nameOnCard ?? "",
+            "email": userEmail ?? "",
+            "card_number": cardNumber?.replacingOccurrences(of: " ", with: "") ?? "",
+            "cardholder_name": nameOnCard ?? "",
+            "exp_month": expiryDate?.components(separatedBy: "/").first ?? "",
+            "exp_year": expiryDate?.components(separatedBy: "/").last ?? "",
+            "cvc": cvv ?? "",
+            "currency": "usd",
+            "description": "Hosted payment checkout"
+        ]
+        
+        // Conditionally add billing info
+        if let visibility = visibility, visibility.billing == true,
+           let billing = billingInfo, !billing.isEmpty {
+            
+            var billingInfoDict: [String: Any] = [:]
+            for item in billing {
+                billingInfoDict[item.name] = item.value
+            }
+            
+            params["address"] = billingInfoDict["address"] as? String ?? ""
+            params["country"] = billingInfoDict["country"] as? String ?? ""
+            params["state"] = billingInfoDict["state"] as? String ?? ""
+            params["city"] = billingInfoDict["city"] as? String ?? ""
+            params["zip"] = billingInfoDict["postal_code"] as? String ?? ""
         }
-        else if tableView == tblViewCityList {
-            return cityList.count
+        
+        // Add these if recurring is enabled
+        if let req = request, req.is_recurring == true {
+            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                // Only send start_date if type is .custom and field is not empty
+                if let startDateText = startDate, !startDateText.isEmpty {
+                    let inputFormatter = DateFormatter()
+                    inputFormatter.dateFormat = "dd/MM/yyyy"
+                    
+                    let outputFormatter = DateFormatter()
+                    outputFormatter.dateFormat = "MM/dd/yyyy"
+                    
+                    if let date = inputFormatter.date(from: startDateText) {
+                        let apiFormattedDate = outputFormatter.string(from: date)
+                        params["start_date"] = apiFormattedDate
+                    } else {
+                        print("Invalid date format in startDateText")
+                    }
+                }
+            }
+            
+            params["interval"] = chosenPlan?.lowercased()
         }
-        else {
-            return 0
+        
+        print(params)
+        
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+            urlRequest.httpBody = jsonData
+            if let jsonString = String(data: jsonData, encoding: .utf8) {
+                print("JSON Payload: \(jsonString)")
+            }
+        } catch let error {
+            print("Error creating JSON data: \(error)")
+            hideLoadingIndicator()
+            return
+        }
+        
+        let session = URLSession.shared
+        let task = session.dataTask(with: urlRequest) { (serviceData, serviceResponse, error) in
+            
+            DispatchQueue.main.async {
+                self.hideLoadingIndicator()
+            }
+            
+            if let error = error {
+                print("Error: \(error.localizedDescription)")
+                self.presentPaymentErrorVC(errorMessage: error.localizedDescription)
+                return
+            }
+            
+            guard let httpResponse = serviceResponse as? HTTPURLResponse else {
+                print("Invalid response")
+                self.presentPaymentErrorVC(errorMessage: "Invalid response from server.")
+                return
+            }
+            
+            if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
+                if let data = serviceData {
+                    do {
+                        if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
+                            print("Response Data: \(responseObject)")
+                            
+                            if let status = responseObject["status"] as? Int, status == 0 {
+                                let errorMessage = responseObject["message"] as? String ?? "Unknown error occurred."
+                                self.presentPaymentErrorVC(errorMessage: errorMessage)
+                            } else {
+                                DispatchQueue.main.async {
+                                    if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
+                                        paymentDoneVC.chargeData = responseObject
+                                        paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
+                                        paymentDoneVC.easyPayDelegate = self.easyPayDelegate
+                                        // Pass billing and additional info
+                                        // Conditionally pass raw FieldItem array
+                                        paymentDoneVC.visibility = self.visibility
+                                        
+                                        if self.visibility?.billing == true {
+                                            paymentDoneVC.billingInfoData = self.billingInfo
+                                            var billingDict: [String: Any] = [:]
+                                            self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
+                                            paymentDoneVC.billingInfo = billingDict
+                                        }
+                                        
+                                        if self.visibility?.additional == true {
+                                            paymentDoneVC.additionalInfoData = self.additionalInfo
+                                            var additionalDict: [String: Any] = [:]
+                                            self.additionalInfo?.forEach { additionalDict[$0.name] = $0.value }
+                                            paymentDoneVC.additionalInfo = additionalDict
+                                        }
+                                        self.navigationController?.pushViewController(paymentDoneVC, animated: true)
+                                    }
+                                }
+                            }
+                        } else {
+                            self.presentPaymentErrorVC(errorMessage: "Invalid JSON format")
+                        }
+                    } catch let jsonError {
+                        self.presentPaymentErrorVC(errorMessage: "Error parsing response: \(jsonError.localizedDescription)")
+                    }
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "No data received from server.")
+                }
+            } else {
+                if let data = serviceData,
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let message = responseObj["message"] as? String {
+                    self.presentPaymentErrorVC(errorMessage: message)
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                }
+            }
         }
+        task.resume()
     }
     
-    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        if tableView == tblViewCountryList {
-            let cell = tableView.dequeueReusableCell(withIdentifier: "CountryListTVC") as! CountryListTVC
-            let country = countryList[indexPath.row]
-            cell.lblCountryName.text = country["name"] as? String
-            return cell
-        } else if tableView == tblViewStateList {
-            let cell = tableView.dequeueReusableCell(withIdentifier: "StateListTVC") as! StateListTVC
-            let state = stateList[indexPath.row]
-            cell.lblStateName.text = state["name"] as? String
-            return cell
-        } else if tableView == tblViewCityList {
-            let cell = tableView.dequeueReusableCell(withIdentifier: "CityListTVC") as! CityListTVC
-            let city = cityList[indexPath.row]
-            cell.lblCityName.text = city["city_name"] as? String
-            return cell
-        } else {
-            return UITableViewCell()
+    func presentPaymentErrorVC(errorMessage: String) {
+        DispatchQueue.main.async {
+            if let paymentErrorVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentErrorVC") as? PaymentErrorVC {
+                paymentErrorVC.errorMessage = errorMessage
+                paymentErrorVC.easyPayDelegate = self.easyPayDelegate // Pass the reference here
+                self.navigationController?.pushViewController(paymentErrorVC, animated: true)
+            }
         }
     }
     
-    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        if tableView == tblViewCountryList {
-            let selectedCountry = countryList[indexPath.row]["name"] as? String
-            txtFieldCountry.text = selectedCountry
-            viewCountryList.isHidden = true
+    //MARK: - 3DSecure
+    // MARK: - Credit Card Charge Api If Billing info is not nil and Without Login.
+    func threeDSecurePaymentApi() {
+        showLoadingIndicator()
+        
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.threeDSecure.path()
+        
+        guard let serviceURL = URL(string: fullURL) else {
+            print("Invalid URL")
+            hideLoadingIndicator()
+            return
+        }
+        
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "POST"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        
+        let token = UserStoreSingleton.shared.clientToken
+        print("Setting clientToken header: \(token ?? "None")")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
+        var params: [String: Any] = [
+            "name": nameOnCard ?? "",
+            "email": userEmail ?? "",
+            "card_number": cardNumber?.replacingOccurrences(of: " ", with: "") ?? "",
+            "cardholder_name": nameOnCard ?? "",
+            "exp_month": expiryDate?.components(separatedBy: "/").first ?? "",
+            "exp_year": expiryDate?.components(separatedBy: "/").last ?? "",
+            "cvc": cvv ?? "",
+            "currency": "usd",
+            "tokenize": request.tokenOnly ?? false
+        ]
+        
+        // Conditionally add billing info
+        if let visibility = visibility, visibility.billing == true,
+           let billing = billingInfo, !billing.isEmpty {
             
-            // Fetch states for the selected country
-            if let country = selectedCountry {
-                getStateListApi(for: country)
+            var billingInfoDict: [String: Any] = [:]
+            for item in billing {
+                billingInfoDict[item.name] = item.value
             }
-        } else if tableView == tblViewStateList {
-            let selectedState = stateList[indexPath.row]["name"] as? String
-            txtFieldState.text = selectedState
-            viewStateList.isHidden = true
             
-            // Fetch cities for the selected state and country
-            if let state = selectedState, let country = txtFieldCountry.text {
-                getCityListListApi(for: country, state: state)
+            params["address"] = billingInfoDict["address"] as? String ?? ""
+            params["country"] = billingInfoDict["country"] as? String ?? ""
+            params["state"] = billingInfoDict["state"] as? String ?? ""
+            params["city"] = billingInfoDict["city"] as? String ?? ""
+            params["zip"] = billingInfoDict["postal_code"] as? String ?? ""
+        }
+        
+        // Set default description if additional info is not visible
+        if let visibility = visibility, visibility.additional == false {
+            params["description"] = "Hosted payment checkout"
+        }
+        
+        // Add these if recurring is enabled
+        if let req = request, req.is_recurring == true {
+            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                // Only send start_date if type is .custom and field is not empty
+                if let startDateText = startDate, !startDateText.isEmpty {
+                    let inputFormatter = DateFormatter()
+                    inputFormatter.dateFormat = "dd/MM/yyyy"
+                    
+                    let outputFormatter = DateFormatter()
+                    outputFormatter.dateFormat = "MM/dd/yyyy"
+                    
+                    if let date = inputFormatter.date(from: startDateText) {
+                        let apiFormattedDate = outputFormatter.string(from: date)
+                        params["start_date"] = apiFormattedDate
+                    } else {
+                        print("Invalid date format in startDateText")
+                    }
+                }
             }
-        } else if tableView == tblViewCityList {
-            let selectedCity = cityList[indexPath.row]["city_name"] as? String
-            txtFieldCity.text = selectedCity
-            viewCityList.isHidden = true
             
-            // Fetch the city list again based on selected state & country
-            if let state = txtFieldState.text, let country = txtFieldCountry.text {
-                getCityListListApi(for: country, state: state)
+            params["interval"] = chosenPlan?.lowercased()
+        }
+        
+        print(params)
+        
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+            uRLRequest.httpBody = jsonData
+            if let jsonString = String(data: jsonData, encoding: .utf8) {
+                print("JSON Payload: \(jsonString)")
             }
+        } catch let error {
+            print("Error creating JSON data: \(error)")
+            hideLoadingIndicator()
+            return
         }
         
-        updateBillingInfoData()
-    }
-    
-    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return 50
-    }
-    
-}
-
-@available(iOS 16.0, *)
-extension BillingInfoVC: UITextFieldDelegate {
-    func textFieldShouldReturn(_ textField: UITextField) -> Bool {
-        textField.resignFirstResponder() // Dismiss the keyboard
-        return true
-    }
-    
-    // Update billingInfoData when user finishes editing a field
-    func textFieldDidEndEditing(_ textField: UITextField) {
+        let session = URLSession.shared
+        let task = session.dataTask(with: uRLRequest) { (serviceData, serviceResponse, error) in
+            
+            DispatchQueue.main.async {
+                self.hideLoadingIndicator() // Stop loader when response is received
+            }
+            
+            if let error = error {
+                print("Error: \(error.localizedDescription)")
+                return
+            }
+            
+            guard let httpResponse = serviceResponse as? HTTPURLResponse else {
+                print("Invalid response")
+                return
+            }
+            
+            if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
+                if let data = serviceData {
+                    do {
+                        if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
+                            print("Response Data: \(responseObject)")
+                            
+                            // Check if status is 0 and handle the error
+                            if let status = responseObject["status"] as? Int, status == 0 {
+                                let errorMessage = responseObject["message"] as? String ?? "Unknown error"
+                                self.presentPaymentErrorVC(errorMessage: errorMessage)
+                            } else {
+                                DispatchQueue.main.async {
+                                    if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "ThreeDSecurePaymentDoneVC") as? ThreeDSecurePaymentDoneVC {
+                                        
+                                        let urlString = responseObject["redirect_url"] as? String ?? responseObject["location_url"] as? String ?? ""
+                                        paymentDoneVC.redirectURL = urlString
+                                        paymentDoneVC.chargeData = responseObject
+                                        paymentDoneVC.easyPayDelegate = self.easyPayDelegate
+                                        // Pass billing and additional info
+                                        // Conditionally pass raw FieldItem array
+                                        paymentDoneVC.visibility = self.visibility
+                                        paymentDoneVC.amount = self.amount
+                                        
+                                        if self.visibility?.billing == true {
+                                            paymentDoneVC.billingInfoData = self.billingInfo
+                                            var billingDict: [String: Any] = [:]
+                                            self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
+                                            paymentDoneVC.billingInfo = billingDict
+                                        }
+                                        
+                                        if self.visibility?.additional == true {
+                                            paymentDoneVC.additionalInfoData = self.additionalInfo
+                                            var additionalDict: [String: Any] = [:]
+                                            self.additionalInfo?.forEach { additionalDict[$0.name] = $0.value }
+                                            paymentDoneVC.additionalInfo = additionalDict
+                                        }
+                                        self.navigationController?.pushViewController(paymentDoneVC, animated: true)
+                                    }
+                                }
+                            }
+                        } else {
+                            self.presentPaymentErrorVC(errorMessage: "Invalid JSON format")
+                        }
+                    } catch let jsonError {
+                        self.presentPaymentErrorVC(errorMessage: "Error parsing JSON: \(jsonError)")
+                    }
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "No data received")
+                }
+            } else {
+                if let data = serviceData,
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let message = responseObj["message"] as? String {
+                    self.presentPaymentErrorVC(errorMessage: message)
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                }
+            }
+        }
+        task.resume()
+    }
+    
+    // MARK: - Credit Card Charge Api If Billing info is not nil With Login from Add New Card.
+    func threeDSecurePaymentAddNewCardApi(customerId: String?) {
+        showLoadingIndicator()
+        
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.threeDSecure.path()
+        
+        guard let serviceURL = URL(string: fullURL) else {
+            print("Invalid URL")
+            hideLoadingIndicator()
+            return
+        }
+        
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "POST"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        
+        let token = UserStoreSingleton.shared.clientToken
+        print("Setting clientToken header: \(token ?? "None")")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
+        var params: [String: Any] = [
+            "name": nameOnCard ?? "",
+            "email": userEmail ?? "",
+            "card_number": cardNumber?.replacingOccurrences(of: " ", with: "") ?? "",
+            "cardholder_name": nameOnCard ?? "",
+            "exp_month": expiryDate?.components(separatedBy: "/").first ?? "",
+            "exp_year": expiryDate?.components(separatedBy: "/").last ?? "",
+            "cvc": cvv ?? "",
+            "description": "Hosted payment checkout",
+            "currency": "usd",
+            "tokenize": request.tokenOnly ?? false,
+            "save_card": isSavedNewCard ? 1 : 0,
+            "customer_id": customerId ?? ""
+        ]
+        
+        // Add is_default parameter if save_card is 1
+        if isSavedNewCard {
+            params["is_default"] = "1"
+        }
+        
+        // Conditionally add billing info
+        if let visibility = visibility, visibility.billing == true,
+           let billing = billingInfo, !billing.isEmpty {
+            
+            var billingInfoDict: [String: Any] = [:]
+            for item in billing {
+                billingInfoDict[item.name] = item.value
+            }
+            
+            params["address"] = billingInfoDict["address"] as? String ?? ""
+            params["country"] = billingInfoDict["country"] as? String ?? ""
+            params["state"] = billingInfoDict["state"] as? String ?? ""
+            params["city"] = billingInfoDict["city"] as? String ?? ""
+            params["zip"] = billingInfoDict["postal_code"] as? String ?? ""
+        }
+        
+        // Add these if recurring is enabled
+        if let req = request, req.is_recurring == true {
+            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                // Only send start_date if type is .custom and field is not empty
+                if let startDateText = startDate, !startDateText.isEmpty {
+                    let inputFormatter = DateFormatter()
+                    inputFormatter.dateFormat = "dd/MM/yyyy"
+                    
+                    let outputFormatter = DateFormatter()
+                    outputFormatter.dateFormat = "MM/dd/yyyy"
+                    
+                    if let date = inputFormatter.date(from: startDateText) {
+                        let apiFormattedDate = outputFormatter.string(from: date)
+                        params["start_date"] = apiFormattedDate
+                    } else {
+                        print("Invalid date format in startDateText")
+                    }
+                }
+            }
+            
+            params["interval"] = chosenPlan?.lowercased()
+        }
+        
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+            uRLRequest.httpBody = jsonData
+            if let jsonString = String(data: jsonData, encoding: .utf8) {
+                print("JSON Payload: \(jsonString)")
+            }
+        } catch let error {
+            print("Error creating JSON data: \(error)")
+            hideLoadingIndicator()
+            return
+        }
+        
+        let session = URLSession.shared
+        let task = session.dataTask(with: uRLRequest) { (serviceData, serviceResponse, error) in
+            
+            DispatchQueue.main.async {
+                self.hideLoadingIndicator() // Stop loader when response is received
+            }
+            
+            if let error = error {
+                print("Error: \(error.localizedDescription)")
+                return
+            }
+            
+            guard let httpResponse = serviceResponse as? HTTPURLResponse else {
+                print("Invalid response")
+                return
+            }
+            
+            if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
+                if let data = serviceData {
+                    do {
+                        if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
+                            print("Response Data: \(responseObject)")
+                            
+                            // Check if status is 0 and handle the error
+                            if let status = responseObject["status"] as? Int, status == 0 {
+                                let errorMessage = responseObject["message"] as? String ?? "Unknown error"
+                                self.presentPaymentErrorVC(errorMessage: errorMessage)
+                            } else {
+                                DispatchQueue.main.async {
+                                    if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "ThreeDSecurePaymentDoneVC") as? ThreeDSecurePaymentDoneVC {
+                                        
+                                        let urlString = responseObject["redirect_url"] as? String ?? responseObject["location_url"] as? String ?? ""
+                                        paymentDoneVC.redirectURL = urlString
+                                        paymentDoneVC.chargeData = responseObject
+                                        paymentDoneVC.easyPayDelegate = self.easyPayDelegate
+                                        // Pass billing and additional info
+                                        // Conditionally pass raw FieldItem array
+                                        paymentDoneVC.visibility = self.visibility
+                                        paymentDoneVC.amount = self.amount
+                                        
+                                        if self.visibility?.billing == true {
+                                            paymentDoneVC.billingInfoData = self.billingInfo
+                                            var billingDict: [String: Any] = [:]
+                                            self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
+                                            paymentDoneVC.billingInfo = billingDict
+                                        }
+                                        
+                                        if self.visibility?.additional == true {
+                                            paymentDoneVC.additionalInfoData = self.additionalInfo
+                                            var additionalDict: [String: Any] = [:]
+                                            self.additionalInfo?.forEach { additionalDict[$0.name] = $0.value }
+                                            paymentDoneVC.additionalInfo = additionalDict
+                                        }
+                                        self.navigationController?.pushViewController(paymentDoneVC, animated: true)
+                                    }
+                                }
+                            }
+                        } else {
+                            self.presentPaymentErrorVC(errorMessage: "Invalid JSON format")
+                        }
+                    } catch let jsonError {
+                        self.presentPaymentErrorVC(errorMessage: "Error parsing JSON: \(jsonError)")
+                    }
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "No data received")
+                }
+            } else {
+                if let data = serviceData,
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let message = responseObj["message"] as? String {
+                    self.presentPaymentErrorVC(errorMessage: message)
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                }
+            }
+        }
+        task.resume()
+    }
+    
+    //MARK: - Credit Card Charge Api from Add new card from saved cards.
+    func paymentIntentAddNewCardApi(customerId: String?) {
+        showLoadingIndicator()
+        
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.charges.path()
+        
+        guard let serviceURL = URL(string: fullURL) else {
+            print("Invalid URL")
+            hideLoadingIndicator()
+            return
+        }
+        
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "POST"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        
+        let token = UserStoreSingleton.shared.clientToken
+        print("Setting clientToken header: \(token ?? "None")")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        
+        let emailPrefix = UserStoreSingleton.shared.verificationEmail?.components(separatedBy: "@").first ?? ""
+        
+        var params: [String: Any] = [
+            "name": nameOnCard ?? "",
+            "email": userEmail ?? "",
+            "card_number": cardNumber?.replacingOccurrences(of: " ", with: "") ?? "",
+            "cardholder_name": nameOnCard ?? "",
+            "exp_month": expiryDate?.components(separatedBy: "/").first ?? "",
+            "exp_year": expiryDate?.components(separatedBy: "/").last ?? "",
+            "cvc": cvv ?? "",
+            "currency": "usd",
+            "payment_method": selectedPaymentMethod ?? "",
+            "save_card": isSavedNewCard ? 1 : 0
+        ]
+        
+        // Add is_default parameter if save_card is 1
+        if isSavedNewCard {
+            params["is_default"] = "1"
+        }
+        
+        // Conditionally add billing info
+        if let visibility = visibility, visibility.billing == true,
+           let billing = billingInfo, !billing.isEmpty {
+            
+            var billingInfoDict: [String: Any] = [:]
+            for item in billing {
+                billingInfoDict[item.name] = item.value
+            }
+            
+            params["address"] = billingInfoDict["address"] as? String ?? ""
+            params["country"] = billingInfoDict["country"] as? String ?? ""
+            params["state"] = billingInfoDict["state"] as? String ?? ""
+            params["city"] = billingInfoDict["city"] as? String ?? ""
+            params["zip"] = billingInfoDict["postal_code"] as? String ?? ""
+        }
+        
+        // Set default description if additional info is not visible
+        if let visibility = visibility, visibility.additional == false {
+            params["description"] = "Hosted payment checkout"
+        }
+        
+        // Add these if recurring is enabled
+        if let req = request, req.is_recurring == true {
+            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                // Only send start_date if type is .custom and field is not empty
+                if let startDateText = startDate, !startDateText.isEmpty {
+                    let inputFormatter = DateFormatter()
+                    inputFormatter.dateFormat = "dd/MM/yyyy"
+                    
+                    let outputFormatter = DateFormatter()
+                    outputFormatter.dateFormat = "MM/dd/yyyy"
+                    
+                    if let date = inputFormatter.date(from: startDateText) {
+                        let apiFormattedDate = outputFormatter.string(from: date)
+                        params["start_date"] = apiFormattedDate
+                    } else {
+                        print("Invalid date format in startDateText")
+                    }
+                }
+            }
+            
+            params["interval"] = chosenPlan?.lowercased()
+        }
+        
+        if let customerId = customerId {
+            params["customer"] = customerId
+            params["customer_id"] = customerId
+        } else {
+            params["username"] = emailPrefix
+            params["email"] = UserStoreSingleton.shared.verificationEmail
+        }
+        
+        print(params)
+        
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+            uRLRequest.httpBody = jsonData
+            if let jsonString = String(data: jsonData, encoding: .utf8) {
+                print("JSON Payload: \(jsonString)")
+            }
+        } catch let error {
+            print("Error creating JSON data: \(error)")
+            hideLoadingIndicator()
+            return
+        }
+        
+        let session = URLSession.shared
+        let task = session.dataTask(with: uRLRequest) { (serviceData, serviceResponse, error) in
+            
+            DispatchQueue.main.async {
+                self.hideLoadingIndicator() // Stop loader when response is received
+            }
+            
+            if let error = error {
+                self.presentPaymentErrorVC(errorMessage: error.localizedDescription)
+                return
+            }
+            
+            guard let httpResponse = serviceResponse as? HTTPURLResponse else {
+                self.presentPaymentErrorVC(errorMessage: "Invalid response")
+                return
+            }
+            
+            if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
+                if let data = serviceData {
+                    do {
+                        if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
+                            print("Response Data: \(responseObject)")
+                            
+                            // Check if status is 0 and handle the error
+                            if let status = responseObject["status"] as? Int, status == 0 {
+                                let errorMessage = responseObject["message"] as? String ?? "Unknown error"
+                                self.presentPaymentErrorVC(errorMessage: errorMessage)
+                            } else {
+                                DispatchQueue.main.async {
+                                    if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
+                                        paymentDoneVC.chargeData = responseObject
+                                        paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
+                                        paymentDoneVC.easyPayDelegate = self.easyPayDelegate
+                                        // Pass billing and additional info
+                                        // Conditionally pass raw FieldItem array
+                                        paymentDoneVC.visibility = self.visibility
+                                        
+                                        if self.visibility?.billing == true {
+                                            paymentDoneVC.billingInfoData = self.billingInfo
+                                            var billingDict: [String: Any] = [:]
+                                            self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
+                                            paymentDoneVC.billingInfo = billingDict
+                                        }
+                                        
+                                        if self.visibility?.additional == true {
+                                            paymentDoneVC.additionalInfoData = self.additionalInfo
+                                            var additionalDict: [String: Any] = [:]
+                                            self.additionalInfo?.forEach { additionalDict[$0.name] = $0.value }
+                                            paymentDoneVC.additionalInfo = additionalDict
+                                        }
+                                        self.navigationController?.pushViewController(paymentDoneVC, animated: true)
+                                    }
+                                }
+                            }
+                        } else {
+                            self.presentPaymentErrorVC(errorMessage: "Invalid JSON format")
+                        }
+                    } catch let jsonError {
+                        self.presentPaymentErrorVC(errorMessage: "Error parsing JSON: \(jsonError)")
+                    }
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "No data received")
+                }
+            } else {
+                if let data = serviceData,
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let message = responseObj["message"] as? String {
+                    self.presentPaymentErrorVC(errorMessage: message)
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                }
+            }
+        }
+        task.resume()
+    }
+    
+    //MARK: - Credit Card Charge Api from Saved cards
+    func paymentIntentFromShowCardApi() {
+        showLoadingIndicator()
+        
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.charges.path()
+        
+        guard let serviceURL = URL(string: fullURL) else {
+            print("Invalid URL")
+            hideLoadingIndicator()
+            return
+        }
+        
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "POST"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        
+        let token = UserStoreSingleton.shared.clientToken
+        print("Setting clientToken header: \(token ?? "None")")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        
+        var params: [String: Any] = [
+            "description": "Hosted payment checkout",
+            "currency": "usd",
+            "payment_method": "card",
+            "save_card": 0,
+            "customer" : selectedCard?.customerId ?? "",
+            "customer_id" : selectedCard?.customerId ?? "",
+            "card_id" : selectedCard?.cardId ?? "",
+            "cvc" : cvvText ?? ""
+        ]
+        
+        // Conditionally add billing info
+        if let visibility = visibility, visibility.billing == true,
+           let billing = billingInfo, !billing.isEmpty {
+            
+            var billingInfoDict: [String: Any] = [:]
+            for item in billing {
+                billingInfoDict[item.name] = item.value
+            }
+            
+            params["address"] = billingInfoDict["address"] as? String ?? ""
+            params["country"] = billingInfoDict["country"] as? String ?? ""
+            params["state"] = billingInfoDict["state"] as? String ?? ""
+            params["city"] = billingInfoDict["city"] as? String ?? ""
+            params["zip"] = billingInfoDict["postal_code"] as? String ?? ""
+        }
+        
+        // Conditionally add additional info
+        if let visibility = visibility, visibility.additional == true,
+           let additional = additionalInfo, !additional.isEmpty {
+            
+            var additionalInfoDict: [String: Any] = [:]
+            for item in additional {
+                additionalInfoDict[item.name] = item.value
+            }
+            
+            params["description"] = additionalInfoDict["description"] as? String ?? ""
+            params["phone_number"] = additionalInfoDict["phone_number"] as? String ?? ""
+            params["name"] = additionalInfoDict["name"] as? String ?? ""
+            params["email"] = additionalInfoDict["email"] as? String ?? ""
+        }
+        
+        // Set default description if additional info is not visible
+        if let visibility = visibility, visibility.additional == false {
+            params["description"] = "Hosted payment checkout"
+        }
+        
+        // Add these if recurring is enabled
+        if let req = request, req.is_recurring == true {
+            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                // Only send start_date if type is .custom and field is not empty
+                if let startDateText = startDate, !startDateText.isEmpty {
+                    let inputFormatter = DateFormatter()
+                    inputFormatter.dateFormat = "dd/MM/yyyy"
+                    
+                    let outputFormatter = DateFormatter()
+                    outputFormatter.dateFormat = "MM/dd/yyyy"
+                    
+                    if let date = inputFormatter.date(from: startDateText) {
+                        let apiFormattedDate = outputFormatter.string(from: date)
+                        params["start_date"] = apiFormattedDate
+                    } else {
+                        print("Invalid date format in startDateText")
+                    }
+                }
+            }
+            
+            params["interval"] = chosenPlan?.lowercased()
+        }
+        
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+            uRLRequest.httpBody = jsonData
+            if let jsonString = String(data: jsonData, encoding: .utf8) {
+                print("JSON Payload: \(jsonString)")
+            }
+        } catch let error {
+            print("Error creating JSON data: \(error)")
+            hideLoadingIndicator()
+            return
+        }
+        
+        let session = URLSession.shared
+        let task = session.dataTask(with: uRLRequest) { (serviceData, serviceResponse, error) in
+            
+            DispatchQueue.main.async {
+                self.hideLoadingIndicator() // Stop loader when response is received
+            }
+            
+            if let error = error {
+                print("Error: \(error.localizedDescription)")
+                return
+            }
+            
+            guard let httpResponse = serviceResponse as? HTTPURLResponse else {
+                print("Invalid response")
+                return
+            }
+            
+            if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
+                if let data = serviceData {
+                    do {
+                        if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
+                            print("Response Data: \(responseObject)")
+                            
+                            // Check if status is 0 and handle the error
+                            if let status = responseObject["status"] as? Int, status == 0 {
+                                let errorMessage = responseObject["message"] as? String ?? "Unknown error"
+                                self.presentPaymentErrorVC(errorMessage: errorMessage)
+                            } else {
+                                DispatchQueue.main.async {
+                                    if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
+                                        paymentDoneVC.chargeData = responseObject
+                                        paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
+                                        paymentDoneVC.easyPayDelegate = self.easyPayDelegate
+                                        // Pass billing and additional info
+                                        // Conditionally pass raw FieldItem array
+                                        paymentDoneVC.visibility = self.visibility
+                                        
+                                        if self.visibility?.billing == true {
+                                            paymentDoneVC.billingInfoData = self.billingInfo
+                                            var billingDict: [String: Any] = [:]
+                                            self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
+                                            paymentDoneVC.billingInfo = billingDict
+                                        }
+                                        
+                                        if self.visibility?.additional == true {
+                                            paymentDoneVC.additionalInfoData = self.additionalInfo
+                                            var additionalDict: [String: Any] = [:]
+                                            self.additionalInfo?.forEach { additionalDict[$0.name] = $0.value }
+                                            paymentDoneVC.additionalInfo = additionalDict
+                                        }
+                                        self.navigationController?.pushViewController(paymentDoneVC, animated: true)
+                                    }
+                                }
+                            }
+                        } else {
+                            self.presentPaymentErrorVC(errorMessage: "Invalid JSON format")
+                        }
+                    } catch let jsonError {
+                        self.presentPaymentErrorVC(errorMessage: "Error parsing JSON: \(jsonError)")
+                    }
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "No data received")
+                }
+            } else {
+                if let data = serviceData,
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let message = responseObj["message"] as? String {
+                    self.presentPaymentErrorVC(errorMessage: message)
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                }
+            }
+        }
+        task.resume()
+    }
+    
+    //MARK: - Banking Account Charge Api from Regular saved bank account
+    func accountChargeSavedBankAccountApi() {
+        showLoadingIndicator()
+        
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()
+        
+        guard let serviceURL = URL(string: fullURL) else {
+            print("Invalid URL")
+            hideLoadingIndicator()
+            return
+        }
+        
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "POST"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        
+        let token = UserStoreSingleton.shared.clientToken
+        print("Setting clientToken header: \(token ?? "None")")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        
+        var params: [String: Any] = [
+            "name": UserStoreSingleton.shared.merchantName ?? "",
+            "account_id": accountID ?? "",
+            "payment_method": "ach",
+            "customer": customerID ?? "",
+            "currency": "usd",
+        ]
+        
+        // Conditionally add billing info
+        if let visibility = visibility, visibility.billing == true,
+           let billing = billingInfo, !billing.isEmpty {
+            
+            var billingInfoDict: [String: Any] = [:]
+            for item in billing {
+                billingInfoDict[item.name] = item.value
+            }
+            
+            params["address"] = billingInfoDict["address"] as? String ?? ""
+            params["country"] = billingInfoDict["country"] as? String ?? ""
+            params["state"] = billingInfoDict["state"] as? String ?? ""
+            params["city"] = billingInfoDict["city"] as? String ?? ""
+            params["zip"] = billingInfoDict["postal_code"] as? String ?? ""
+        }
+        
+        // Set default description if additional info is not visible
+        if let visibility = visibility, visibility.additional == false {
+            params["description"] = "Hosted payment checkout"
+        }
+        
+        // Add these if recurring is enabled
+        if let req = request, req.is_recurring == true {
+            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                // Only send start_date if type is .custom and field is not empty
+                if let startDateText = startDate, !startDateText.isEmpty {
+                    let inputFormatter = DateFormatter()
+                    inputFormatter.dateFormat = "dd/MM/yyyy"
+                    
+                    let outputFormatter = DateFormatter()
+                    outputFormatter.dateFormat = "MM/dd/yyyy"
+                    
+                    if let date = inputFormatter.date(from: startDateText) {
+                        let apiFormattedDate = outputFormatter.string(from: date)
+                        params["start_date"] = apiFormattedDate
+                    } else {
+                        print("Invalid date format in startDateText")
+                    }
+                }
+            }
+            
+            params["interval"] = chosenPlan?.lowercased()
+        }
+        
+        print(params)
+        
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+            uRLRequest.httpBody = jsonData
+            if let jsonString = String(data: jsonData, encoding: .utf8) {
+                print("JSON Payload: \(jsonString)")
+            }
+        } catch let error {
+            print("Error creating JSON data: \(error)")
+            hideLoadingIndicator()
+            return
+        }
+        
+        let session = URLSession.shared
+        let task = session.dataTask(with: uRLRequest) { (serviceData, serviceResponse, error) in
+            
+            DispatchQueue.main.async {
+                self.hideLoadingIndicator() // Stop loader when response is received
+            }
+            
+            if let error = error {
+                print("Error: \(error.localizedDescription)")
+                return
+            }
+            
+            guard let httpResponse = serviceResponse as? HTTPURLResponse else {
+                print("Invalid response")
+                return
+            }
+            
+            if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
+                if let data = serviceData {
+                    do {
+                        if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
+                            print("Response Data: \(responseObject)")
+                            
+                            // Check if status is 0 and handle the error
+                            if let status = responseObject["status"] as? Int, status == 0 {
+                                let errorMessage = responseObject["message"] as? String ?? "Unknown error"
+                                self.presentPaymentErrorVC(errorMessage: errorMessage)
+                            } else {
+                                DispatchQueue.main.async {
+                                    if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
+                                        paymentDoneVC.chargeData = responseObject
+                                        // Pass the selected payment method
+                                        paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
+                                        paymentDoneVC.easyPayDelegate = self.easyPayDelegate // Pass the delegate
+                                        // Pass billing and additional info
+                                        // Conditionally pass raw FieldItem array
+                                        paymentDoneVC.visibility = self.visibility
+                                        
+                                        if self.visibility?.billing == true {
+                                            paymentDoneVC.billingInfoData = self.billingInfo
+                                            var billingDict: [String: Any] = [:]
+                                            self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
+                                            paymentDoneVC.billingInfo = billingDict
+                                        }
+                                        
+                                        self.navigationController?.pushViewController(paymentDoneVC, animated: true)
+                                    }
+                                }
+                            }
+                        } else {
+                            self.presentPaymentErrorVC(errorMessage: "Invalid JSON format")
+                        }
+                    } catch let jsonError {
+                        self.presentPaymentErrorVC(errorMessage: "Error parsing JSON: \(jsonError)")
+                    }
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "No data received")
+                }
+            } else {
+                if let data = serviceData,
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let message = responseObj["message"] as? String {
+                    self.presentPaymentErrorVC(errorMessage: message)
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                }
+            }
+        }
+        task.resume()
+    }
+    
+    //MARK: - Banking Account Charge Api
+    func accountChargeApi() {
+        showLoadingIndicator()
+        
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()
+        
+        guard let serviceURL = URL(string: fullURL) else {
+            print("Invalid URL")
+            hideLoadingIndicator()
+            return
+        }
+        
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "POST"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        
+        let token = UserStoreSingleton.shared.clientToken
+        print("Setting clientToken header: \(token ?? "None")")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        
+        var params: [String: Any] = [
+            "name": accountName ?? "",
+            "email": userEmail ?? "",
+            "currency": "usd",
+            "account_type": accountType?.lowercased() ?? "",
+            "routing_number": routingNumber ?? "",
+            "account_number": accountNumber ?? "",
+            "payment_mode": "auth_and_capture",
+            "payment_intent": UserStoreSingleton.shared.paymentIntent ?? "",
+            "levelIndicator": 1,
+        ]
+        
+        // Conditionally add billing info
+        if let visibility = visibility, visibility.billing == true,
+           let billing = billingInfo, !billing.isEmpty {
+            
+            var billingInfoDict: [String: Any] = [:]
+            for item in billing {
+                billingInfoDict[item.name] = item.value
+            }
+            
+            params["address"] = billingInfoDict["address"] as? String ?? ""
+            params["country"] = billingInfoDict["country"] as? String ?? ""
+            params["state"] = billingInfoDict["state"] as? String ?? ""
+            params["city"] = billingInfoDict["city"] as? String ?? ""
+            params["zip"] = billingInfoDict["postal_code"] as? String ?? ""
+        }
+        
+        // Set default description if additional info is not visible
+        if let visibility = visibility, visibility.additional == false {
+            params["description"] = "Hosted payment checkout"
+        }
+        
+        // Add these if recurring is enabled
+        if let req = request, req.is_recurring == true {
+            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                // Only send start_date if type is .custom and field is not empty
+                if let startDateText = startDate, !startDateText.isEmpty {
+                    let inputFormatter = DateFormatter()
+                    inputFormatter.dateFormat = "dd/MM/yyyy"
+                    
+                    let outputFormatter = DateFormatter()
+                    outputFormatter.dateFormat = "MM/dd/yyyy"
+                    
+                    if let date = inputFormatter.date(from: startDateText) {
+                        let apiFormattedDate = outputFormatter.string(from: date)
+                        params["start_date"] = apiFormattedDate
+                    } else {
+                        print("Invalid date format in startDateText")
+                    }
+                }
+            }
+            
+            params["interval"] = chosenPlan?.lowercased()
+        }
+        
+        print(params)
+        
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+            uRLRequest.httpBody = jsonData
+            if let jsonString = String(data: jsonData, encoding: .utf8) {
+                print("JSON Payload: \(jsonString)")
+            }
+        } catch let error {
+            print("Error creating JSON data: \(error)")
+            hideLoadingIndicator()
+            return
+        }
+        
+        let session = URLSession.shared
+        let task = session.dataTask(with: uRLRequest) { (serviceData, serviceResponse, error) in
+            
+            DispatchQueue.main.async {
+                self.hideLoadingIndicator() // Stop loader when response is received
+            }
+            
+            if let error = error {
+                print("Error: \(error.localizedDescription)")
+                return
+            }
+            
+            guard let httpResponse = serviceResponse as? HTTPURLResponse else {
+                print("Invalid response")
+                return
+            }
+            
+            if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
+                if let data = serviceData {
+                    do {
+                        if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
+                            print("Response Data: \(responseObject)")
+                            
+                            // Check if status is 0 and handle the error
+                            if let status = responseObject["status"] as? Int, status == 0 {
+                                let errorMessage = responseObject["message"] as? String ?? "Unknown error"
+                                self.presentPaymentErrorVC(errorMessage: errorMessage)
+                            } else {
+                                DispatchQueue.main.async {
+                                    if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
+                                        paymentDoneVC.chargeData = responseObject
+                                        // Pass the selected payment method
+                                        paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
+                                        paymentDoneVC.easyPayDelegate = self.easyPayDelegate // Pass the delegate
+                                        // Pass billing and additional info
+                                        // Conditionally pass raw FieldItem array
+                                        paymentDoneVC.visibility = self.visibility
+                                        
+                                        if self.visibility?.billing == true {
+                                            paymentDoneVC.billingInfoData = self.billingInfo
+                                            var billingDict: [String: Any] = [:]
+                                            self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
+                                            paymentDoneVC.billingInfo = billingDict
+                                        }
+                                        self.navigationController?.pushViewController(paymentDoneVC, animated: true)
+                                    }
+                                }
+                            }
+                        } else {
+                            self.presentPaymentErrorVC(errorMessage: "Invalid JSON format")
+                        }
+                    } catch let jsonError {
+                        self.presentPaymentErrorVC(errorMessage: "Error parsing JSON: \(jsonError)")
+                    }
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "No data received")
+                }
+            } else {
+                if let data = serviceData,
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let message = responseObj["message"] as? String {
+                    self.presentPaymentErrorVC(errorMessage: message)
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                }
+            }
+        }
+        task.resume()
+    }
+    
+    //MARK: - Account Charge Api if user saved the account.
+    func accountChargeApi(customerId: String?) {
+        showLoadingIndicator()
+        
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()
+        
+        guard let serviceURL = URL(string: fullURL) else {
+            print("Invalid URL")
+            hideLoadingIndicator()
+            return
+        }
+        
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "POST"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        
+        let token = UserStoreSingleton.shared.clientToken
+        print("Setting clientToken header: \(token ?? "None")")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        
+        let emailPrefix = UserStoreSingleton.shared.verificationEmail?.components(separatedBy: "@").first ?? ""
+        
+        var params: [String: Any] = [
+            "name": accountName ?? "",
+            "email": UserStoreSingleton.shared.merchantEmail ?? "",
+            "currency": "usd",
+            "account_type": accountType?.lowercased() ?? "",
+            "routing_number": routingNumber ?? "",
+            "account_number": accountNumber ?? "",
+            "payment_mode": "auth_and_capture",
+            "payment_intent": UserStoreSingleton.shared.paymentIntent ?? "",
+            "levelIndicator": 1,
+            "save_account": 1,
+            "payment_method": "ach"
+        ]
+        
+        if let customerId = customerId {
+            params["customer"] = customerId
+        } else {
+            params["username"] = emailPrefix
+        }
+        
+        // Conditionally add billing info
+        if let visibility = visibility, visibility.billing == true,
+           let billing = billingInfo, !billing.isEmpty {
+            
+            var billingInfoDict: [String: Any] = [:]
+            for item in billing {
+                billingInfoDict[item.name] = item.value
+            }
+            
+            params["address"] = billingInfoDict["address"] as? String ?? ""
+            params["country"] = billingInfoDict["country"] as? String ?? ""
+            params["state"] = billingInfoDict["state"] as? String ?? ""
+            params["city"] = billingInfoDict["city"] as? String ?? ""
+            params["zip"] = billingInfoDict["postal_code"] as? String ?? ""
+        }
+        
+        // Set default description if additional info is not visible
+        if let visibility = visibility, visibility.additional == false {
+            params["description"] = "Hosted payment checkout"
+        }
+        
+        // Add these if recurring is enabled
+        if let req = request, req.is_recurring == true {
+            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                // Only send start_date if type is .custom and field is not empty
+                if let startDateText = startDate, !startDateText.isEmpty {
+                    let inputFormatter = DateFormatter()
+                    inputFormatter.dateFormat = "dd/MM/yyyy"
+                    
+                    let outputFormatter = DateFormatter()
+                    outputFormatter.dateFormat = "MM/dd/yyyy"
+                    
+                    if let date = inputFormatter.date(from: startDateText) {
+                        let apiFormattedDate = outputFormatter.string(from: date)
+                        params["start_date"] = apiFormattedDate
+                    } else {
+                        print("Invalid date format in startDateText")
+                    }
+                }
+            }
+            
+            params["interval"] = chosenPlan?.lowercased()
+        }
+        
+        print(params)
+        
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+            uRLRequest.httpBody = jsonData
+            if let jsonString = String(data: jsonData, encoding: .utf8) {
+                print("JSON Payload: \(jsonString)")
+            }
+        } catch let error {
+            print("Error creating JSON data: \(error)")
+            hideLoadingIndicator()
+            return
+        }
+        
+        let session = URLSession.shared
+        let task = session.dataTask(with: uRLRequest) { (serviceData, serviceResponse, error) in
+            
+            DispatchQueue.main.async {
+                self.hideLoadingIndicator() // Stop loader when response is received
+            }
+            
+            if let error = error {
+                self.presentPaymentErrorVC(errorMessage: error.localizedDescription)
+                return
+            }
+            
+            guard let httpResponse = serviceResponse as? HTTPURLResponse else {
+                self.presentPaymentErrorVC(errorMessage: "Invalid response")
+                return
+            }
+            
+            if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
+                if let data = serviceData {
+                    do {
+                        if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
+                            print("Response Data: \(responseObject)")
+                            
+                            // Check if status is 0 and handle the error
+                            if let status = responseObject["status"] as? Int, status == 0 {
+                                let errorMessage = responseObject["message"] as? String ?? "Unknown error"
+                                self.presentPaymentErrorVC(errorMessage: errorMessage)
+                            } else {
+                                DispatchQueue.main.async {
+                                    if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
+                                        paymentDoneVC.chargeData = responseObject
+                                        paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
+                                        paymentDoneVC.easyPayDelegate = self.easyPayDelegate
+                                        // Pass billing and additional info
+                                        // Conditionally pass raw FieldItem array
+                                        paymentDoneVC.visibility = self.visibility
+                                        
+                                        if self.visibility?.billing == true {
+                                            paymentDoneVC.billingInfoData = self.billingInfo
+                                            var billingDict: [String: Any] = [:]
+                                            self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
+                                            paymentDoneVC.billingInfo = billingDict
+                                        }
+                                        self.navigationController?.pushViewController(paymentDoneVC, animated: true)
+                                    }
+                                }
+                            }
+                        } else {
+                            self.presentPaymentErrorVC(errorMessage: "Invalid JSON format")
+                        }
+                    } catch let jsonError {
+                        self.presentPaymentErrorVC(errorMessage: "Error parsing JSON: \(jsonError)")
+                    }
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "No data received")
+                }
+            } else {
+                if let data = serviceData,
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let message = responseObj["message"] as? String {
+                    self.presentPaymentErrorVC(errorMessage: message)
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                }
+            }
+        }
+        task.resume()
+    }
+    
+    //MARK: - GrailPay Account Charge Api if user not saved account but billing info available
+    func grailPayAccountChargeApi() {
+        showLoadingIndicator()
+        
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()
+        
+        guard let serviceURL = URL(string: fullURL) else {
+            print("Invalid URL")
+            hideLoadingIndicator()
+            return
+        }
+        
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "POST"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        
+        let token = UserStoreSingleton.shared.clientToken
+        print("Setting clientToken header: \(token ?? "None")")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        
+        if let apiKey = EnvironmentConfig.apiKey {
+            uRLRequest.addValue(apiKey, forHTTPHeaderField: "X-Api-Key")
+        }
+        if let apiSecret = EnvironmentConfig.apiSecret {
+            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "X-Api-Secret")
+        }
+        
+        var params: [String: Any] = [
+            "account_id": self.grailPayAccountID ?? "",
+            "account_type": self.selectedGrailPayAccountType ?? "",
+            "name": self.selectedGrailPayAccountName ?? "",
+            "description": "payment checkout",
+            "email": UserStoreSingleton.shared.merchantEmail ?? ""
+        ]
+        
+        // Conditionally add billing info
+        if let visibility = visibility, visibility.billing == true,
+           let billing = billingInfo, !billing.isEmpty {
+            
+            var billingInfoDict: [String: Any] = [:]
+            for item in billing {
+                billingInfoDict[item.name] = item.value
+            }
+            
+            params["address"] = billingInfoDict["address"] as? String ?? ""
+            params["country"] = billingInfoDict["country"] as? String ?? ""
+            params["state"] = billingInfoDict["state"] as? String ?? ""
+            params["city"] = billingInfoDict["city"] as? String ?? ""
+            params["zip"] = billingInfoDict["postal_code"] as? String ?? ""
+        }
+        
+        // Set default description if additional info is not visible
+        if let visibility = visibility, visibility.additional == false {
+            params["description"] = "Hosted payment checkout"
+        }
+        
+        // Add these if recurring is enabled
+        if let req = request, req.is_recurring == true {
+            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                // Only send start_date if type is .custom and field is not empty
+                if let startDateText = startDate, !startDateText.isEmpty {
+                    let inputFormatter = DateFormatter()
+                    inputFormatter.dateFormat = "dd/MM/yyyy"
+                    
+                    let outputFormatter = DateFormatter()
+                    outputFormatter.dateFormat = "MM/dd/yyyy"
+                    
+                    if let date = inputFormatter.date(from: startDateText) {
+                        let apiFormattedDate = outputFormatter.string(from: date)
+                        params["start_date"] = apiFormattedDate
+                    } else {
+                        print("Invalid date format in startDateText")
+                    }
+                }
+            }
+            
+            params["interval"] = chosenPlan?.lowercased()
+        }
+        
+        print(params)
+        
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+            uRLRequest.httpBody = jsonData
+            if let jsonString = String(data: jsonData, encoding: .utf8) {
+                print("JSON Payload: \(jsonString)")
+            }
+        } catch let error {
+            print("Error creating JSON data: \(error)")
+            hideLoadingIndicator()
+            return
+        }
+        
+        let session = URLSession.shared
+        let task = session.dataTask(with: uRLRequest) { (serviceData, serviceResponse, error) in
+            
+            DispatchQueue.main.async {
+                self.hideLoadingIndicator() // Stop loader when response is received
+            }
+            
+            if let error = error {
+                self.presentPaymentErrorVC(errorMessage: error.localizedDescription)
+                return
+            }
+            
+            guard let httpResponse = serviceResponse as? HTTPURLResponse else {
+                self.presentPaymentErrorVC(errorMessage: "Invalid response")
+                return
+            }
+            
+            if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
+                if let data = serviceData {
+                    do {
+                        if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
+                            print("Response Data: \(responseObject)")
+                            
+                            // Check if status is 0 and handle the error
+                            if let status = responseObject["status"] as? Int, status == 0 {
+                                let errorMessage = responseObject["message"] as? String ?? "Unknown error"
+                                self.presentPaymentErrorVC(errorMessage: errorMessage)
+                            } else {
+                                DispatchQueue.main.async {
+                                    if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
+                                        paymentDoneVC.chargeData = responseObject
+                                        paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
+                                        paymentDoneVC.easyPayDelegate = self.easyPayDelegate
+                                        // Pass billing and additional info
+                                        // Conditionally pass raw FieldItem array
+                                        paymentDoneVC.visibility = self.visibility
+                                        
+                                        if self.visibility?.billing == true {
+                                            paymentDoneVC.billingInfoData = self.billingInfo
+                                            var billingDict: [String: Any] = [:]
+                                            self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
+                                            paymentDoneVC.billingInfo = billingDict
+                                        }
+                                        self.navigationController?.pushViewController(paymentDoneVC, animated: true)
+                                    }
+                                }
+                            }
+                        } else {
+                            self.presentPaymentErrorVC(errorMessage: "Invalid JSON format")
+                        }
+                    } catch let jsonError {
+                        self.presentPaymentErrorVC(errorMessage: "Error parsing JSON: \(jsonError)")
+                    }
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "No data received")
+                }
+            } else {
+                if let data = serviceData,
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let message = responseObj["message"] as? String {
+                    self.presentPaymentErrorVC(errorMessage: message)
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                }
+            }
+        }
+        task.resume()
+    }
+    
+}
+
+//MARK: - Table View
+@available(iOS 16.0, *)
+extension BillingInfoVC: UITableViewDelegate, UITableViewDataSource {
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if tableView == tblViewCountryList {
+            return countryList.count
+        }
+        else if tableView == tblViewStateList {
+            return stateList.count
+        }
+        else if tableView == tblViewCityList {
+            return cityList.count
+        }
+        else {
+            return 0
+        }
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        if tableView == tblViewCountryList {
+            let cell = tableView.dequeueReusableCell(withIdentifier: "CountryListTVC") as! CountryListTVC
+            let country = countryList[indexPath.row]
+            cell.lblCountryName.text = country["name"] as? String
+            return cell
+        } else if tableView == tblViewStateList {
+            let cell = tableView.dequeueReusableCell(withIdentifier: "StateListTVC") as! StateListTVC
+            let state = stateList[indexPath.row]
+            cell.lblStateName.text = state["name"] as? String
+            return cell
+        } else if tableView == tblViewCityList {
+            let cell = tableView.dequeueReusableCell(withIdentifier: "CityListTVC") as! CityListTVC
+            let city = cityList[indexPath.row]
+            cell.lblCityName.text = city["city_name"] as? String
+            return cell
+        } else {
+            return UITableViewCell()
+        }
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        if tableView == tblViewCountryList {
+            let selectedCountry = countryList[indexPath.row]["name"] as? String
+            txtFieldCountry.text = selectedCountry
+            viewCountryList.isHidden = true
+            
+            // Fetch states for the selected country
+            if let country = selectedCountry {
+                getStateListApi(for: country)
+            }
+        } else if tableView == tblViewStateList {
+            let selectedState = stateList[indexPath.row]["name"] as? String
+            txtFieldState.text = selectedState
+            viewStateList.isHidden = true
+            
+            // Fetch cities for the selected state and country
+            if let state = selectedState, let country = txtFieldCountry.text {
+                getCityListListApi(for: country, state: state)
+            }
+        } else if tableView == tblViewCityList {
+            let selectedCity = cityList[indexPath.row]["city_name"] as? String
+            txtFieldCity.text = selectedCity
+            viewCityList.isHidden = true
+            
+            // Fetch the city list again based on selected state & country
+            if let state = txtFieldState.text, let country = txtFieldCountry.text {
+                getCityListListApi(for: country, state: state)
+            }
+        }
+        
+        updateBillingInfoData()
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return 50
+    }
+    
+}
+
+@available(iOS 16.0, *)
+extension BillingInfoVC: UITextFieldDelegate {
+    func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+        textField.resignFirstResponder() // Dismiss the keyboard
+        return true
+    }
+    
+    // Update billingInfoData when user finishes editing a field
+    func textFieldDidEndEditing(_ textField: UITextField) {
         switch textField {
         case txtFieldAddress:
-            billingInfoData?["address"] = textField.text
+            setFieldValue("address", to: textField.text)
         case txtFieldCountry:
-            billingInfoData?["country"] = textField.text
+            setFieldValue("country", to: textField.text)
         case txtFieldState:
-            billingInfoData?["state"] = textField.text
+            setFieldValue("state", to: textField.text)
         case txtFieldCity:
-            billingInfoData?["city"] = textField.text
+            setFieldValue("city", to: textField.text)
         case txtFieldPostalCode:
-            billingInfoData?["postal_code"] = textField.text
+            setFieldValue("postal_code", to: textField.text)
         default:
             break
         }
+        
+        billingInfo = fieldSection?.billing
     }
+    
 }