@jimrising/easymerchantsdk-react-native 2.0.7 → 2.0.9

package/ios/Pods/ViewControllers/PaymentInformation/PaymentInfoVC.swift

@@ -423,6 +423,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             self.request?.paymentIntentApi { success in
                 if success {
                     print("Payment Intent completed")
+                    DispatchQueue.main.async {
+                        self.lblEasyMerchantOne.text = "POWERED BY \(UserStoreSingleton.shared.companyName?.uppercased() ?? "")"
+                    }
                     // Continue flow
                 } else {
                     print("Payment Intent failed")
@@ -449,7 +452,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         tapGesture.cancelsTouchesInView = false
         self.view.addGestureRecognizer(tapGesture)
         
-        if let billingInfoData = request.billingInfoData,
+        if let billingInfoData = request.fields,
            let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
             
             let billingVisible = fieldSection.visibility.billing
@@ -610,7 +613,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             }
         }
         
-        print(request.metadata ?? "")
     }
     
     //MARK: - View Wiil Appear
@@ -847,11 +849,12 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 
                 if isFrom == "NewAccount" {
                     viewNewBankAccount.isHidden = false
-                } else {
-                    viewSingleSavedAccount.isHidden = false
                 }
+                // else {
+                //   viewSingleSavedAccount.isHidden = false
+                // }
                 
-                self.viewSingleSavedAccount.isHidden = false
+                //  self.viewSingleSavedAccount.isHidden = false
                 self.viewBankFields.isHidden = true
                 self.viewBtnShowSavedCards.isHidden = true
                 self.viewBtnShowSavedCardHeight.constant = 0
@@ -914,7 +917,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             self.grailPayBankLinkView.isHidden = true
                             self.viewSingleSavedAccount.isHidden = true
                         }
-                        //                        self.grailPayBankLinkView.isHidden = false
+                        // self.grailPayBankLinkView.isHidden = false
                         self.btnNext.isHidden = true
                         self.btnNextHeight.constant = 0
                         self.btnNextTopCon.constant = 0
@@ -938,12 +941,12 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     self.viewBtnShowSavedCardHeight.constant = 0
                     self.viewBtnShowSavedCardTopCon.constant = 0
                 }
-                else {
-                    self.viewBtnShowSavedCards.isHidden = false
-                    self.lblBtnShowSaveCard.text = "Show Saved Accounts"
-                    self.viewBtnShowSavedCardHeight.constant = 50
-                    self.viewBtnShowSavedCardTopCon.constant = 20
-                }
+//                else {
+//                    self.viewBtnShowSavedCards.isHidden = false
+//                    self.lblBtnShowSaveCard.text = "Show Saved Accounts"
+//                    self.viewBtnShowSavedCardHeight.constant = 50
+//                    self.viewBtnShowSavedCardTopCon.constant = 20
+//                }
                 
                 self.OTPView.isHidden = true
                 self.emailView.isHidden = true
@@ -1891,8 +1894,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         UserStoreSingleton.shared.clearUserData()
         UserStoreSingleton.shared.isLoggedIn = false
         
-        // Notify delegate about cancellation with custom message
-        let result = SDKResult(type: .cancelled, chargeData: ["message": "You’ve exited the payment screen. No transaction was made."])
+        // Directly send as dictionary like in Android
+        let cancelData: [String: Any] = [
+            "status": false,
+            "message": "User cancelled the payment."
+        ]
+        
+        let result = SDKResult(type: .cancelled, chargeData: cancelData)
         self.delegate?.easyPayController(self.navigationController as! EasyPayViewController, didFinishWith: result)
         
         self.dismiss(animated: true)
