@jimrising/easymerchantsdk-react-native 1.3.9 → 1.4.2

package/ios/Pods/ViewControllers/AdditionalInfoVC.swift

@@ -10,7 +10,7 @@ import UIKit
 @available(iOS 16.0, *)
 class AdditionalInfoVC: BaseVC {
     
-    @IBOutlet weak var viewAdditionalInfo: UIView!
+//    @IBOutlet weak var viewAdditionalInfo: UIView!
     @IBOutlet weak var txtFieldName: UITextField!
     @IBOutlet weak var txtFieldEmail: UITextField!
     @IBOutlet weak var txtFieldPhoneNumber: UITextField!
@@ -34,7 +34,7 @@ class AdditionalInfoVC: BaseVC {
     var expiryDate: String?
     var cvv: String?
     var nameOnCard: String?
-    var billingInfoData: [String: Any]?
+    var userEmail: String?
     
     var selectedPaymentMethod: String?
     
@@ -52,6 +52,7 @@ class AdditionalInfoVC: BaseVC {
     var amount: Int?
     var cvvText: String?
     var isFrom = String()
+    var isFromm = String()
     
     var isSavedNewCard: Bool = false
     
@@ -66,6 +67,18 @@ class AdditionalInfoVC: BaseVC {
     var chosenPlan: String?
     var startDate: String?
     
+    //GrailPay Params
+    var grailPayAccountID: String?
+    var selectedGrailPayAccountType: String?
+    var selectedGrailPayAccountName: String?
+    
+    var billingInfoData: Data?
+    var fieldSection: FieldSection?
+    
+    var additionalInfo: [FieldItem]?
+    var billingInfo: [FieldItem]?
+    var visibility: FieldsVisibility?
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         
@@ -93,30 +106,65 @@ class AdditionalInfoVC: BaseVC {
         tapGesture.cancelsTouchesInView = false
         self.view.addGestureRecognizer(tapGesture)
         
-        if let billingInfoData = billingInfoData {
-            print("Billing Info Data: \(billingInfoData)")
-            
-            // Extract the additional_info dictionary
-            if let additionalInfo = billingInfoData["additional_info"] as? [String: Any] {
-                // Set the name field
-                if let name = additionalInfo["name"] as? String {
-                    txtFieldName.text = name
-                }
-                
-                if let email = additionalInfo["email"] as? String {
-                    txtFieldEmail.text = email
-                }
-                
-                if let phoneNumber = additionalInfo["phone_number"] as? String {
-                    txtFieldPhoneNumber.text = phoneNumber
+        // Decode fieldSection if it's not already set
+        if fieldSection == nil, let billingInfoData = billingInfoData {
+            do {
+                let decodedFieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
+                self.fieldSection = decodedFieldSection
+                self.additionalInfo = decodedFieldSection.additional
+                self.billingInfo = decodedFieldSection.billing
+                self.visibility = decodedFieldSection.visibility
+                print("fieldSection decoded successfully")
+            } catch {
+                print("Failed to decode billing info data: \(error)")
+            }
+        }
+        
+        if let additionalInfo = additionalInfo {
+            for item in additionalInfo {
+                switch item.name {
+                case "name":
+                    txtFieldName.text = item.value
+                case "email":
+                    txtFieldEmail.text = item.value
+                case "phone_number":
+                    txtFieldPhoneNumber.text = item.value
+                case "description":
+                    txtFieldDescription.text = item.value
+                default:
+                    break
                 }
+            }
+            configureFieldVisibility()
+        } else if let billingInfoData = billingInfoData {
+            do {
+                let decodedFieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
+                self.fieldSection = decodedFieldSection
                 
-                if let description = additionalInfo["description"] as? String {
-                    txtFieldDescription.text = description
+                for item in decodedFieldSection.additional {
+                    switch item.name {
+                    case "name":
+                        txtFieldName.text = item.value
+                    case "email":
+                        txtFieldEmail.text = item.value
+                    case "phone_number":
+                        txtFieldPhoneNumber.text = item.value
+                    case "description":
+                        txtFieldDescription.text = item.value
+                    default:
+                        break
+                    }
                 }
+                configureFieldVisibility()
+            } catch {
+                print("Failed to decode billing info data: \(error)")
             }
         }
         
+        if let flag = String.flag(for: "US") {
+            lblCountryCode.text = "\(flag) +1"
+        }
+        
         //Show Default USA code in starting.
         let usaCountry = Country()
         usaCountry.name = "United States"
@@ -124,12 +172,11 @@ class AdditionalInfoVC: BaseVC {
         usaCountry.extensionCode = "1"
         usaCountry.flag = String.flag(for: "US")
         lblCountryCode.text = "\(usaCountry.flag ?? "") +\(usaCountry.extensionCode ?? "")"
-        
-        print(cvvText ?? "")
     }
     
     override func viewWillAppear(_ animated: Bool) {
         uiFinishingTouchElements()
+        configureFieldVisibility()
     }
     
     func uiFinishingTouchElements() {
@@ -154,10 +201,10 @@ class AdditionalInfoVC: BaseVC {
         if let secondaryFontColor = UserStoreSingleton.shared.secondary_font_col,
            let placeholderColor = UIColor(hex: secondaryFontColor) {
             lblEasyMerchant.textColor = placeholderColor
-            viewAdditionalInfo.layer.borderColor = placeholderColor.cgColor
+//            viewAdditionalInfo.layer.borderColor = placeholderColor.cgColor
         }
         else {
-            viewAdditionalInfo.layer.borderColor = UIColor.systemGray.cgColor
+//            viewAdditionalInfo.layer.borderColor = UIColor.systemGray.cgColor
         }
         
         if let borderRadiusString = UserStoreSingleton.shared.border_radious,
@@ -165,17 +212,17 @@ class AdditionalInfoVC: BaseVC {
             btnPayNow.layer.cornerRadius = CGFloat(borderRadius) // Set corner radius
             btnPrevious.layer.cornerRadius = CGFloat(borderRadius)
             btnPrevious.layer.borderWidth = 1
-            viewAdditionalInfo.layer.cornerRadius = CGFloat(borderRadius)
-            viewAdditionalInfo.layer.borderWidth = 1
+//            viewAdditionalInfo.layer.cornerRadius = CGFloat(borderRadius)
+//            viewAdditionalInfo.layer.borderWidth = 1
         } else {
             btnPayNow.layer.cornerRadius = 8 // Default value
             btnPrevious.layer.cornerRadius = 8
-            viewAdditionalInfo.layer.borderWidth = 1
-            viewAdditionalInfo.layer.cornerRadius = 8
+//            viewAdditionalInfo.layer.borderWidth = 1
+//            viewAdditionalInfo.layer.cornerRadius = 8
         }
         btnPayNow.layer.masksToBounds = true // Ensure the corners are clipped properly
         btnPrevious.layer.masksToBounds = true
-        viewAdditionalInfo.layer.masksToBounds = true
+//        viewAdditionalInfo.layer.masksToBounds = true
         
         if let primaryFontColor = UserStoreSingleton.shared.primary_font_col,
            let uiColor = UIColor(hex: primaryFontColor) {
@@ -192,22 +239,36 @@ class AdditionalInfoVC: BaseVC {
             btnPrevious.titleLabel?.font = UIFont.systemFont(ofSize: fontSize)
         }
         
-        configureFieldVisibility()
+    }
+    
+    private func getFieldValue(for name: String) -> String? {
+        return fieldSection?.additional.first(where: { $0.name == name })?.value
+    }
+    
+    private func setFieldValue(_ name: String, to value: String?) {
+        guard let index = fieldSection?.additional.firstIndex(where: { $0.name == name }) else { return }
+        fieldSection?.additional[index].value = value ?? ""
     }
     
     private func configureFieldVisibility() {
-        if let billingInfoData = billingInfoData,
-           let additionalInfo = billingInfoData["additional_info"] as? [String: Any] {
-            
-            let name = additionalInfo["name"] as? String
-            let email = additionalInfo["email"] as? String
-            let phoneNumber = additionalInfo["phone_number"] as? String
-            let description = additionalInfo["description"] as? String
-            
-            lblStarNameField.isHidden = name == nil || name?.isEmpty == true
-            lblStarEmailField.isHidden = email == nil || email?.isEmpty == true
-            lblStarPhoneField.isHidden = phoneNumber == nil || phoneNumber?.isEmpty == true
-            lblStarDescriptionField.isHidden = description == nil || description?.isEmpty == true
+        guard let additionalFields = fieldSection?.additional else {
+            print("No additional fields found")
+            return
+        }
+        
+        func isFieldRequired(_ name: String) -> Bool {
+            let required = additionalFields.first(where: { $0.name == name })?.required == true
+            print("Field \(name) required: \(required)")
+            return required
+        }
+        
+        DispatchQueue.main.async {
+            self.lblStarNameField.isHidden = !isFieldRequired("name")
+            self.lblStarEmailField.isHidden = !isFieldRequired("email_address")
+            self.lblStarPhoneField.isHidden = !isFieldRequired("phone_number")
+            self.lblStarDescriptionField.isHidden = !isFieldRequired("description")
+            print("Star visibility set")
+            self.view.layoutIfNeeded()
         }
     }
     
@@ -226,103 +287,129 @@ class AdditionalInfoVC: BaseVC {
         navigationController?.popViewController(animated: true)
     }
     
-    @IBAction func actionBtnPayNow(_ sender: UIButton) {
-        if !lblStarNameField.isHidden &&
-            txtFieldName.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
-            showAlert(title: "Missing Information", message: "Please enter your name.")
-            return
-        }
-        else if !lblStarEmailField.isHidden &&
-                    txtFieldEmail.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
-            showAlert(title: "Missing Information", message: "Please enter your email address.")
-            return
+    func updateAdditionalInfoData() {
+        setAdditionalFieldValue("name", to: txtFieldName.text)
+        setAdditionalFieldValue("email", to: txtFieldEmail.text)
+        setAdditionalFieldValue("phone_number", to: txtFieldPhoneNumber.text)
+        setAdditionalFieldValue("description", to: txtFieldDescription.text)
+        additionalInfo = fieldSection?.additional
+    }
+    
+    // Helper method
+    func setAdditionalFieldValue(_ name: String, to value: String?) {
+        if let index = fieldSection?.additional.firstIndex(where: { $0.name == name }) {
+            fieldSection?.additional[index].value = value ?? ""
         }
-        else if !lblStarPhoneField.isHidden &&
-                    txtFieldPhoneNumber.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
+    }
+    
+    @IBAction func actionBtnPayNow(_ sender: UIButton) {
+        // MARK: - Validation
+        if !lblStarPhoneField.isHidden &&
+            txtFieldPhoneNumber.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
             showAlert(title: "Missing Information", message: "Please enter your phone number.")
             return
-        }
-        else if !lblStarDescriptionField.isHidden &&
+        } else if !lblStarDescriptionField.isHidden &&
                     txtFieldDescription.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
             showAlert(title: "Missing Information", message: "Please enter description text.")
             return
         }
-        else {
-            if isSavedNewCard {
-                if isFrom == "AddNewCard" {
-                    if request.enable3DS == true {
-                        threeDSecurePaymentAddNewCardApi(customerId: UserStoreSingleton.shared.customerId)
-                    }
-                    else {
-                        self.paymentIntentAddNewCardApi(customerId: UserStoreSingleton.shared.customerId)
-                    }
+        
+        // MARK: - Update Additional Info
+        updateAdditionalInfoData()
+        
+        // MARK: - Encode Updated fieldSection to billingInfoData
+        if let updatedFieldSection = fieldSection,
+           let updatedBillingData = try? JSONEncoder().encode(updatedFieldSection) {
+            billingInfoData = updatedBillingData
+        } else {
+            print("❌ Failed to encode updated additional info")
+            return
+        }
+        
+        // MARK: - Flow Based on Conditions
+        if isSavedForFuture {
+            if let emailVerificationVC = self.storyboard?.instantiateViewController(withIdentifier: "EmailVerificationVC") as? EmailVerificationVC {
+                // Pass data to EmailVerificationVC
+                emailVerificationVC.billingInfoData = billingInfoData
+                emailVerificationVC.selectedPaymentMethod = selectedPaymentMethod
+                emailVerificationVC.easyPayDelegate = easyPayDelegate
+                emailVerificationVC.request = request
+                emailVerificationVC.chosenPlan = chosenPlan
+                emailVerificationVC.startDate = startDate
+                emailVerificationVC.userEmail = userEmail
+                emailVerificationVC.billingInfo = fieldSection?.billing
+                emailVerificationVC.additionalInfo = fieldSection?.additional
+                emailVerificationVC.visibility = fieldSection?.visibility
+                
+                // Extra fields per payment method
+                if selectedPaymentMethod == "Card" {
+                    emailVerificationVC.cardNumber = cardNumber
+                    emailVerificationVC.expiryDate = expiryDate
+                    emailVerificationVC.cvv = cvv
+                    emailVerificationVC.nameOnCard = nameOnCard
+                } else if selectedPaymentMethod == "Bank" {
+                    emailVerificationVC.accountName = accountName
+                    emailVerificationVC.routingNumber = routingNumber
+                    emailVerificationVC.accountType = accountType
+                    emailVerificationVC.accountNumber = accountNumber
+                } else if selectedPaymentMethod == "GrailPay" {
+                    emailVerificationVC.grailPayAccountID = grailPayAccountID
+                    emailVerificationVC.selectedGrailPayAccountType = selectedGrailPayAccountType
+                    emailVerificationVC.selectedGrailPayAccountName = selectedGrailPayAccountName
+                    emailVerificationVC.isSavedForFuture = true
+                } else if selectedPaymentMethod == "NewGrailPayAccount" {
+                    emailVerificationVC.grailPayAccountID = grailPayAccountID
+                    emailVerificationVC.selectedGrailPayAccountType = selectedGrailPayAccountType
+                    emailVerificationVC.selectedGrailPayAccountName = selectedGrailPayAccountName
+                    emailVerificationVC.isSavedForFuture = true
                 }
+                
+                navigationController?.pushViewController(emailVerificationVC, animated: true)
             }
-            else {
-                if isSavedForFuture {
-                    // Navigate to EmailVerificationVC based on the selected payment method
-                    if selectedPaymentMethod == "Card" {
-                        if let emailVerificationVC = self.storyboard?.instantiateViewController(withIdentifier: "EmailVerificationVC") as? EmailVerificationVC {
-                            // Pass any necessary data to EmailVerificationVC
-                            emailVerificationVC.cardNumber = cardNumber
-                            emailVerificationVC.expiryDate = expiryDate
-                            emailVerificationVC.cvv = cvv
-                            emailVerificationVC.nameOnCard = nameOnCard
-                            emailVerificationVC.billingInfoData = billingInfoData
-                            emailVerificationVC.selectedPaymentMethod = selectedPaymentMethod
-                            emailVerificationVC.easyPayDelegate = self.easyPayDelegate
-                            emailVerificationVC.request = self.request
-                            emailVerificationVC.chosenPlan = self.chosenPlan
-                            emailVerificationVC.startDate = self.startDate
-                            self.navigationController?.pushViewController(emailVerificationVC, animated: true)
-                        }
-                    } else if selectedPaymentMethod == "Bank" {
-                        if let emailVerificationVC = self.storyboard?.instantiateViewController(withIdentifier: "EmailVerificationVC") as? EmailVerificationVC {
-                            // Pass any necessary data to EmailVerificationVC
-                            emailVerificationVC.accountName = accountName
-                            emailVerificationVC.routingNumber = routingNumber
-                            emailVerificationVC.accountType = accountType
-                            emailVerificationVC.accountNumber = accountNumber
-                            emailVerificationVC.billingInfoData = billingInfoData
-                            emailVerificationVC.selectedPaymentMethod = selectedPaymentMethod
-                            emailVerificationVC.easyPayDelegate = self.easyPayDelegate
-                            emailVerificationVC.request = self.request
-                            emailVerificationVC.chosenPlan = self.chosenPlan
-                            emailVerificationVC.startDate = self.startDate
-                            self.navigationController?.pushViewController(emailVerificationVC, animated: true)
-                        }
-                    }
-                } else {
-                    // Proceed with the normal flow
-                    if selectedPaymentMethod == "Card" {
-                        if isFrom == "SavedCards" {
-                            paymentIntentFromShowCardApi()
-                        }
-                        else {
-                            if request.enable3DS == true {
-                                threeDSecurePaymentApi()
-                            }
-                            else {
-                                paymentIntentApi()
-                            }
+        }
+        else {
+            // Direct Payment Flow
+            if selectedPaymentMethod == "Card" {
+                if isFrom == "SavedCards" {
+                    paymentIntentFromShowCardApi()
+                }
+                if isSavedNewCard {
+                    if isFrom == "AddNewCard" {
+                        if request.secureAuthentication == true {
+                            threeDSecurePaymentAddNewCardApi(customerId: UserStoreSingleton.shared.customerId)
+                        } else {
+                            paymentIntentAddNewCardApi(customerId: UserStoreSingleton.shared.customerId)
                         }
                     }
-                    else if selectedPaymentMethod == "Bank" {
-                        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 request.secureAuthentication == true {
+                        threeDSecurePaymentApi()
+                    } else {
+                        paymentIntentApi()
                     }
                 }
             }
+            else if selectedPaymentMethod == "Bank" {
+                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" {
+                grailPayAccountChargeApi()
+            }
+            else if selectedPaymentMethod == "NewGrailPayAccount" {
+                grailPayAccountChargeApi()
+            }
         }
     }
     
@@ -356,46 +443,43 @@ class AdditionalInfoVC: BaseVC {
         print("Setting clientToken header: \(token ?? "None")")
         urlRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
-        guard let billingInfoData = billingInfoData else {
-            print("Billing info data is nil")
-            hideLoadingIndicator()
-            return
-        }
-        
         // Extract only the digits from the phone number (local only, no country code)
         let localPhone = txtFieldPhoneNumber.text?.components(separatedBy: CharacterSet.decimalDigits.inverted).joined() ?? ""
         
-        let additionalInfo: [String: Any] = [
-            "name": txtFieldName.text ?? "",
-            "email": txtFieldEmail.text ?? "",
-            "phone_number": localPhone,
-            "description": txtFieldDescription.text ?? ""
-        ]
-        
-        let billingInfo: [String: Any] = [
-            "address": billingInfoData["address"] as? String ?? "",
-            "country": billingInfoData["country"] as? String ?? "",
-            "state": billingInfoData["state"] as? String ?? "",
-            "city": billingInfoData["city"] as? String ?? "",
-            "postal_code": billingInfoData["postal_code"] as? String ?? ""
-        ]
-        
         var params: [String: Any] = [
-            "name": txtFieldName.text ?? "",
-            "email": txtFieldEmail.text ?? "",
+            "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": txtFieldDescription.text ?? "",
-            "currency": "usd",
-            "billing_info": billingInfo,
-            "additional_info": additionalInfo,
-            "payment_method": "card",
-            "save_card": 0
+            "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 ?? ""
+        }
+        
+        // Conditionally add additional info
+        if let visibility = visibility, visibility.additional == true,
+           let additional = additionalInfo, !additional.isEmpty {
+            params["description"] = txtFieldDescription.text ?? ""
+            params["phone_number"] = localPhone
+        }
+        
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
             if let recurringType = req.recurringStartDateType, recurringType == .custom {
@@ -419,6 +503,8 @@ class AdditionalInfoVC: BaseVC {
             params["interval"] = chosenPlan?.lowercased()
         }
         
+        print(params)
+        
         do {
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
             urlRequest.httpBody = jsonData
@@ -466,8 +552,31 @@ class AdditionalInfoVC: BaseVC {
                                         paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
                                         // Pass billing and additional info
-                                        paymentDoneVC.billingInfo = billingInfo
-                                        paymentDoneVC.additionalInfo = additionalInfo
+                                        // 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 {
+                                            // Update additionalInfo values before sending
+                                            if let index = self.additionalInfo?.firstIndex(where: { $0.name == "description" }) {
+                                                self.additionalInfo?[index].value = self.txtFieldDescription.text ?? ""
+                                            }
+                                            if let index = self.additionalInfo?.firstIndex(where: { $0.name == "phone_number" }) {
+                                                self.additionalInfo?[index].value = localPhone
+                                            }
+                                            
+                                            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)
                                     }
                                 }
@@ -514,43 +623,12 @@ class AdditionalInfoVC: BaseVC {
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
-        guard let billingInfoData = billingInfoData else {
-            print("Billing info data is nil")
-            return
-        }
-        
-        //        // Remove the flag and "+" sign from lblCountryCode.text
-        //        let countryCode = lblCountryCode.text ?? ""
-        //        let cleanedCountryCode = countryCode.replacingOccurrences(of: "[^0-9]", with: "", options: .regularExpression)
-        //        // Format phone number parameter by combining cleaned country code and phone number
-        //        let phoneNumber = "\(cleanedCountryCode)\(txtFieldPhoneNumber.text ?? "")"
-        
         // Extract only the digits from the phone number (local only, no country code)
         let localPhone = txtFieldPhoneNumber.text?.components(separatedBy: CharacterSet.decimalDigits.inverted).joined() ?? ""
         
-        let additionalInfo: [String: Any] = [
-            "name": txtFieldName.text ?? "",
-            "email": txtFieldEmail.text ?? "",
-            "phone_number": localPhone,
-            //            "phone_number": phoneNumber,
-            "description": txtFieldDescription.text ?? ""
-        ]
-        
-        let billingInfo: [String: Any] = [
-            "address": billingInfoData["address"] as? String ?? "",
-            "country": billingInfoData["country"] as? String ?? "",
-            "state": billingInfoData["state"] as? String ?? "",
-            "city": billingInfoData["city"] as? String ?? "",
-            "postal_code": billingInfoData["postal_code"] as? String ?? ""
-        ]
-        
         var params: [String: Any] = [
-            "name": txtFieldName.text ?? "",
-            "email": txtFieldEmail.text ?? "",
             "description": txtFieldDescription.text ?? "",
             "currency": "usd",
-            "billing_info": billingInfo,
-            "additional_info": additionalInfo,
             "payment_method": "card",
             "save_card": 0,
             "customer" : selectedCard?.customerId ?? "",
@@ -559,6 +637,57 @@ class AdditionalInfoVC: BaseVC {
             "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 ?? ""
+        }
+        
+        // Default values
+        let defaultDescription = "Hosted payment checkout"
+        let defaultName = UserStoreSingleton.shared.merchantName ?? ""
+        let defaultEmail = UserStoreSingleton.shared.merchantEmail ?? ""
+        
+        // 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
+            }
+            
+            // Description
+            let description = (additionalInfoDict["description"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)
+            params["description"] = (description?.isEmpty == false) ? description! : defaultDescription
+            
+            // Phone
+            params["phone_number"] = localPhone
+            
+            // Name
+            let name = (additionalInfoDict["name"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)
+            params["name"] = (name?.isEmpty == false) ? name! : defaultName
+            
+            // Email
+            let email = (additionalInfoDict["email"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines)
+            params["email"] = (email?.isEmpty == false) ? email! : defaultEmail
+        } else {
+            // Fallback if additional section not visible
+            params["description"] = defaultDescription
+            params["name"] = defaultName
+            params["email"] = defaultEmail
+        }
+        
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
             if let recurringType = req.recurringStartDateType, recurringType == .custom {
@@ -628,8 +757,31 @@ class AdditionalInfoVC: BaseVC {
                                         paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
                                         // Pass billing and additional info
-                                        paymentDoneVC.billingInfo = billingInfo
-                                        paymentDoneVC.additionalInfo = additionalInfo
+                                        // 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 {
+                                            // Update additionalInfo values before sending
+                                            if let index = self.additionalInfo?.firstIndex(where: { $0.name == "description" }) {
+                                                self.additionalInfo?[index].value = self.txtFieldDescription.text ?? ""
+                                            }
+                                            if let index = self.additionalInfo?.firstIndex(where: { $0.name == "phone_number" }) {
+                                                self.additionalInfo?[index].value = localPhone
+                                            }
+                                            
+                                            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)
                                     }
                                 }
@@ -676,41 +828,20 @@ class AdditionalInfoVC: BaseVC {
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
-        guard let billingInfoData = billingInfoData else {
-            print("Billing info data is nil")
-            return
-        }
-        
-        let additionalInfoFromBilling = billingInfoData["additional_info"] as? [String: Any] ?? [:]
-        
-        let additionalInfo: [String: Any] = [
-            "name": additionalInfoFromBilling["name"] as? String ?? "",
-            "email": additionalInfoFromBilling["email"] as? String ?? "",
-            "phone_number": additionalInfoFromBilling["phone_number"] as? String ?? "",
-            "description": additionalInfoFromBilling["description"] as? String ?? ""
-        ]
-        
-        let billingInfo: [String: Any] = [
-            "address": billingInfoData["address"] as? String ?? "",
-            "country": billingInfoData["country"] as? String ?? "",
-            "state": billingInfoData["state"] as? String ?? "",
-            "city": billingInfoData["city"] as? String ?? "",
-            "postal_code": billingInfoData["postal_code"] as? String ?? ""
-        ]
+        // Extract only the digits from the phone number (local only, no country code)
+        let localPhone = txtFieldPhoneNumber.text?.components(separatedBy: CharacterSet.decimalDigits.inverted).joined() ?? ""
         
         let emailPrefix = UserStoreSingleton.shared.verificationEmail?.components(separatedBy: "@").first ?? ""
         
         var params: [String: Any] = [
-            "name": additionalInfoFromBilling["name"] as? String ?? "",
+            "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": additionalInfoFromBilling["description"] as? String ?? "",
             "currency": "usd",
-            "billing_info": billingInfo,
-            "additional_info": additionalInfo,
             "payment_method": selectedPaymentMethod ?? "",
             "save_card": isSavedNewCard ? 1 : 0
         ]
@@ -720,6 +851,29 @@ class AdditionalInfoVC: BaseVC {
             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 ?? ""
+        }
+        
+        // Conditionally add additional info
+        if let visibility = visibility, visibility.additional == true,
+           let additional = additionalInfo, !additional.isEmpty {
+            params["description"] = txtFieldDescription.text ?? ""
+            params["phone_number"] = localPhone
+        }
+        
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
             if let recurringType = req.recurringStartDateType, recurringType == .custom {
@@ -799,8 +953,31 @@ class AdditionalInfoVC: BaseVC {
                                         paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
                                         // Pass billing and additional info
-                                        paymentDoneVC.billingInfo = billingInfo
-                                        paymentDoneVC.additionalInfo = additionalInfo
+                                        // 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 {
+                                            // Update additionalInfo values before sending
+                                            if let index = self.additionalInfo?.firstIndex(where: { $0.name == "description" }) {
+                                                self.additionalInfo?[index].value = self.txtFieldDescription.text ?? ""
+                                            }
+                                            if let index = self.additionalInfo?.firstIndex(where: { $0.name == "phone_number" }) {
+                                                self.additionalInfo?[index].value = localPhone
+                                            }
+                                            
+                                            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)
                                     }
                                 }
@@ -847,43 +1024,14 @@ class AdditionalInfoVC: BaseVC {
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
-        guard let billingInfoData = billingInfoData else {
-            print("Billing info data is nil")
-            return
-        }
-        
-        //        // Remove the flag and "+" sign from lblCountryCode.text
-        //        let countryCode = lblCountryCode.text ?? ""
-        //        let cleanedCountryCode = countryCode.replacingOccurrences(of: "[^0-9]", with: "", options: .regularExpression)
-        //        // Format phone number parameter by combining cleaned country code and phone number
-        //        let phoneNumber = "\(cleanedCountryCode)\(txtFieldPhoneNumber.text ?? "")"
-        
         // Extract only the digits from the phone number (local only, no country code)
         let localPhone = txtFieldPhoneNumber.text?.components(separatedBy: CharacterSet.decimalDigits.inverted).joined() ?? ""
         
-        let additionalInfo: [String: Any] = [
-            "name": txtFieldName.text ?? "",
-            "email": txtFieldEmail.text ?? "",
-            "phone_number": localPhone,
-            // "phone_number": phoneNumber,
-            "description": txtFieldDescription.text ?? ""
-        ]
-        
-        let billingInfo: [String: Any] = [
-            "address": billingInfoData["address"] as? String ?? "",
-            "country": billingInfoData["country"] as? String ?? "",
-            "state": billingInfoData["state"] as? String ?? "",
-            "city": billingInfoData["city"] as? String ?? "",
-            "postal_code": billingInfoData["postal_code"] as? String ?? ""
-        ]
-        
         var params: [String: Any] = [
-            "name": txtFieldName.text ?? "",
-            "email": txtFieldEmail.text ?? "",
+            "name": accountName ?? "",
+            "email": userEmail ?? "",
             "description": txtFieldDescription.text ?? "",
             "currency": "usd",
-            "billing_info": billingInfo,
-            "additional_info": additionalInfo,
             "account_type": accountType?.lowercased() ?? "",
             "routing_number": routingNumber ?? "",
             "account_number": accountNumber ?? "",
@@ -892,6 +1040,29 @@ class AdditionalInfoVC: BaseVC {
             "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 ?? ""
+        }
+        
+        // Conditionally add additional info
+        if let visibility = visibility, visibility.additional == true,
+           let additional = additionalInfo, !additional.isEmpty {
+            params["description"] = txtFieldDescription.text ?? ""
+            params["phone_number"] = localPhone
+        }
+        
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
             if let recurringType = req.recurringStartDateType, recurringType == .custom {
@@ -964,8 +1135,31 @@ class AdditionalInfoVC: BaseVC {
                                         paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate // Pass the delegate
                                         // Pass billing and additional info
-                                        paymentDoneVC.billingInfo = billingInfo
-                                        paymentDoneVC.additionalInfo = additionalInfo
+                                        // 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 {
+                                            // Update additionalInfo values before sending
+                                            if let index = self.additionalInfo?.firstIndex(where: { $0.name == "description" }) {
+                                                self.additionalInfo?[index].value = self.txtFieldDescription.text ?? ""
+                                            }
+                                            if let index = self.additionalInfo?.firstIndex(where: { $0.name == "phone_number" }) {
+                                                self.additionalInfo?[index].value = localPhone
+                                            }
+                                            
+                                            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)
                                     }
                                 }
@@ -1012,48 +1206,40 @@ class AdditionalInfoVC: BaseVC {
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
-        guard let billingInfoData = billingInfoData else {
-            print("Billing info data is nil")
-            return
-        }
-        
-        //        // Remove the flag and "+" sign from lblCountryCode.text
-        //        let countryCode = lblCountryCode.text ?? ""
-        //        let cleanedCountryCode = countryCode.replacingOccurrences(of: "[^0-9]", with: "", options: .regularExpression)
-        //        // Format phone number parameter by combining cleaned country code and phone number
-        //        let phoneNumber = "\(cleanedCountryCode)\(txtFieldPhoneNumber.text ?? "")"
-        
         // Extract only the digits from the phone number (local only, no country code)
         let localPhone = txtFieldPhoneNumber.text?.components(separatedBy: CharacterSet.decimalDigits.inverted).joined() ?? ""
         
-        let additionalInfo: [String: Any] = [
-            "name": txtFieldName.text ?? "",
-            "email": txtFieldEmail.text ?? "",
-            "phone_number": localPhone,
-            // "phone_number": phoneNumber,
-            "description": txtFieldDescription.text ?? ""
-        ]
-        
-        let billingInfo: [String: Any] = [
-            "address": billingInfoData["address"] as? String ?? "",
-            "country": billingInfoData["country"] as? String ?? "",
-            "state": billingInfoData["state"] as? String ?? "",
-            "city": billingInfoData["city"] as? String ?? "",
-            "postal_code": billingInfoData["postal_code"] as? String ?? ""
-        ]
-        
         var params: [String: Any] = [
             "name": UserStoreSingleton.shared.merchantName ?? "",
             "account_id": accountID ?? "",
             "payment_method": "ach",
             "customer": customerID ?? "",
-            "address": billingInfoData["address"] as? String ?? "",
-            "description": txtFieldDescription.text ?? "",
             "currency": "usd",
-            "billing_info": billingInfo,
-            "additional_info": additionalInfo
         ]
         
+        // 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 {
+            params["description"] = txtFieldDescription.text ?? ""
+            params["phone_number"] = localPhone
+        }
+        
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
             if let recurringType = req.recurringStartDateType, recurringType == .custom {
@@ -1126,8 +1312,31 @@ class AdditionalInfoVC: BaseVC {
                                         paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate // Pass the delegate
                                         // Pass billing and additional info
-                                        paymentDoneVC.billingInfo = billingInfo
-                                        paymentDoneVC.additionalInfo = additionalInfo
+                                        // 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 {
+                                            // Update additionalInfo values before sending
+                                            if let index = self.additionalInfo?.firstIndex(where: { $0.name == "description" }) {
+                                                self.additionalInfo?[index].value = self.txtFieldDescription.text ?? ""
+                                            }
+                                            if let index = self.additionalInfo?.firstIndex(where: { $0.name == "phone_number" }) {
+                                                self.additionalInfo?[index].value = localPhone
+                                            }
+                                            
+                                            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)
                                     }
                                 }
@@ -1174,37 +1383,15 @@ class AdditionalInfoVC: BaseVC {
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
-        guard let billingInfoData = billingInfoData else {
-            print("Billing info data is nil")
-            return
-        }
-        
-        let additionalInfoFromBilling = billingInfoData["additional_info"] as? [String: Any] ?? [:]
-        
-        let additionalInfo: [String: Any] = [
-            "name": additionalInfoFromBilling["name"] as? String ?? "",
-            "email": additionalInfoFromBilling["email"] as? String ?? "",
-            "phone_number": additionalInfoFromBilling["phone_number"] as? String ?? "",
-            "description": additionalInfoFromBilling["description"] as? String ?? ""
-        ]
-        
-        let billingInfo: [String: Any] = [
-            "address": billingInfoData["address"] as? String ?? "",
-            "country": billingInfoData["country"] as? String ?? "",
-            "state": billingInfoData["state"] as? String ?? "",
-            "city": billingInfoData["city"] as? String ?? "",
-            "postal_code": billingInfoData["postal_code"] as? String ?? ""
-        ]
+        // Extract only the digits from the phone number (local only, no country code)
+        let localPhone = txtFieldPhoneNumber.text?.components(separatedBy: CharacterSet.decimalDigits.inverted).joined() ?? ""
         
         let emailPrefix = UserStoreSingleton.shared.verificationEmail?.components(separatedBy: "@").first ?? ""
         
         var params: [String: Any] = [
-            "name": additionalInfoFromBilling["name"] as? String ?? "",
-            "email": UserStoreSingleton.shared.verificationEmail ?? "",
-            "description": additionalInfoFromBilling["description"] as? String ?? "",
+            "name": accountName ?? "",
+            "email": UserStoreSingleton.shared.merchantEmail ?? "",
             "currency": "usd",
-            "billing_info": billingInfo,
-            "additional_info": additionalInfo,
             "account_type": accountType?.lowercased() ?? "",
             "routing_number": routingNumber ?? "",
             "account_number": accountNumber ?? "",
@@ -1221,6 +1408,35 @@ class AdditionalInfoVC: BaseVC {
             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 ?? ""
+        }
+        
+        // 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"] = txtFieldDescription.text ?? ""
+            params["phone_number"] = localPhone
+        }
+        
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
             if let recurringType = req.recurringStartDateType, recurringType == .custom {
@@ -1292,8 +1508,31 @@ class AdditionalInfoVC: BaseVC {
                                         paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
                                         // Pass billing and additional info
-                                        paymentDoneVC.billingInfo = billingInfo
-                                        paymentDoneVC.additionalInfo = additionalInfo
+                                        // 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 {
+                                            // Update additionalInfo values before sending
+                                            if let index = self.additionalInfo?.firstIndex(where: { $0.name == "description" }) {
+                                                self.additionalInfo?[index].value = self.txtFieldDescription.text ?? ""
+                                            }
+                                            if let index = self.additionalInfo?.firstIndex(where: { $0.name == "phone_number" }) {
+                                                self.additionalInfo?[index].value = localPhone
+                                            }
+                                            
+                                            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)
                                     }
                                 }
@@ -1349,46 +1588,44 @@ class AdditionalInfoVC: BaseVC {
             uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
         }
         
-        guard let billingInfoData = billingInfoData else {
-            print("Billing info data is nil")
-            hideLoadingIndicator()
-            return
-        }
-        
         // Extract only the digits from the phone number (local only, no country code)
         let localPhone = txtFieldPhoneNumber.text?.components(separatedBy: CharacterSet.decimalDigits.inverted).joined() ?? ""
         
-        let additionalInfo: [String: Any] = [
-            "name": txtFieldName.text ?? "",
-            "email": txtFieldEmail.text ?? "",
-            "phone_number": localPhone,
-            "description": txtFieldDescription.text ?? ""
-        ]
-        
-        let billingInfo: [String: Any] = [
-            "address": billingInfoData["address"] as? String ?? "",
-            "country": billingInfoData["country"] as? String ?? "",
-            "state": billingInfoData["state"] as? String ?? "",
-            "city": billingInfoData["city"] as? String ?? "",
-            "postal_code": billingInfoData["postal_code"] as? String ?? ""
-        ]
-        
         var params: [String: Any] = [
             "name": nameOnCard ?? "",
-            "email": txtFieldEmail.text ?? "",
+            "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": "Test",
             "currency": "usd",
-            "tokenize": request.tokenOnly ?? false,
-            "address": billingInfoData["address"] as? String ?? "",
-            "billing_info": billingInfo,
-            "additional_info": additionalInfo
+            "tokenize": request.tokenOnly ?? false
         ]
         
+        // 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 {
+            params["description"] = txtFieldDescription.text ?? ""
+            params["phone_number"] = localPhone
+        }
+        
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
             if let recurringType = req.recurringStartDateType, recurringType == .custom {
@@ -1412,6 +1649,8 @@ class AdditionalInfoVC: BaseVC {
             params["interval"] = chosenPlan?.lowercased()
         }
         
+        print(params)
+        
         do {
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
             uRLRequest.httpBody = jsonData
@@ -1460,8 +1699,33 @@ class AdditionalInfoVC: BaseVC {
                                         paymentDoneVC.chargeData = responseObject
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
                                         // Pass billing and additional info
-                                        paymentDoneVC.billingInfo = billingInfo
-                                        paymentDoneVC.additionalInfo = additionalInfo
+                                        // 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 {
+                                            // Update additionalInfo values before sending
+                                            if let index = self.additionalInfo?.firstIndex(where: { $0.name == "description" }) {
+                                                self.additionalInfo?[index].value = self.txtFieldDescription.text ?? ""
+                                            }
+                                            if let index = self.additionalInfo?.firstIndex(where: { $0.name == "phone_number" }) {
+                                                self.additionalInfo?[index].value = localPhone
+                                            }
+                                            
+                                            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)
                                     }
                                 }
@@ -1515,33 +1779,12 @@ class AdditionalInfoVC: BaseVC {
             uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
         }
         
-        guard let billingInfoData = billingInfoData else {
-            print("Billing info data is nil")
-            hideLoadingIndicator()
-            return
-        }
-        
         // Extract only the digits from the phone number (local only, no country code)
         let localPhone = txtFieldPhoneNumber.text?.components(separatedBy: CharacterSet.decimalDigits.inverted).joined() ?? ""
         
-        let additionalInfo: [String: Any] = [
-            "name": txtFieldName.text ?? "",
-            "email": txtFieldEmail.text ?? "",
-            "phone_number": localPhone,
-            "description": txtFieldDescription.text ?? ""
-        ]
-        
-        let billingInfo: [String: Any] = [
-            "address": billingInfoData["address"] as? String ?? "",
-            "country": billingInfoData["country"] as? String ?? "",
-            "state": billingInfoData["state"] as? String ?? "",
-            "city": billingInfoData["city"] as? String ?? "",
-            "postal_code": billingInfoData["postal_code"] as? String ?? ""
-        ]
-        
         var params: [String: Any] = [
             "name": nameOnCard ?? "",
-            "email": txtFieldEmail.text ?? "",
+            "email": userEmail ?? "",
             "card_number": cardNumber?.replacingOccurrences(of: " ", with: "") ?? "",
             "cardholder_name": nameOnCard ?? "",
             "exp_month": expiryDate?.components(separatedBy: "/").first ?? "",
@@ -1550,9 +1793,6 @@ class AdditionalInfoVC: BaseVC {
             "description": "Test",
             "currency": "usd",
             "tokenize": request.tokenOnly ?? false,
-            "address": billingInfoData["address"] as? String ?? "",
-            "billing_info": billingInfo,
-            "additional_info": additionalInfo,
             "save_card": isSavedNewCard ? 1 : 0,
             "customer_id": customerId ?? ""
         ]
@@ -1562,6 +1802,29 @@ class AdditionalInfoVC: BaseVC {
             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 ?? ""
+        }
+        
+        // Conditionally add additional info
+        if let visibility = visibility, visibility.additional == true,
+           let additional = additionalInfo, !additional.isEmpty {
+            params["description"] = txtFieldDescription.text ?? ""
+            params["phone_number"] = localPhone
+        }
+        
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
             if let recurringType = req.recurringStartDateType, recurringType == .custom {
@@ -1633,8 +1896,221 @@ class AdditionalInfoVC: BaseVC {
                                         paymentDoneVC.chargeData = responseObject
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
                                         // Pass billing and additional info
-                                        paymentDoneVC.billingInfo = billingInfo
-                                        paymentDoneVC.additionalInfo = additionalInfo
+                                        // 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 {
+                                            // Update additionalInfo values before sending
+                                            if let index = self.additionalInfo?.firstIndex(where: { $0.name == "description" }) {
+                                                self.additionalInfo?[index].value = self.txtFieldDescription.text ?? ""
+                                            }
+                                            if let index = self.additionalInfo?.firstIndex(where: { $0.name == "phone_number" }) {
+                                                self.additionalInfo?[index].value = localPhone
+                                            }
+                                            
+                                            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: - 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")
+        }
+        
+        // Extract only the digits from the phone number (local only, no country code)
+        let localPhone = txtFieldPhoneNumber.text?.components(separatedBy: CharacterSet.decimalDigits.inverted).joined() ?? ""
+        
+        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 ?? ""
+        }
+        
+        // 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"] = txtFieldDescription.text ?? ""
+            params["phone_number"] = localPhone
+        }
+        
+        // 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
+                                        }
+                                        
+                                        if self.visibility?.additional == true {
+                                            // Update additionalInfo values before sending
+                                            if let index = self.additionalInfo?.firstIndex(where: { $0.name == "description" }) {
+                                                self.additionalInfo?[index].value = self.txtFieldDescription.text ?? ""
+                                            }
+                                            if let index = self.additionalInfo?.firstIndex(where: { $0.name == "phone_number" }) {
+                                                self.additionalInfo?[index].value = localPhone
+                                            }
+                                            
+                                            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)
                                     }
                                 }
@@ -1672,3 +2148,16 @@ extension AdditionalInfoVC: CountryListVCDelegate {
         lblCountryCode.text = "\(country.flag ?? "") +\(country.extensionCode ?? "")"
     }
 }
+
+extension String {
+    static func flag(for countryCode: String) -> String {
+        let base : UInt32 = 127397
+        var s = ""
+        for v in countryCode.uppercased().unicodeScalars {
+            if let scalar = UnicodeScalar(base + v.value) {
+                s.unicodeScalars.append(scalar)
+            }
+        }
+        return s
+    }
+}