@jimrising/easymerchantsdk-react-native 2.0.4 → 2.0.7

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

@@ -610,6 +610,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             }
         }
         
+        print(request.metadata ?? "")
     }
     
     //MARK: - View Wiil Appear
@@ -1810,17 +1811,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         txtFieldSelectDateNewCardView.textField.becomeFirstResponder()
     }
     
-//    @IBAction func actionBtnSelectPlanViewBankFields(_ sender: UIButton) {
-//        guard let plans = request?.recurringIntervals, !plans.isEmpty else {
-//            print("No recurring intervals available.")
-//            return
-//        }
-//        
-//        PlanSelector.presentPlanOptions(from: self, sourceView: sender, allowedPlans: plans) { selectedPlan in
-//            self.txtFieldSelectPlanViewBankFields.text = selectedPlan
-//        }
-//    }
-    
     @IBAction func actionBtnSelectPlanViewBankFields(_ sender: UIButton) {
         guard var plans = request?.recurringIntervals, !plans.isEmpty else {
             print("No recurring intervals available.")
@@ -2054,7 +2044,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         billingInfoVC.isFrom = "SavedCards"
                         billingInfoVC.selectedCard = self.selectedCard // Passing the selected card data
                         billingInfoVC.cvvText = cvvText // Passing the CVV text
-                        //                        billingInfoVC.amount = Int(self.request.amount ?? 0)
+                        // billingInfoVC.amount = Int(self.request.amount ?? 0)
                         billingInfoVC.amount = Double(self.request.amount ?? 0)
                         billingInfoVC.selectedPaymentMethod = self.selectedPaymentMethod
                         
@@ -2783,7 +2773,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                 
                                 if !showBilling && !showAdditional {
                                     // Navigate directly to EmailVerificationVC
-                                    //                                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! 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
@@ -2853,7 +2843,7 @@ 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: "EmailVerificationVC") as! EmailVerificationVC
                     let vc = easymerchantsdk.instantiateViewController(withIdentifier: "OTPVerificationVC") as! OTPVerificationVC
                     vc.easyPayDelegate = self.easyPayDelegate
                     vc.grailPayAccountID = self.grailPayAccountID
@@ -4392,7 +4382,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     
     // Function to navigate to EmailVerificationVC
     func navigateCardDataToEmailVerificationVC() {
-        //        if let emailVerificationVC = storyboard?.instantiateViewController(withIdentifier: "EmailVerificationVC") as? EmailVerificationVC {
+        // if let emailVerificationVC = storyboard?.instantiateViewController(withIdentifier: "EmailVerificationVC") as? EmailVerificationVC {
         if let emailVerificationVC = storyboard?.instantiateViewController(withIdentifier: "OTPVerificationVC") as? OTPVerificationVC {
             if let billingInfoData = request.billingInfoData {
                 do {
@@ -4426,7 +4416,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     func navigateBankDataToEmailVerificationVC() {
-        //        if let emailVerificationVC = storyboard?.instantiateViewController(withIdentifier: "EmailVerificationVC") as? EmailVerificationVC {
+        // if let emailVerificationVC = storyboard?.instantiateViewController(withIdentifier: "EmailVerificationVC") as? EmailVerificationVC {
         if let emailVerificationVC = storyboard?.instantiateViewController(withIdentifier: "OTPVerificationVC") as? OTPVerificationVC {
             if let billingInfoData = request.billingInfoData {
                 do {
@@ -4467,9 +4457,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     
     func logOut() {
         DispatchQueue.main.async {
-            print("isLoggedIn before clear: \(UserStoreSingleton.shared.isLoggedIn ?? false)")
+            // print("isLoggedIn before clear: \(UserStoreSingleton.shared.isLoggedIn ?? false)")
             UserStoreSingleton.shared.clearUserData()
-            print("isLoggedIn after clear: \(UserStoreSingleton.shared.isLoggedIn ?? false)")
+            // print("isLoggedIn after clear: \(UserStoreSingleton.shared.isLoggedIn ?? false)")
             
             UserStoreSingleton.shared.isLoggedIn = false
             self.settingsView.isHidden = true
@@ -5396,12 +5386,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         let task = session.dataTask(with: uRLRequest) { [weak self] (data, response, error) in
             guard let self = self else { return }
             
-            //            defer {
-            //                DispatchQueue.main.async {
-            //                    self.hideLoadingIndicator()
-            //                }
-            //            }
-            
             if let error = error {
                 print("❌ Error in getShowCardsApi: \(error.localizedDescription)")
                 if let httpResponse = response as? HTTPURLResponse {
@@ -5520,172 +5504,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         task.resume()
     }
     
-    // MARK: - Credit Card Charge Api If Billing info is nil and Without Login.
-    //    func paymentIntentApi() {
-    //        showLoadingIndicator()
-    //
-    //        ///Old Using URL Endpoints
-    //        // let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.creditCharges.path()
-    //
-    //        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.charges.path()
-    //
-    //        guard let serviceURL = URL(string: fullURL) else {
-    //            print("Invalid URL")
-    //            hideLoadingIndicator()
-    //            return
-    //        }
-    //
-    //        var uRLRequest = URLRequest(url: serviceURL)
-    //        uRLRequest.httpMethod = "POST"
-    //        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
-    //
-    //        let token = UserStoreSingleton.shared.clientToken
-    //        print("Setting clientToken header: \(token ?? "None")")
-    //        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
-    //
-    //        // Add API headers
-    //        if let apiKey = EnvironmentConfig.apiKey,
-    //           let apiSecret = EnvironmentConfig.apiSecret {
-    //            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-    //            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
-    //        }
-    //
-    //        var params: [String: Any] = [
-    //            "name": cardNameTextField.text,
-    ////            "email": UserStoreSingleton.shared.merchantEmail ?? "",
-    //            "email": txtFieldEmailCardView.text,
-    //            "card_number": cardNumberTextField.text.replacingOccurrences(of: " ", with: ""),
-    //            "cardholder_name": cardNameTextField.text,
-    //            "exp_month": cardExpiryTextField.text.components(separatedBy: "/").first ?? "",
-    //            "exp_year": cardExpiryTextField.text.components(separatedBy: "/").last ?? "",
-    //            "cvc": cardCvvTextField.text,
-    //            "description": "payment checkout",
-    //            "currency": "usd"
-    //            // "payment_method": "card"
-    //        ]
-    //
-    //        // 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 = txtFieldStartDateCard?.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"] = txtFieldChosePlanCard.text.lowercased()
-    //        }
-    //
-    //        print(params)
-    //
-    //        do {
-    //            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
-    //            uRLRequest.httpBody = jsonData
-    //            if let jsonString = String(data: jsonData, encoding: .utf8) {
-    //                print("JSON Payload: \(jsonString)")
-    //            }
-    //        } catch let error {
-    //            print("Error creating JSON data: \(error)")
-    //            hideLoadingIndicator()
-    //            return
-    //        }
-    //
-    //        let session = URLSession.shared
-    //        let task = session.dataTask(with: uRLRequest) { (serviceData, serviceResponse, error) in
-    //
-    //            DispatchQueue.main.async {
-    //                self.hideLoadingIndicator() // Stop loader when response is received
-    //            }
-    //
-    //            if let error = error {
-    //                print("Error: \(error.localizedDescription)")
-    //                return
-    //            }
-    //
-    //            guard let httpResponse = serviceResponse as? HTTPURLResponse else {
-    //                print("Invalid response")
-    //                return
-    //            }
-    //
-    //            if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
-    //                if let data = serviceData {
-    //                    do {
-    //                        if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
-    //                            print("Response Data: \(responseObject)")
-    //
-    //                            // Check if status is 0 and handle the error
-    //                            if let status = responseObject["status"] as? Int, status == 0 {
-    //                                let errorMessage = responseObject["message"] as? String ?? "Unknown error"
-    //                                self.presentPaymentErrorVC(errorMessage: errorMessage)
-    //                            } else {
-    //                                DispatchQueue.main.async {
-    //                                    if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
-    //                                        paymentDoneVC.chargeData = responseObject
-    //                                        paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
-    //                                        paymentDoneVC.easyPayDelegate = self.easyPayDelegate
-    //
-    //                                        // Pass billingInfo and additionalInfo
-    //                                        if let billingData = self.request.billingInfoData,
-    //                                           let billingInfoDict = try? JSONSerialization.jsonObject(with: billingData, options: []) as? [String: Any] {
-    //
-    //                                            // Extract main billing fields
-    //                                            let cleanBillingInfo: [String: Any] = [
-    //                                                "postal_code": billingInfoDict["postal_code"] ?? "",
-    //                                                "country": billingInfoDict["country"] ?? "",
-    //                                                "city": billingInfoDict["city"] ?? "",
-    //                                                "address": billingInfoDict["address"] ?? "",
-    //                                                "state": billingInfoDict["state"] ?? ""
-    //                                            ]
-    //                                            paymentDoneVC.billingInfo = cleanBillingInfo
-    //
-    //                                            // Extract additional_info
-    //                                            if let additional = billingInfoDict["additional_info"] as? [String: Any] {
-    //                                                let cleanAdditionalInfo: [String: Any] = [
-    //                                                    "email": additional["email"] ?? "",
-    //                                                    "phone_number": additional["phone_number"] ?? "",
-    //                                                    "name": additional["name"] ?? "",
-    //                                                    "country_code": additional["country_code"] ?? ""
-    //                                                ]
-    //                                                paymentDoneVC.additionalInfo = cleanAdditionalInfo
-    //                                            }
-    //                                        }
-    //                                        self.navigationController?.pushViewController(paymentDoneVC, animated: true)
-    //                                    }
-    //                                }
-    //                            }
-    //                        } else {
-    //                            self.presentPaymentErrorVC(errorMessage: "Invalid JSON format")
-    //                        }
-    //                    } catch let jsonError {
-    //                        self.presentPaymentErrorVC(errorMessage: "Error parsing JSON: \(jsonError)")
-    //                    }
-    //                } else {
-    //                    self.presentPaymentErrorVC(errorMessage: "No data received")
-    //                }
-    //            } else {
-    //                if let data = serviceData,
-    //                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
-    //                   let message = responseObj["message"] as? String {
-    //                    self.presentPaymentErrorVC(errorMessage: message)
-    //                } else {
-    //                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
-    //                }
-    //            }
-    //        }
-    //        task.resume()
-    //    }
-    
     // MARK: - Credit Card Charge Api If Billing info is nil and Without Login.
     func paymentIntentApi() {
         showLoadingIndicator()
@@ -5723,6 +5541,18 @@ 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
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            for (key, value) in metadata {
+                requestBody[key] = value
+            }
+        }
+        
         print("Request Body: \(requestBody)")
         
         let request = APIRequest(
@@ -5789,214 +5619,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
     }
     
-    // MARK: - Credit Card Charge Api if billing info is available but visibility of billing and additinal is false
-    //    func paymentIntentCardApi() {
-    //        showLoadingIndicator()
-    //
-    //        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.charges.path()
-    //
-    //        guard let serviceURL = URL(string: fullURL) else {
-    //            print("Invalid URL")
-    //            hideLoadingIndicator()
-    //            return
-    //        }
-    //
-    //        var urlRequest = URLRequest(url: serviceURL)
-    //        urlRequest.httpMethod = "POST"
-    //        urlRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
-    //
-    //        let token = UserStoreSingleton.shared.clientToken
-    //        print("Setting clientToken header: \(token ?? "None")")
-    //        urlRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
-    //
-    //        var params: [String: Any] = [
-    //            "name": cardNameTextField.text,
-    //            "email": txtFieldEmailCardView.text,
-    //            "card_number": cardNumberTextField.text.replacingOccurrences(of: " ", with: ""),
-    //            "cardholder_name": cardNameTextField.text,
-    //            "exp_month": cardExpiryTextField.text.components(separatedBy: "/").first ?? "",
-    //            "exp_year": cardExpiryTextField.text.components(separatedBy: "/").last ?? "",
-    //            "cvc": cardCvvTextField.text,
-    //            "currency": "usd"
-    //        ]
-    //
-    //        if let billingInfoData = request.billingInfoData {
-    //            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 = txtFieldStartDateCard?.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"] = txtFieldChosePlanCard.text.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()
-    //            }
-    //
-    //            if let error = error {
-    //                print("Error: \(error.localizedDescription)")
-    //                self.presentPaymentErrorVC(errorMessage: error.localizedDescription)
-    //                return
-    //            }
-    //
-    //            guard let httpResponse = serviceResponse as? HTTPURLResponse else {
-    //                print("Invalid response")
-    //                self.presentPaymentErrorVC(errorMessage: "Invalid response from server.")
-    //                return
-    //            }
-    //
-    //            if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
-    //                if let data = serviceData {
-    //                    do {
-    //                        if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
-    //                            print("Response Data: \(responseObject)")
-    //
-    //                            if let status = responseObject["status"] as? Int, status == 0 {
-    //                                let errorMessage = responseObject["message"] as? String ?? "Unknown error occurred."
-    //                                self.presentPaymentErrorVC(errorMessage: errorMessage)
-    //                            } else {
-    //                                DispatchQueue.main.async {
-    //                                    if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
-    //                                        paymentDoneVC.chargeData = responseObject
-    //                                        paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
-    //                                        paymentDoneVC.easyPayDelegate = self.easyPayDelegate
-    //                                        // Pass billing info and additional info if available
-    //                                        if let billingInfoData = self.request.billingInfoData,
-    //                                           let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
-    //
-    //                                            // Filter billing info: only include non-empty values
-    //                                            let filteredBilling = fieldSection.billing.filter { !($0.value.trimmingCharacters(in: .whitespaces).isEmpty) }
-    //                                            paymentDoneVC.billingInfoData = filteredBilling
-    //                                            var billingDict: [String: Any] = [:]
-    //                                            filteredBilling.forEach { billingDict[$0.name] = $0.value }
-    //                                            paymentDoneVC.billingInfo = billingDict
-    //
-    //                                            // Filter additional info: only include non-empty values
-    //                                            let filteredAdditional = fieldSection.additional.filter { !($0.value.trimmingCharacters(in: .whitespaces).isEmpty) }
-    //                                            paymentDoneVC.additionalInfoData = filteredAdditional
-    //                                            var additionalDict: [String: Any] = [:]
-    //                                            filteredAdditional.forEach { additionalDict[$0.name] = $0.value }
-    //                                            paymentDoneVC.additionalInfo = additionalDict
-    //                                        }
-    //                                        self.navigationController?.pushViewController(paymentDoneVC, animated: true)
-    //                                    }
-    //                                }
-    //                            }
-    //                        } else {
-    //                            self.presentPaymentErrorVC(errorMessage: "Invalid JSON format")
-    //                        }
-    //                    } catch let jsonError {
-    //                        self.presentPaymentErrorVC(errorMessage: "Error parsing response: \(jsonError.localizedDescription)")
-    //                    }
-    //                } else {
-    //                    self.presentPaymentErrorVC(errorMessage: "No data received from server.")
-    //                }
-    //            } else {
-    //                if let data = serviceData,
-    //                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
-    //                   let message = responseObj["message"] as? String {
-    //                    self.presentPaymentErrorVC(errorMessage: message)
-    //                } else {
-    //                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
-    //                }
-    //            }
-    //        }
-    //        task.resume()
-    //    }
-    
     // MARK: - Credit Card Charge Api if billing info is available but visibility of billing and additinal is false
     func paymentIntentCardApi() {
         showLoadingIndicator()
@@ -6097,6 +5719,18 @@ 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
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            for (key, value) in metadata {
+                params[key] = value
+            }
+        }
+        
         print(params)
         
         let request = APIRequest(
@@ -6157,168 +5791,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
     }
     
-    // MARK: - Credit Card Charge API (Saved Cards, No Billing Info, Logged In)
-    //    func paymentIntentFromShowSavedCardApi() {
-    //        showLoadingIndicator()
-    //
-    //        ///Old Using URL Endpoints
-    //        // let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.creditCharges.path()
-    //
-    //        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.charges.path()
-    //
-    //        guard let serviceURL = URL(string: fullURL) else {
-    //            print("Invalid URL")
-    //            hideLoadingIndicator()
-    //            return
-    //        }
-    //
-    //        var uRLRequest = URLRequest(url: serviceURL)
-    //        uRLRequest.httpMethod = "POST"
-    //        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
-    //
-    //        // Add client token
-    //        let token = UserStoreSingleton.shared.clientToken
-    //        print("Setting clientToken header: \(token ?? "None")")
-    //        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
-    //
-    //        // Add API headers
-    //        if let apiKey = EnvironmentConfig.apiKey,
-    //           let apiSecret = EnvironmentConfig.apiSecret {
-    //            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-    //            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
-    //        }
-    //
-    //        var params: [String: Any] = [
-    //            "description": "payment checkout",
-    //            "currency": "usd",
-    //            "card_id": selectedCard?.cardId ?? "",
-    //            "cvc": txtFieldCVVSingleSavedCard.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? "",
-    //            "customer_id": selectedCard?.customerId ?? "",
-    //            "name": UserStoreSingleton.shared.merchantName ?? "",
-    //            "email": UserStoreSingleton.shared.verificationEmail ?? ""
-    //        ]
-    //
-    //        // 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 = txtFieldSelectDateSingleSavedCard?.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"] = txtFieldSelectPlanSingleSavedCard.text.lowercased()
-    //        }
-    //
-    //        print("Request Params: \(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 {
-    //            print("Error creating JSON data: \(error)")
-    //            hideLoadingIndicator()
-    //            return
-    //        }
-    //
-    //        // API Call
-    //        let task = URLSession.shared.dataTask(with: uRLRequest) { (data, response, error) in
-    //            DispatchQueue.main.async {
-    //                self.hideLoadingIndicator()
-    //            }
-    //
-    //            if let error = error {
-    //                print("Error: \(error.localizedDescription)")
-    //                return
-    //            }
-    //
-    //            guard let httpResponse = response as? HTTPURLResponse else {
-    //                print("Invalid response")
-    //                return
-    //            }
-    //
-    //            if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
-    //                if let data = data {
-    //                    do {
-    //                        if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
-    //                            print("Response Data: \(responseObject)")
-    //
-    //                            if let status = responseObject["status"] as? Int, status == 0 {
-    //                                let errorMessage = responseObject["message"] as? String ?? "Unknown error"
-    //                                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 billingInfo and additionalInfo
-    //                                        if let billingData = self.request.billingInfoData,
-    //                                           let billingInfoDict = try? JSONSerialization.jsonObject(with: billingData, options: []) as? [String: Any] {
-    //
-    //                                            // Extract main billing fields
-    //                                            let cleanBillingInfo: [String: Any] = [
-    //                                                "postal_code": billingInfoDict["postal_code"] ?? "",
-    //                                                "country": billingInfoDict["country"] ?? "",
-    //                                                "city": billingInfoDict["city"] ?? "",
-    //                                                "address": billingInfoDict["address"] ?? "",
-    //                                                "state": billingInfoDict["state"] ?? ""
-    //                                            ]
-    //                                            paymentDoneVC.billingInfo = cleanBillingInfo
-    //
-    //                                            // Extract additional_info
-    //                                            if let additional = billingInfoDict["additional_info"] as? [String: Any] {
-    //                                                let cleanAdditionalInfo: [String: Any] = [
-    //                                                    "email": additional["email"] ?? "",
-    //                                                    "phone_number": additional["phone_number"] ?? "",
-    //                                                    "name": additional["name"] ?? "",
-    //                                                    "country_code": additional["country_code"] ?? ""
-    //                                                ]
-    //                                                paymentDoneVC.additionalInfo = cleanAdditionalInfo
-    //                                            }
-    //                                        }
-    //                                        self.navigationController?.pushViewController(paymentDoneVC, animated: true)
-    //                                    }
-    //                                }
-    //                            }
-    //                        } else {
-    //                            self.presentPaymentErrorVC(errorMessage: "Invalid JSON format")
-    //                        }
-    //                    } catch {
-    //                        self.presentPaymentErrorVC(errorMessage: "Error parsing JSON: \(error)")
-    //                    }
-    //                } else {
-    //                    self.presentPaymentErrorVC(errorMessage: "No data received")
-    //                }
-    //            } else {
-    //                if let data = data,
-    //                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
-    //                   let message = responseObj["message"] as? String {
-    //                    self.presentPaymentErrorVC(errorMessage: message)
-    //                } else {
-    //                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
-    //                }
-    //            }
-    //        }
-    //        task.resume()
-    //    }
-    
     // MARK: - Credit Card Charge API (Saved Cards, No Billing Info, Logged In)
     func paymentIntentFromShowSavedCardApi() {
         showLoadingIndicator()
@@ -6356,6 +5828,18 @@ 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
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            for (key, value) in metadata {
+                params[key] = value
+            }
+        }
+        
         print("Request Params: \(params)")
         
         let request = APIRequest(
@@ -6539,6 +6023,18 @@ 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
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            for (key, value) in metadata {
+                params[key] = value
+            }
+        }
+        
         print(params)
         
         do {
@@ -7015,6 +6511,18 @@ 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
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            for (key, value) in metadata {
+                params[key] = value
+            }
+        }
+        
         print(params)
         
         do {
@@ -7735,7 +7243,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
         
         var params: [String: Any] = [
-            "name": txtFieldAccountName.text ?? "",
+            "name": !(request.name?.isEmpty ?? true) ? request.name! : (txtFieldAccountName.text ?? ""),
             "email": txtFieldEmailAccountView.text,
             "description": "TestDescription",
             "currency": "usd",
@@ -8334,7 +7842,8 @@ 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",
             "currency": "usd",
@@ -8503,7 +8012,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         let accountNumber = txtFieldAccountNumberNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         
         var params: [String: Any] = [
-            "name": accountName,
+            "name": !(request.name?.isEmpty ?? true) ? request.name! : (accountName),
             "email": UserStoreSingleton.shared.verificationEmail ?? "",
             "description": "Test Description",
             "currency": "usd",
@@ -8730,7 +8239,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         let emailPrefix = UserStoreSingleton.shared.verificationEmail?.components(separatedBy: "@").first ?? ""
         
         var params: [String: Any] = [
-            "name": accountName,
+            "name": !(request.name?.isEmpty ?? true) ? request.name! : (accountName),
             "email": UserStoreSingleton.shared.verificationEmail ?? "",
             "description": "Test Description",
             "currency": "usd",