@@ -1997,7 +2005,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     
     @IBAction func actionBtnPayNowSingleSavedCard(_ sender: UIButton) {
         // Check if billingInfoData is not nil or empty
-        if let billingInfoData = request.billingInfoData,
+        if let billingInfoData = request.fields,
            let json = try? JSONSerialization.jsonObject(with: billingInfoData, options: []),
            let jsonDict = json as? [String: Any], !jsonDict.isEmpty {
             print("Billing Info Data: \(jsonDict)")
@@ -2048,7 +2056,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         billingInfoVC.amount = Double(self.request.amount ?? 0)
                         billingInfoVC.selectedPaymentMethod = self.selectedPaymentMethod
                         
-                        if let billingInfoData = self.request.billingInfoData {
+                        if let billingInfoData = self.request.fields {
                             billingInfoVC.billingInfoData = billingInfoData
                         }
                         
@@ -2072,7 +2080,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         additionalInfoVC.amount = Double(self.request.amount ?? 0)
                         additionalInfoVC.selectedPaymentMethod = self.selectedPaymentMethod
                         
-                        if let billingInfoData = self.request.billingInfoData {
+                        if let billingInfoData = self.request.fields {
                             additionalInfoVC.billingInfoData = billingInfoData
                         }
                         
@@ -2165,7 +2173,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBAction func actionBtnPayNowNewCardView(_ sender: UIButton) {
         if UserStoreSingleton.shared.isLoggedIn == true {
             //if billing info is availbale
-            if let billingInfoData = request.billingInfoData,
+            if let billingInfoData = request.fields,
                let json = try? JSONSerialization.jsonObject(with: billingInfoData, options: []),
                let jsonDict = json as? [String: Any], !jsonDict.isEmpty {
                 print("Billing Info Data: \(jsonDict)")
@@ -2261,7 +2269,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             billingInfoVC.amount = Double(self.request.amount ?? 0)
                             billingInfoVC.selectedPaymentMethod = self.selectedPaymentMethod
                             
-                            if let billingInfoData = self.request.billingInfoData {
+                            if let billingInfoData = self.request.fields {
                                 billingInfoVC.billingInfoData = billingInfoData
                             }
                             
@@ -2288,7 +2296,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             additionalInfoVC.amount = Double(self.request.amount ?? 0)
                             additionalInfoVC.selectedPaymentMethod = self.selectedPaymentMethod
                             
-                            if let billingInfoData = self.request.billingInfoData {
+                            if let billingInfoData = self.request.fields {
                                 additionalInfoVC.billingInfoData = billingInfoData
                             }
                             
@@ -2757,13 +2765,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             
             if isSavedForFuture {
                 //If billing info is available
-                if let billingInfoData = request.billingInfoData {
+                if let billingInfoData = request.fields {
                     do {
                         let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
                         
                         DispatchQueue.main.async {
                             
-                            if let billingInfoData = self.request.billingInfoData,
+                            if let billingInfoData = self.request.fields,
                                let json = try? JSONSerialization.jsonObject(with: billingInfoData, options: []),
                                let jsonDict = json as? [String: Any], !jsonDict.isEmpty {
                                 print("Billing Info Data: \(jsonDict)")
@@ -2772,26 +2780,31 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                 let showAdditional = fieldSection.visibility.additional
                                 
                                 if !showBilling && !showAdditional {
-                                    // Navigate directly to EmailVerificationVC
-                                    // let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
-                                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "OTPVerificationVC") as! OTPVerificationVC
-                                    vc.easyPayDelegate = self.easyPayDelegate
-                                    vc.grailPayAccountID = self.grailPayAccountID
-                                    vc.selectedGrailPayAccountType = self.selectedGrailPayAccountType
-                                    vc.selectedGrailPayAccountName = self.selectedGrailPayAccountName
-                                    vc.chosenPlan = self.txtFieldChosePlanGrailPayBankView.text
-                                    vc.startDate = self.txtFieldSelectDateGrailPayBankView.text
-                                    vc.request = self.request
-                                    vc.isSavedForFuture = self.isSavedForFuture
-                                    vc.selectedPaymentMethod = "GrailPay"
-                                    vc.userEmail = self.txtFieldEmailGrailPayView.text
-                                    vc.billingInfoData = billingInfoData // Send the data even if not shown
-                                    vc.billingInfo = fieldSection.billing
-                                    vc.additionalInfo = fieldSection.additional
-                                    vc.visibility = fieldSection.visibility
-                                    vc.amount = self.amount
-                                    vc.email = self.txtFieldEmailGrailPayView.text
-                                    self.navigationController?.pushViewController(vc, animated: true)
+                                    if UserStoreSingleton.shared.isLoggedIn == true {
+                                        self.grailPayAccountChargeWithSaveApi()
+                                    }
+                                    else {
+                                        // Navigate directly to EmailVerificationVC
+                                        // let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
+                                        let vc = easymerchantsdk.instantiateViewController(withIdentifier: "OTPVerificationVC") as! OTPVerificationVC
+                                        vc.easyPayDelegate = self.easyPayDelegate
+                                        vc.grailPayAccountID = self.grailPayAccountID
+                                        vc.selectedGrailPayAccountType = self.selectedGrailPayAccountType
+                                        vc.selectedGrailPayAccountName = self.selectedGrailPayAccountName
+                                        vc.chosenPlan = self.txtFieldChosePlanGrailPayBankView.text
+                                        vc.startDate = self.txtFieldSelectDateGrailPayBankView.text
+                                        vc.request = self.request
+                                        vc.isSavedForFuture = self.isSavedForFuture
+                                        vc.selectedPaymentMethod = "GrailPay"
+                                        vc.userEmail = self.txtFieldEmailGrailPayView.text
+                                        vc.billingInfoData = billingInfoData // Send the data even if not shown
+                                        vc.billingInfo = fieldSection.billing
+                                        vc.additionalInfo = fieldSection.additional
+                                        vc.visibility = fieldSection.visibility
+                                        vc.amount = self.amount
+                                        vc.email = self.txtFieldEmailGrailPayView.text
+                                        self.navigationController?.pushViewController(vc, animated: true)
+                                    }
                                 }
                                 else if showBilling {
                                     // Push to BillingInfoVC
@@ -2842,31 +2855,35 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 }
                 else {
                     //If billing info is nil
-                    // Navigate to EmailVerificationVC directly
-                    // let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
-                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "OTPVerificationVC") as! OTPVerificationVC
-                    vc.easyPayDelegate = self.easyPayDelegate
-                    vc.grailPayAccountID = self.grailPayAccountID
-                    vc.selectedGrailPayAccountType = self.selectedGrailPayAccountType
-                    vc.selectedGrailPayAccountName = self.selectedGrailPayAccountName
-                    vc.chosenPlan = self.txtFieldChosePlanGrailPayBankView.text
-                    vc.startDate = self.txtFieldSelectDateGrailPayBankView.text
-                    vc.request = self.request
-                    vc.isSavedForFuture = self.isSavedForFuture
-                    vc.selectedPaymentMethod = "GrailPay"
-                    vc.email = self.txtFieldEmailGrailPayView.text
-                    vc.amount = self.amount
-                    self.navigationController?.pushViewController(vc, animated: true)
+                    if UserStoreSingleton.shared.isLoggedIn == true {
+                        grailPayAccountChargeWithSaveApi()
+                    } else {
+                        // Navigate to EmailVerificationVC directly
+                        // let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
+                        let vc = easymerchantsdk.instantiateViewController(withIdentifier: "OTPVerificationVC") as! OTPVerificationVC
+                        vc.easyPayDelegate = self.easyPayDelegate
+                        vc.grailPayAccountID = self.grailPayAccountID
+                        vc.selectedGrailPayAccountType = self.selectedGrailPayAccountType
+                        vc.selectedGrailPayAccountName = self.selectedGrailPayAccountName
+                        vc.chosenPlan = self.txtFieldChosePlanGrailPayBankView.text
+                        vc.startDate = self.txtFieldSelectDateGrailPayBankView.text
+                        vc.request = self.request
+                        vc.isSavedForFuture = self.isSavedForFuture
+                        vc.selectedPaymentMethod = "GrailPay"
+                        vc.email = self.txtFieldEmailGrailPayView.text
+                        vc.amount = self.amount
+                        self.navigationController?.pushViewController(vc, animated: true)
+                    }
                 }
             } else {
                 // Check if billing info data exists and is valid JSON without save
-                if let billingInfoData = request.billingInfoData {
+                if let billingInfoData = request.fields {
                     do {
                         let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
                         
                         DispatchQueue.main.async {
                             
-                            if let billingInfoData = self.request.billingInfoData,
+                            if let billingInfoData = self.request.fields,
                                let json = try? JSONSerialization.jsonObject(with: billingInfoData, options: []),
                                let jsonDict = json as? [String: Any], !jsonDict.isEmpty {
                                 print("Billing Info Data: \(jsonDict)")
@@ -2960,13 +2977,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             
             if isSavedForFuture {
                 //If billing info is available
-                if let billingInfoData = request.billingInfoData {
+                if let billingInfoData = request.fields {
                     do {
                         let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
                         
                         DispatchQueue.main.async {
                             
-                            if let billingInfoData = self.request.billingInfoData,
+                            if let billingInfoData = self.request.fields,
                                let json = try? JSONSerialization.jsonObject(with: billingInfoData, options: []),
                                let jsonDict = json as? [String: Any], !jsonDict.isEmpty {
                                 print("Billing Info Data: \(jsonDict)")
@@ -3025,13 +3042,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             }
             else {
                 // Check if billing info data exists and is valid JSON without save
-                if let billingInfoData = request.billingInfoData {
+                if let billingInfoData = request.fields {
                     do {
                         let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
                         
                         DispatchQueue.main.async {
                             
-                            if let billingInfoData = self.request.billingInfoData,
+                            if let billingInfoData = self.request.fields,
                                let json = try? JSONSerialization.jsonObject(with: billingInfoData, options: []),
                                let jsonDict = json as? [String: Any], !jsonDict.isEmpty {
                                 print("Billing Info Data: \(jsonDict)")
@@ -3199,6 +3216,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     
                     if self.selectedPaymentMethod == "Bank" {
                         self.viewBtnShowSavedCards.isHidden = true
+                        self.btnShowSavedCard.isHidden = true
+                        self.viewBtnShowSavedCardHeight.constant = 0
+                        self.viewBtnShowSavedCardTopCon.constant = 0
                     }
                     
                     let amountText = String(format: "$%.2f", self.request.amount ?? 0)
@@ -3299,7 +3319,237 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "email": txtFieldEmailGrailPayView.text
         ]
         
-        if let billingInfoData = request.billingInfoData {
+        if let billingInfoData = request.fields {
+            do {
+                let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
+                
+                // Billing Info
+                let billing = fieldSection.billing
+                if !billing.isEmpty {
+                    var billingDict: [String: Any] = [:]
+                    billing.forEach { billingDict[$0.name] = $0.value }
+                    
+                    if let address = billingDict["address"] as? String, !address.isEmpty {
+                        params["address"] = address
+                    }
+                    if let country = billingDict["country"] as? String, !country.isEmpty {
+                        params["country"] = country
+                    }
+                    if let state = billingDict["state"] as? String, !state.isEmpty {
+                        params["state"] = state
+                    }
+                    if let city = billingDict["city"] as? String, !city.isEmpty {
+                        params["city"] = city
+                    }
+                    if let postalCode = billingDict["postal_code"] as? String, !postalCode.isEmpty {
+                        params["zip"] = postalCode
+                    }
+                }
+                
+                // Additional Info
+                let additional = fieldSection.additional
+                if !additional.isEmpty {
+                    var additionalDict: [String: Any] = [:]
+                    additional.forEach { additionalDict[$0.name] = $0.value }
+                    
+                    if let desc = additionalDict["description"] as? String, !desc.isEmpty {
+                        params["description"] = desc
+                    } else {
+                        params["description"] = "Hosted payment checkout"
+                    }
+                    
+                    if let phone = additionalDict["phone_number"] as? String, !phone.isEmpty {
+                        params["phone_number"] = phone
+                    }
+                    if let email = additionalDict["email"] as? String, !email.isEmpty {
+                        params["email"] = email
+                    }
+                    if let name = additionalDict["name"] as? String, !name.isEmpty {
+                        params["name"] = name
+                    }
+                } else {
+                    // If no description in additional info, set default
+                    params["description"] = "Hosted payment checkout"
+                }
+                
+            } catch {
+                print("Failed to decode FieldSection: \(error)")
+                params["description"] = "Hosted payment checkout"
+            }
+        } else {
+            // Fallback if billingInfoData is missing
+            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 = txtFieldSelectDateGrailPayBankView?.text, !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"] = txtFieldChosePlanGrailPayBankView.text.lowercased()
+        }
+        
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
+        
+        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
+                                        paymentDoneVC.request = self.request
+                                        // Pass billing info and additional info if available
+                                        if let billingInfoData = self.request.fields,
+                                           let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
+                                            
+                                            paymentDoneVC.billingInfoData = fieldSection.billing
+                                            var billingDict: [String: Any] = [:]
+                                            fieldSection.billing.forEach { billingDict[$0.name] = $0.value }
+                                            paymentDoneVC.billingInfo = billingDict
+                                            
+                                            paymentDoneVC.additionalInfoData = fieldSection.additional
+                                            var additionalDict: [String: Any] = [:]
+                                            fieldSection.additional.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: - Grail Pay Banking Payment Charge Api with saving bank and with Login
+    func grailPayAccountChargeWithSaveApi() {
+        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")
+        }
+        
+        let emailText = txtFieldEmailGrailPayView.text
+        let emailPrefix = emailText.components(separatedBy: "@").first ?? ""
+        
+        var params: [String: Any] = [
+            "account_id": self.grailPayAccountID ?? "",
+            "account_type": self.selectedGrailPayAccountType ?? "",
+            "name": self.selectedGrailPayAccountName ?? "",
+            "description": "payment checkout",
+            "email": txtFieldEmailGrailPayView.text,
+            "save_account": 1,
+            "is_default": 1,
+            "customer_id": UserStoreSingleton.shared.customerId ?? "",
+            "create_customer": "1",
+        ]
+        
+        if let customerId = UserStoreSingleton.shared.customerId {
+            params["customer"] = customerId
+        } else {
+            params["username"] = emailPrefix
+        }
+        
+        if UserStoreSingleton.shared.customerId == nil {
+            params["create_customer"] = "1"
+        }
+        
+        if let billingInfoData = request.fields {
             do {
                 let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
                 
@@ -3384,6 +3634,12 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             params["interval"] = txtFieldChosePlanGrailPayBankView.text.lowercased()
         }
         
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
+        
+        
         print(params)
         
         do {
@@ -3434,7 +3690,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
                                         paymentDoneVC.request = self.request
                                         // Pass billing info and additional info if available
-                                        if let billingInfoData = self.request.billingInfoData,
+                                        if let billingInfoData = self.request.fields,
                                            let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
                                             
                                             paymentDoneVC.billingInfoData = fieldSection.billing
@@ -3514,7 +3770,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             params["is_default"] = 1
         }
         
-        if let billingInfoData = request.billingInfoData {
+        if let billingInfoData = request.fields {
             do {
                 let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
                 
@@ -3599,6 +3855,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             params["interval"] = txtFieldChosePlanNewGrailPayBankView.text.lowercased()
         }
         
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
+        
         print(params)
         
         do {
@@ -3650,7 +3911,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         paymentDoneVC.request = self.request
                                         
                                         // Pass billing info and additional info if available
-                                        if let billingInfoData = self.request.billingInfoData,
+                                        if let billingInfoData = self.request.fields,
                                            let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
                                             
                                             paymentDoneVC.billingInfoData = fieldSection.billing
@@ -3724,7 +3985,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "email": UserStoreSingleton.shared.verificationEmail ?? "",
         ]
         
-        if let billingInfoData = request.billingInfoData {
+        if let billingInfoData = request.fields {
             do {
                 let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
                 
@@ -3809,6 +4070,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             params["interval"] = txtFieldSelectPlanSingleSavedBankView.text.lowercased()
         }
         
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
+        
         print(params)
         
         do {
@@ -3860,7 +4126,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         paymentDoneVC.request = self.request
                                         
                                         // Pass billing info and additional info if available
-                                        if let billingInfoData = self.request.billingInfoData,
+                                        if let billingInfoData = self.request.fields,
                                            let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
                                             
                                             paymentDoneVC.billingInfoData = fieldSection.billing
@@ -3933,7 +4199,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     // MARK: - Action Button Next
     @IBAction func actionBtnNext(_ sender: UIButton) {
         // Check if billing info data exists and is valid JSON
-        if let billingInfoData = request.billingInfoData {
+        if let billingInfoData = request.fields {
             do {
                 let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
                 
@@ -4019,7 +4285,15 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         
                         if !showBilling && !showAdditional {
                             if self.isSavedForFuture {
-                                self.navigateCardDataToEmailVerificationVC()
+                                if UserStoreSingleton.shared.isLoggedIn == true {
+                                    if self.request.secureAuthentication == true {
+                                        self.threeDSecurePaymentApi()
+                                    } else {
+                                        self.paymentIntentCardApi()
+                                    }
+                                } else {
+                                    self.navigateCardDataToEmailVerificationVC()
+                                }
                             } else {
                                 if self.request.secureAuthentication == true {
                                     self.threeDSecurePaymentApi()
@@ -4134,7 +4408,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         
                         if !showBilling && !showAdditional {
                             if self.isSavedForFuture {
-                                self.navigateBankDataToEmailVerificationVC()
+                                if UserStoreSingleton.shared.isLoggedIn == true {
+                                    self.accountBankChargeApi()
+                                } else {
+                                    self.navigateBankDataToEmailVerificationVC()
+                                }
                             } else {
                                 self.accountBankChargeApi()
                             }
@@ -4287,21 +4565,29 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 
                 // Navigate to EmailVerificationVC if isSavedForFuture is true, else call paymentIntentApi
                 if isSavedForFuture {
-                    if let vc = storyboard?.instantiateViewController(withIdentifier: "OTPVerificationVC") as? OTPVerificationVC {
-                        vc.cardNumber = self.cardNumberTextField.text
-                        vc.expiryDate = self.cardExpiryTextField.text
-                        vc.cvv = self.cardCvvTextField.text
-                        vc.nameOnCard = self.cardNameTextField.text
-                        vc.selectedPaymentMethod = self.selectedPaymentMethod
-                        vc.isSavedForFuture = isSavedForFuture
-                        vc.easyPayDelegate = self.easyPayDelegate // Pass delegate if needed
-                        vc.request = self.request
-                        vc.chosenPlan = self.txtFieldChosePlanCard.text
-                        vc.startDate = self.txtFieldStartDateCard.text
-                        vc.userEmail = self.txtFieldEmailCardView.text
-                        vc.email = self.txtFieldEmailCardView.text
-                        vc.amount = self.amount
-                        self.navigationController?.pushViewController(vc, animated: true)
+                    if UserStoreSingleton.shared.isLoggedIn == true {
+                        if request.secureAuthentication == true {
+                            threeDSecurePaymentApi()
+                        } else {
+                            paymentIntentApi()
+                        }
+                    } else {
+                        if let vc = storyboard?.instantiateViewController(withIdentifier: "OTPVerificationVC") as? OTPVerificationVC {
+                            vc.cardNumber = self.cardNumberTextField.text
+                            vc.expiryDate = self.cardExpiryTextField.text
+                            vc.cvv = self.cardCvvTextField.text
+                            vc.nameOnCard = self.cardNameTextField.text
+                            vc.selectedPaymentMethod = self.selectedPaymentMethod
+                            vc.isSavedForFuture = isSavedForFuture
+                            vc.easyPayDelegate = self.easyPayDelegate // Pass delegate if needed
+                            vc.request = self.request
+                            vc.chosenPlan = self.txtFieldChosePlanCard.text
+                            vc.startDate = self.txtFieldStartDateCard.text
+                            vc.userEmail = self.txtFieldEmailCardView.text
+                            vc.email = self.txtFieldEmailCardView.text
+                            vc.amount = self.amount
+                            self.navigationController?.pushViewController(vc, animated: true)
+                        }
                     }
                 } else {
                     if request.secureAuthentication == true {
@@ -4372,7 +4658,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 }
                 
                 if isSavedForFuture {
-                    navigateBankDataToEmailVerificationVC()
+                    if UserStoreSingleton.shared.isLoggedIn == true {
+                        accountChargeApi()
+                    } else {
+                        navigateBankDataToEmailVerificationVC()
+                    }
                 } else {
                     accountChargeApi()
                 }
@@ -4384,7 +4674,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func navigateCardDataToEmailVerificationVC() {
         // if let emailVerificationVC = storyboard?.instantiateViewController(withIdentifier: "EmailVerificationVC") as? EmailVerificationVC {
         if let emailVerificationVC = storyboard?.instantiateViewController(withIdentifier: "OTPVerificationVC") as? OTPVerificationVC {
-            if let billingInfoData = request.billingInfoData {
+            if let billingInfoData = request.fields {
                 do {
                     let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
                     emailVerificationVC.billingInfoData = billingInfoData
@@ -4418,7 +4708,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func navigateBankDataToEmailVerificationVC() {
         // if let emailVerificationVC = storyboard?.instantiateViewController(withIdentifier: "EmailVerificationVC") as? EmailVerificationVC {
         if let emailVerificationVC = storyboard?.instantiateViewController(withIdentifier: "OTPVerificationVC") as? OTPVerificationVC {
-            if let billingInfoData = request.billingInfoData {
+            if let billingInfoData = request.fields {
                 do {
                     let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
                     emailVerificationVC.billingInfoData = billingInfoData
@@ -4533,7 +4823,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 
                 if self.request?.authenticatedACH == true {
                     self.viewBankFields.isHidden = true
-                    self.viewBtnShowSavedCards.isHidden = true
+                    //  self.viewBtnShowSavedCards.isHidden = true
                     self.btnNext.isHidden = true
                     //  self.viewTermsAndConditions.isHidden = true
                     self.btnNextHeight.constant = 0
@@ -4667,13 +4957,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             grailPayAaccountChargeSingleSavedAccountApi()
         } else {
             // Check if billingInfoData is not nil or empty
-            if let billingInfoData = request.billingInfoData {
+            if let billingInfoData = request.fields {
                 do {
                     let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
                     
                     DispatchQueue.main.async {
                         
-                        if let billingInfoData = self.request.billingInfoData,
+                        if let billingInfoData = self.request.fields,
                            let json = try? JSONSerialization.jsonObject(with: billingInfoData, options: []),
                            let jsonDict = json as? [String: Any], !jsonDict.isEmpty {
                             
@@ -4798,13 +5088,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     
     @IBAction func actionBtnPayNowNewAccountView(_ sender: UIButton) {
         // Check if billingInfoData is not nil or empty
-        if let billingInfoData = request.billingInfoData {
+        if let billingInfoData = request.fields {
             do {
                 let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
                 
                 DispatchQueue.main.async {
                     
-                    if let billingInfoData = self.request.billingInfoData,
+                    if let billingInfoData = self.request.fields,
                        let json = try? JSONSerialization.jsonObject(with: billingInfoData, options: []),
                        let jsonDict = json as? [String: Any], !jsonDict.isEmpty {
                         print("Billing Info Data: \(jsonDict)")
@@ -5520,6 +5810,26 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "currency": "usd"
         ]
         
+        // ✅ Only for logged-in users
+        if UserStoreSingleton.shared.isLoggedIn == true {
+            let emailText = txtFieldEmailCardView.text
+            let emailPrefix = emailText.components(separatedBy: "@").first ?? ""
+            
+            requestBody["save_card"] = 1
+            requestBody["is_default"] = "1"
+            
+            if let customerId = UserStoreSingleton.shared.customerId {
+                requestBody["customer"] = customerId
+                requestBody["customer_id"] = customerId
+            } else {
+                requestBody["username"] = emailPrefix
+            }
+            
+            if UserStoreSingleton.shared.customerId == nil {
+                requestBody["create_customer"] = "1"
+            }
+        }
+        
         if let req = request, req.is_recurring == true {
             if let recurringType = req.recurringStartDateType, recurringType == .custom,
                let startDateText = txtFieldStartDateCard?.text, !startDateText.isEmpty {
@@ -5541,16 +5851,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             }
         }
         
-        //        // ✅ Include metadata only if it has at least 1 key-value pair
-        //        if let metadata = request?.metadata, !metadata.isEmpty {
-        //            requestBody["metadata"] = metadata
-        //        }
-        
-        // ✅ Flatten metadata into requestBody
+        // ✅ Include metadata only if it has at least 1 key-value pair
         if let metadata = request?.metadata, !metadata.isEmpty {
-            for (key, value) in metadata {
-                requestBody[key] = value
-            }
+            requestBody["metadata"] = metadata
         }
         
         print("Request Body: \(requestBody)")
@@ -5578,7 +5881,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
                         paymentDoneVC.request = self.request
                         
-                        if let billingData = self.request.billingInfoData,
+                        if let billingData = self.request.fields,
                            let billingInfoDict = try? JSONSerialization.jsonObject(with: billingData, options: []) as? [String: Any] {
                             
                             let cleanBillingInfo: [String: Any] = [
@@ -5634,7 +5937,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "currency": "usd"
         ]
         
-        if let billingInfoData = request.billingInfoData {
+        if let billingInfoData = request.fields {
             do {
                 let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
                 
@@ -5719,15 +6022,30 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             params["interval"] = txtFieldChosePlanCard.text.lowercased()
         }
         
-        //        // ✅ Include metadata only if it has at least 1 key-value pair
-        //        if let metadata = request?.metadata, !metadata.isEmpty {
-        //            requestBody["metadata"] = metadata
-        //        }
-        
-        // ✅ Flatten metadata into requestBody
+        // ✅ Include metadata only if it has at least 1 key-value pair
         if let metadata = request?.metadata, !metadata.isEmpty {
-            for (key, value) in metadata {
-                params[key] = value
+            params["metadata"] = metadata
+        }
+        
+        // ✅ Only for logged-in users
+        if UserStoreSingleton.shared.isLoggedIn == true {
+            let emailText = txtFieldEmailCardView.text
+            let emailPrefix = emailText.components(separatedBy: "@").first ?? ""
+            
+            params["save_card"] = 1
+            params["is_default"] = "1"
+            params["tokenize"] = request.tokenOnly ?? ""
+            params["username"] = emailPrefix
+            
+            if let customerId = UserStoreSingleton.shared.customerId {
+                params["customer"] = customerId
+                params["customer_id"] = customerId
+            } else {
+                params["create_customer"] = "1"
+            }
+            
+            if UserStoreSingleton.shared.customerId == nil {
+                params["create_customer"] = "1"
             }
         }
         
@@ -5756,7 +6074,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
                         paymentDoneVC.request = self.request
                         // Pass billing info and additional info if available
-                        if let billingInfoData = self.request.billingInfoData,
+                        if let billingInfoData = self.request.fields,
                            let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
                             
                             // Filter billing info: only include non-empty values
@@ -5828,16 +6146,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             params["interval"] = txtFieldSelectPlanSingleSavedCard.text.lowercased()
         }
         
-        //        // ✅ Include metadata only if it has at least 1 key-value pair
-        //        if let metadata = request?.metadata, !metadata.isEmpty {
-        //            requestBody["metadata"] = metadata
-        //        }
-        
-        // ✅ Flatten metadata into requestBody
+        // ✅ Include metadata only if it has at least 1 key-value pair
         if let metadata = request?.metadata, !metadata.isEmpty {
-            for (key, value) in metadata {
-                params[key] = value
-            }
+            params["metadata"] = metadata
         }
         
         print("Request Params: \(params)")
@@ -5865,7 +6176,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
                         paymentDoneVC.request = self.request
                         // Pass billingInfo and additionalInfo
-                        if let billingData = self.request.billingInfoData,
+                        if let billingData = self.request.fields,
                            let billingInfoDict = try? JSONSerialization.jsonObject(with: billingData, options: []) as? [String: Any] {
                             
                             // Extract main billing fields
@@ -5938,7 +6249,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "email": UserStoreSingleton.shared.verificationEmail ?? ""
         ]
         
-        if let billingInfoData = request.billingInfoData {
+        if let billingInfoData = request.fields {
             do {
                 let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
                 
@@ -6023,16 +6334,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             params["interval"] = txtFieldSelectPlanSingleSavedCard.text.lowercased()
         }
         
-        //        // ✅ Include metadata only if it has at least 1 key-value pair
-        //        if let metadata = request?.metadata, !metadata.isEmpty {
-        //            requestBody["metadata"] = metadata
-        //        }
-        
-        // ✅ Flatten metadata into requestBody
+        // ✅ Include metadata only if it has at least 1 key-value pair
         if let metadata = request?.metadata, !metadata.isEmpty {
-            for (key, value) in metadata {
-                params[key] = value
-            }
+            params["metadata"] = metadata
         }
         
         print(params)
@@ -6084,7 +6388,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
                                         paymentDoneVC.request = self.request
                                         // Pass billing info and additional info if available
-                                        if let billingInfoData = self.request.billingInfoData,
+                                        if let billingInfoData = self.request.fields,
                                            let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
                                             
                                             // Filter billing info: only include non-empty values
@@ -6272,6 +6576,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             params["interval"] = txtFieldSelectPlanNewCardView.text.lowercased()
         }
         
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
+        
         print(params)
         
         do {
@@ -6321,7 +6630,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
                                         paymentDoneVC.request = self.request
                                         // Pass billingInfo and additionalInfo
-                                        if let billingData = self.request.billingInfoData,
+                                        if let billingData = self.request.fields,
                                            let billingInfoDict = try? JSONSerialization.jsonObject(with: billingData, options: []) as? [String: Any] {
                                             
                                             // Extract main billing fields
@@ -6418,7 +6727,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             params["is_default"] = "1"
         }
         
-        if let billingInfoData = request.billingInfoData {
+        if let billingInfoData = request.fields {
             do {
                 let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
                 
@@ -6511,16 +6820,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             params["email"] = UserStoreSingleton.shared.verificationEmail
         }
         
-        //        // ✅ Include metadata only if it has at least 1 key-value pair
-        //        if let metadata = request?.metadata, !metadata.isEmpty {
-        //            requestBody["metadata"] = metadata
-        //        }
-        
-        // ✅ Flatten metadata into requestBody
+        // ✅ Include metadata only if it has at least 1 key-value pair
         if let metadata = request?.metadata, !metadata.isEmpty {
-            for (key, value) in metadata {
-                params[key] = value
-            }
+            params["metadata"] = metadata
         }
         
         print(params)
@@ -6572,7 +6874,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
                                         paymentDoneVC.request = self.request
                                         // Pass billing info and additional info if available
-                                        if let billingInfoData = self.request.billingInfoData,
+                                        if let billingInfoData = self.request.fields,
                                            let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
                                             
                                             // Filter billing info: only include non-empty values
@@ -6957,24 +7259,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                 self.btnNextTopCon.constant = 20
                             }
                             
-                            ////  self.viewBankFields.isHidden = false
-                            ////  self.btnNext.isHidden = false
-                            ////  self.btnNextHeight.constant = 50
-                            ////  self.btnNextTopCon.constant = 20
-                            
-                            //                            self.viewBtnShowSavedCards.isHidden = false
-                            //                            self.viewBtnShowSavedCardHeight.constant = 50
-                            //                            self.viewBtnShowSavedCardTopCon.constant = 20
-                            //                            self.btnShowSavedCard.isHidden = false
-                            
                             return
                         }
-                        //                        else {
-                        //                            self.viewBtnShowSavedCards.isHidden = true
-                        //                            self.viewBtnShowSavedCardHeight.constant = 0
-                        //                            self.viewBtnShowSavedCardTopCon.constant = 0
-                        //                            self.btnShowSavedCard.isHidden = false
-                        //                        }
                         
                         if let firstAccount = self.bankAccounts.first {
                             self.selectedbankAccounts = firstAccount
@@ -7090,8 +7376,27 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "payment_mode": "auth_and_capture",
             "payment_intent": UserStoreSingleton.shared.paymentIntent ?? "",
             "levelIndicator": 1,
+            "payment_method": "ach"
         ]
         
+        // ✅ Only for logged-in users
+        if UserStoreSingleton.shared.isLoggedIn == true {
+            let emailText = txtFieldEmailAccountView.text
+            let emailPrefix = emailText.components(separatedBy: "@").first ?? ""
+            
+            params["save_account"] = 1
+            
+            if let customerId = UserStoreSingleton.shared.customerId, !customerId.isEmpty {
+                params["customer"] = customerId
+            } else {
+                params["username"] = emailPrefix
+            }
+            
+            if UserStoreSingleton.shared.customerId == nil {
+                params["create_customer"] = "1"
+            }
+        }
+        
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
             if let recurringType = req.recurringStartDateType, recurringType == .custom {
@@ -7115,6 +7420,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             params["interval"] = txtFieldSelectPlanViewBankFields.text.lowercased()
         }
         
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
+        
         print(params)
         
         do {
@@ -7166,7 +7476,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         paymentDoneVC.bankPaymentParams = params
                                         paymentDoneVC.request = self.request
                                         // Pass billingInfo and additionalInfo
-                                        if let billingData = self.request.billingInfoData,
+                                        if let billingData = self.request.fields,
                                            let billingInfoDict = try? JSONSerialization.jsonObject(with: billingData, options: []) as? [String: Any] {
                                             
                                             // Extract main billing fields
@@ -7253,9 +7563,28 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "payment_mode": "auth_and_capture",
             "payment_intent": UserStoreSingleton.shared.paymentIntent ?? "",
             "levelIndicator": 1,
+            "payment_method": "ach"
         ]
         
-        if let billingInfoData = request.billingInfoData {
+        // ✅ Only for logged-in users
+        if UserStoreSingleton.shared.isLoggedIn == true {
+            let emailText = txtFieldEmailAccountView.text
+            let emailPrefix = emailText.components(separatedBy: "@").first ?? ""
+            
+            params["save_account"] = 1
+            
+            if let customerId = UserStoreSingleton.shared.customerId, !customerId.isEmpty {
+                params["customer"] = customerId
+            } else {
+                params["username"] = emailPrefix
+            }
+            
+            if UserStoreSingleton.shared.customerId == nil {
+                params["create_customer"] = "1"
+            }
+        }
+        
+        if let billingInfoData = request.fields {
             do {
                 let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
                 
@@ -7340,6 +7669,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             params["interval"] = txtFieldSelectPlanViewBankFields.text.lowercased()
         }
         
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
+        
         print(params)
         
         do {
@@ -7391,7 +7725,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         paymentDoneVC.bankPaymentParams = params
                                         paymentDoneVC.request = self.request
                                         // Pass billing info and additional info if available
-                                        if let billingInfoData = self.request.billingInfoData,
+                                        if let billingInfoData = self.request.fields,
                                            let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
                                             
                                             // Filter billing info: only include non-empty values
@@ -7493,6 +7827,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             params["interval"] = txtFieldSelectPlanSingleSavedBankView.text.lowercased()
         }
         
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
+        
         print(params)
         
         do {
@@ -7544,7 +7883,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         paymentDoneVC.bankPaymentParams = params
                                         paymentDoneVC.request = self.request
                                         // Pass billingInfo and additionalInfo
-                                        if let billingData = self.request.billingInfoData,
+                                        if let billingData = self.request.fields,
                                            let billingInfoDict = try? JSONSerialization.jsonObject(with: billingData, options: []) as? [String: Any] {
                                             
                                             // Extract main billing fields
@@ -7630,7 +7969,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "email": UserStoreSingleton.shared.verificationEmail ?? ""
         ]
         
-        if let billingInfoData = request.billingInfoData {
+        if let billingInfoData = request.fields {
             do {
                 let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
                 
@@ -7715,6 +8054,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             params["interval"] = txtFieldSelectPlanSingleSavedBankView.text.lowercased()
         }
         
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
+        
         print(params)
         
         do {
@@ -7766,7 +8110,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         paymentDoneVC.bankPaymentParams = params
                                         paymentDoneVC.request = self.request
                                         // Pass billing info and additional info if available
-                                        if let billingInfoData = self.request.billingInfoData,
+                                        if let billingInfoData = self.request.fields,
                                            let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
                                             
                                             // Filter billing info: only include non-empty values
@@ -7842,7 +8186,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         let accountNumber = txtFieldAccountNumberNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         
         var params: [String: Any] = [
-           // "name": accountName,
+            // "name": accountName,
             "name": !(request.name?.isEmpty ?? true) ? request.name! : (accountName),
             "email": UserStoreSingleton.shared.verificationEmail ?? "",
             "description": "Test Description",
@@ -7878,6 +8222,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             params["interval"] = txtFieldSelectPlanNewAccountView.text.lowercased()
         }
         
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
+        
         print(params)
         
         do {
@@ -7929,7 +8278,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         paymentDoneVC.bankPaymentParams = params
                                         paymentDoneVC.request = self.request
                                         // Pass billingInfo and additionalInfo
-                                        if let billingData = self.request.billingInfoData,
+                                        if let billingData = self.request.fields,
                                            let billingInfoDict = try? JSONSerialization.jsonObject(with: billingData, options: []) as? [String: Any] {
                                             
                                             // Extract main billing fields
@@ -8024,7 +8373,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "levelIndicator": 1,
         ]
         
-        if let billingInfoData = request.billingInfoData {
+        if let billingInfoData = request.fields {
             do {
                 let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
                 
@@ -8109,6 +8458,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             params["interval"] = txtFieldSelectPlanNewAccountView.text.lowercased()
         }
         
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
+        
         print(params)
         
         do {
@@ -8160,7 +8514,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         paymentDoneVC.bankPaymentParams = params
                                         paymentDoneVC.request = self.request
                                         // Pass billing info and additional info if available
-                                        if let billingInfoData = self.request.billingInfoData,
+                                        if let billingInfoData = self.request.fields,
                                            let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
                                             
                                             // Filter billing info: only include non-empty values
@@ -8282,6 +8636,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             params["interval"] = txtFieldSelectPlanNewAccountView.text.lowercased()
         }
         
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
+        
         print(params)
         
         do {
@@ -8332,7 +8691,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         paymentDoneVC.bankPaymentParams = params
                                         paymentDoneVC.request = self.request
                                         // Pass billingInfo and additionalInfo
-                                        if let billingData = self.request.billingInfoData,
+                                        if let billingData = self.request.fields,
                                            let billingInfoDict = try? JSONSerialization.jsonObject(with: billingData, options: []) as? [String: Any] {
                                             
                                             // Extract main billing fields
@@ -8476,22 +8835,22 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             return
         }
         
-        var request = URLRequest(url: serviceURL)
-        request.httpMethod = "POST"
-        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        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")")
-        request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        urlRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
         // Add API headers
         if let apiKey = EnvironmentConfig.apiKey,
            let apiSecret = EnvironmentConfig.apiSecret {
-            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+            urlRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            urlRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
         }
         
-        let params: [String: Any] = [
+        var params: [String: Any] = [
             "name": UserStoreSingleton.shared.merchantName ?? "",
             "email": UserStoreSingleton.shared.merchantEmail ?? "",
             "description": "Payment checkout",
@@ -8502,11 +8861,16 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "callback_url": "https://stage-api.stage-easymerchant.io/webhook/crypto"
         ]
         
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
+        
         print(params)
         
         do {
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
-            request.httpBody = jsonData
+            urlRequest.httpBody = jsonData
             if let jsonString = String(data: jsonData, encoding: .utf8) {
                 print("JSON Payload: \(jsonString)")
             }
@@ -8517,7 +8881,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
         
         let session = URLSession.shared
-        let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
+        let task = session.dataTask(with: urlRequest) { (serviceData, serviceResponse, error) in
             
             DispatchQueue.main.async {
                 self.hideLoadingIndicator() // Stop loader when response is received
@@ -8719,7 +9083,29 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "tokenize": request.tokenOnly ?? false,
         ]
         
-        if let billingInfoData = request.billingInfoData {
+        // ✅ Only for logged-in users
+        if UserStoreSingleton.shared.isLoggedIn == true {
+            let emailText = txtFieldEmailCardView.text
+            let emailPrefix = emailText.components(separatedBy: "@").first ?? ""
+            
+            params["save_card"] = 1
+            params["is_default"] = "1"
+            params["tokenize"] = request.tokenOnly ?? ""
+            params["username"] = emailPrefix
+            
+            if let customerId = UserStoreSingleton.shared.customerId {
+                params["customer"] = customerId
+                params["customer_id"] = customerId
+            } else {
+                params["create_customer"] = "1"
+            }
+            
+            if UserStoreSingleton.shared.customerId == nil {
+                params["create_customer"] = "1"
+            }
+        }
+        
+        if let billingInfoData = request.fields {
             do {
                 let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
                 
@@ -8857,7 +9243,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         paymentDoneVC.cardApiParams = params
                                         paymentDoneVC.request = self.request
                                         // Pass billing info and additional info if available
-                                        if let billingInfoData = self.request.billingInfoData,
+                                        if let billingInfoData = self.request.fields,
                                            let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
                                             
                                             // Filter billing info: only include non-empty values
@@ -9013,7 +9399,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             params["is_default"] = "1"
         }
         
-        if let billingInfoData = request.billingInfoData {
+        if let billingInfoData = request.fields {
             do {
                 let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
                 
@@ -9149,7 +9535,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         paymentDoneVC.cardApiParams = params
                                         paymentDoneVC.request = self.request
                                         // Pass billing info and additional info if available
-                                        if let billingInfoData = self.request.billingInfoData,
+                                        if let billingInfoData = self.request.fields,
                                            let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
                                             
                                             // Filter billing info: only include non-empty values
@@ -9425,13 +9811,12 @@ extension PaymentInfoVC: UICollectionViewDelegate, UICollectionViewDataSource, U
                     }
                     
                 }
-                
             } else {
                 self.lblBtnShowSaveCard.text = "Show Saved Account"
                 self.viewCardFields.isHidden = true
                 self.viewChangeCard.isHidden = true
                 self.viewAddNewCard.isHidden = true
-                //                self.viewBtnShowSavedCards.isHidden = false
+                // self.viewBtnShowSavedCards.isHidden = false
                 
                 if request?.authenticatedACH == true {
                     self.viewBankFields.isHidden = true