@jimrising/easymerchantsdk-react-native 1.4.3 → 1.4.5

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

@@ -363,7 +363,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     var isFrom = String()
     
     //Blink Card
-  //  var blinkCardRecognizer: MBCBlinkCardRecognizer!
+//    var blinkCardRecognizer: MBCBlinkCardRecognizer!
     
     // Variables for Card Scanning Data Back
     var cardNumber: String?
@@ -1931,8 +1931,62 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     }
                     
                     // Redirect based on billing visibility
-                    if fieldSection.visibility.billing {
-                        // Instantiate BillingInfoVC and pass the selected card data and CVV text
+//                    if fieldSection.visibility.billing {
+//                        // Instantiate BillingInfoVC and pass the selected card data and CVV text
+//                        let billingInfoVC = UIStoryboard(name: "easymerchantsdk", bundle: .easyPayBundle).instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
+//                        
+//                        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.selectedPaymentMethod = self.selectedPaymentMethod
+//                        
+//                        if let billingInfoData = self.request.billingInfoData {
+//                            billingInfoVC.billingInfoData = billingInfoData
+//                        }
+//                        
+//                        billingInfoVC.request = self.request
+//                        billingInfoVC.chosenPlan = self.txtFieldSelectPlanSingleSavedCard.text
+//                        billingInfoVC.startDate = self.txtFieldSelectDateSingleSavedCard.text
+//                        
+//                        billingInfoVC.billingInfo = fieldSection.billing
+//                        billingInfoVC.additionalInfo = fieldSection.additional
+//                        billingInfoVC.visibility = fieldSection.visibility
+//                        
+//                        // Navigate to BillingInfoVC
+//                        self.navigationController?.pushViewController(billingInfoVC, animated: true)
+//                    }
+//                    else {
+//                        let additionalInfoVC = UIStoryboard(name: "easymerchantsdk", bundle: .easyPayBundle).instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
+//                        additionalInfoVC.isFrom = "SavedCards"
+//                        additionalInfoVC.selectedCard = self.selectedCard // Passing the selected card data
+//                        additionalInfoVC.cvvText = cvvText // Passing the CVV text
+//                        additionalInfoVC.amount = Int(self.request.amount ?? 0)
+//                        additionalInfoVC.selectedPaymentMethod = self.selectedPaymentMethod
+//                        
+//                        if let billingInfoData = self.request.billingInfoData {
+//                            additionalInfoVC.billingInfoData = billingInfoData
+//                        }
+//                        
+//                        additionalInfoVC.request = self.request
+//                        additionalInfoVC.chosenPlan = self.txtFieldSelectPlanSingleSavedCard.text
+//                        additionalInfoVC.startDate = self.txtFieldSelectDateSingleSavedCard.text
+//                        
+//                        additionalInfoVC.billingInfo = fieldSection.billing
+//                        additionalInfoVC.additionalInfo = fieldSection.additional
+//                        additionalInfoVC.visibility = fieldSection.visibility
+//                        
+//                        self.navigationController?.pushViewController(additionalInfoVC, animated: true)
+//                    }
+                    
+                    let showBilling = fieldSection.visibility.billing
+                    let showAdditional = fieldSection.visibility.additional
+
+                    if !showBilling && !showAdditional {
+                        self.paymentIntentFromShowCardApi()
+                    }
+                    else if showBilling {
+                        // Push to BillingInfoVC
                         let billingInfoVC = UIStoryboard(name: "easymerchantsdk", bundle: .easyPayBundle).instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
                         
                         billingInfoVC.isFrom = "SavedCards"
@@ -1957,6 +2011,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         self.navigationController?.pushViewController(billingInfoVC, animated: true)
                     }
                     else {
+                        // Push to AdditionalInfoVC
                         let additionalInfoVC = UIStoryboard(name: "easymerchantsdk", bundle: .easyPayBundle).instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
                         additionalInfoVC.isFrom = "SavedCards"
                         additionalInfoVC.selectedCard = self.selectedCard // Passing the selected card data
@@ -1978,6 +2033,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         
                         self.navigationController?.pushViewController(additionalInfoVC, animated: true)
                     }
+
                 }
             }
             catch {
@@ -2193,9 +2249,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         
                         let showBilling = fieldSection.visibility.billing
                         let showAdditional = fieldSection.visibility.additional
-
+                        
                         if !showBilling && !showAdditional {
-                            self.threeDSecurePaymentNewCardApi(customerId: UserStoreSingleton.shared.customerId ?? "")
+                            if self.request.secureAuthentication == true {
+                                self.threeDSecurePaymentNewCardApi(customerId: UserStoreSingleton.shared.customerId ?? "")
+                            } else {
+                                self.paymentIntentAddNewCardApi(customerId: UserStoreSingleton.shared.customerId)
+                            }
                         }
                         else if showBilling {
                             // Push to BillingInfoVC
@@ -2751,7 +2811,8 @@ 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
                                     vc.selectedGrailPayAccountType = self.selectedGrailPayAccountType
@@ -2766,6 +2827,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                     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 {
@@ -2819,7 +2882,8 @@ 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
                     vc.selectedGrailPayAccountType = self.selectedGrailPayAccountType
@@ -2829,7 +2893,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     vc.request = self.request
                     vc.isSavedForFuture = self.isSavedForFuture
                     vc.selectedPaymentMethod = "GrailPay"
-                    vc.userEmail = self.txtFieldEmailGrailPayView.text
+                    vc.email = self.txtFieldEmailGrailPayView.text
+                    vc.amount = self.amount
                     self.navigationController?.pushViewController(vc, animated: true)
                 }
             } else {
@@ -4113,7 +4178,15 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         let showAdditional = fieldSection.visibility.additional
 
                         if !showBilling && !showAdditional {
-                            self.threeDSecurePaymentApi()
+                            if self.isSavedForFuture {
+                                self.navigateCardDataToEmailVerificationVC()
+                            } else {
+                                if self.request.secureAuthentication == true {
+                                    self.threeDSecurePaymentApi()
+                                } else {
+                                    self.paymentIntentCardApi()
+                                }
+                            }
                         }
                         else if showBilling {
                             // Push to BillingInfoVC
@@ -4444,7 +4517,8 @@ 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 {
                     let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
@@ -4463,6 +4537,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     emailVerificationVC.request = self.request
                     emailVerificationVC.chosenPlan = self.txtFieldChosePlanCard.text
                     emailVerificationVC.startDate = self.txtFieldStartDateCard.text
+                    emailVerificationVC.userEmail = self.txtFieldEmailCardView.text
+                    emailVerificationVC.email = self.txtFieldEmailCardView.text
+                    emailVerificationVC.amount = self.amount
                 }
                 catch {
                     print("Failed to decode billingInfoData: \(error.localizedDescription)")
@@ -4472,7 +4549,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             self.navigationController?.pushViewController(emailVerificationVC, animated: true)
         }
     }
-    
+        
     func navigateBankDataToEmailVerificationVC() {
         if let emailVerificationVC = storyboard?.instantiateViewController(withIdentifier: "EmailVerificationVC") as? EmailVerificationVC {
             if let billingInfoData = request.billingInfoData {
@@ -4493,6 +4570,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     emailVerificationVC.chosenPlan = self.txtFieldSelectPlanViewBankFields.text
                     emailVerificationVC.startDate = self.txtFieldSelectDateViewBankFields.text
                     emailVerificationVC.request = self.request
+                    emailVerificationVC.userEmail = self.txtFieldEmailAccountView.text
                 }
                 catch {
                     print("Failed to decode billingInfoData: \(error.localizedDescription)")
@@ -5755,6 +5833,214 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         task.resume()
     }
     
+    // 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": UserStoreSingleton.shared.merchantEmail ?? "",
+            "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 (Saved Cards, No Billing Info, Logged In)
     func paymentIntentFromShowSavedCardApi() {
         showLoadingIndicator()
@@ -5915,45 +6201,249 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         task.resume()
     }
     
-    //MARK: - Credit Card Charge Api from Add new cards If Billing info is nil and Logged in.
-    func paymentIntentFromAddNewCardApi(customerId: String?) {
-        // Get the text fields from the selected cell and trim whitespace
-        let nameText = txtFieldNameOnCardNewCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-        let cvvText = txtFieldCVVNewCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-        let cardNumberText = (txtFieldCardNumberNewCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? "").replacingOccurrences(of: " ", with: "")
-        let expiryText = txtFieldExpiryDateNewCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+    //MARK: - Credit Card Charge Api from Saved cards if Billing info exist but not go to billing and additonal page
+    func paymentIntentFromShowCardApi() {
+        showLoadingIndicator()
         
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.charges.path()
         
-        // Check if any field is empty
-        if cardNumberText.isEmpty || expiryText.isEmpty || cvvText.isEmpty || nameText.isEmpty {
-            let alert = UIAlertController(title: "Missing Information", message: "Please fill in all card details.", preferredStyle: .alert)
-            alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))
-            self.present(alert, animated: true, completion: nil)
+        guard let serviceURL = URL(string: fullURL) else {
+            print("Invalid URL")
+            hideLoadingIndicator()
             return
         }
         
-        // Validate expiry date format
-        let expiryDateFormat = "MM/yyyy"
-        let dateFormatter = DateFormatter()
-        dateFormatter.dateFormat = expiryDateFormat
-        dateFormatter.locale = Locale(identifier: "en_US_POSIX")
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "POST"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
-        // Split the expiry date and validate its format
-        let exp = expiryText.split(separator: "/")
-        if exp.count != 2 || exp[0].count != 2 || exp[1].count != 4 {
-            let alert = UIAlertController(title: "Invalid Expiry Date", message: "Please enter the expiry date in the format MM/yyyy.", preferredStyle: .alert)
-            alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))
-            self.present(alert, animated: true, completion: nil)
-            return
-        }
+        let token = UserStoreSingleton.shared.clientToken
+        print("Setting clientToken header: \(token ?? "None")")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
-        // Check if the expiry date is valid
-        if let expiryDateObj = dateFormatter.date(from: expiryText) {
-            // Check if the expiry date is in the past
-            let currentDate = Date()
-            let calendar = Calendar.current
-            let currentMonthYear = calendar.date(from: calendar.dateComponents([.year, .month], from: currentDate))
-            if expiryDateObj < currentMonthYear! {
+        var params: [String: Any] = [
+            "currency": "usd",
+            "payment_method": "card",
+            "save_card": 0,
+            "customer" : selectedCard?.customerId ?? "",
+            "customer_id" : selectedCard?.customerId ?? "",
+            "card_id" : selectedCard?.cardId ?? "",
+            "cvc" : txtFieldCVVSingleSavedCard.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? "",
+        ]
+        
+        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 = 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()
+        }
+        
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+            uRLRequest.httpBody = jsonData
+            if let jsonString = String(data: jsonData, encoding: .utf8) {
+                print("JSON Payload: \(jsonString)")
+            }
+        } catch let error {
+            print("Error creating JSON data: \(error)")
+            hideLoadingIndicator()
+            return
+        }
+        
+        let session = URLSession.shared
+        let task = session.dataTask(with: uRLRequest) { (serviceData, serviceResponse, error) in
+            
+            DispatchQueue.main.async {
+                self.hideLoadingIndicator() // Stop loader when response is received
+            }
+            
+            if let error = error {
+                print("Error: \(error.localizedDescription)")
+                return
+            }
+            
+            guard let httpResponse = serviceResponse as? HTTPURLResponse else {
+                print("Invalid response")
+                return
+            }
+            
+            if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
+                if let data = serviceData {
+                    do {
+                        if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
+                            print("Response Data: \(responseObject)")
+                            
+                            // Check if status is 0 and handle the error
+                            if let status = responseObject["status"] as? Int, status == 0 {
+                                let errorMessage = responseObject["message"] as? String ?? "Unknown error"
+                                self.presentPaymentErrorVC(errorMessage: errorMessage)
+                            } else {
+                                DispatchQueue.main.async {
+                                    if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
+                                        paymentDoneVC.chargeData = responseObject
+                                        paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
+                                        paymentDoneVC.easyPayDelegate = self.easyPayDelegate
+                                        // Pass billing 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 JSON: \(jsonError)")
+                    }
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "No data received")
+                }
+            } else {
+                if let data = serviceData,
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let message = responseObj["message"] as? String {
+                    self.presentPaymentErrorVC(errorMessage: message)
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                }
+            }
+        }
+        task.resume()
+    }
+    
+    //MARK: - Credit Card Charge Api from Add new cards If Billing info is nil and Logged in.
+    func paymentIntentFromAddNewCardApi(customerId: String?) {
+        // Get the text fields from the selected cell and trim whitespace
+        let nameText = txtFieldNameOnCardNewCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+        let cvvText = txtFieldCVVNewCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+        let cardNumberText = (txtFieldCardNumberNewCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? "").replacingOccurrences(of: " ", with: "")
+        let expiryText = txtFieldExpiryDateNewCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+        
+        
+        // Check if any field is empty
+        if cardNumberText.isEmpty || expiryText.isEmpty || cvvText.isEmpty || nameText.isEmpty {
+            let alert = UIAlertController(title: "Missing Information", message: "Please fill in all card details.", preferredStyle: .alert)
+            alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))
+            self.present(alert, animated: true, completion: nil)
+            return
+        }
+        
+        // Validate expiry date format
+        let expiryDateFormat = "MM/yyyy"
+        let dateFormatter = DateFormatter()
+        dateFormatter.dateFormat = expiryDateFormat
+        dateFormatter.locale = Locale(identifier: "en_US_POSIX")
+        
+        // Split the expiry date and validate its format
+        let exp = expiryText.split(separator: "/")
+        if exp.count != 2 || exp[0].count != 2 || exp[1].count != 4 {
+            let alert = UIAlertController(title: "Invalid Expiry Date", message: "Please enter the expiry date in the format MM/yyyy.", preferredStyle: .alert)
+            alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))
+            self.present(alert, animated: true, completion: nil)
+            return
+        }
+        
+        // Check if the expiry date is valid
+        if let expiryDateObj = dateFormatter.date(from: expiryText) {
+            // Check if the expiry date is in the past
+            let currentDate = Date()
+            let calendar = Calendar.current
+            let currentMonthYear = calendar.date(from: calendar.dateComponents([.year, .month], from: currentDate))
+            if expiryDateObj < currentMonthYear! {
                 let alert = UIAlertController(title: "Expired Card", message: "The expiry date cannot be in the past. Please enter a valid expiry date.", preferredStyle: .alert)
                 alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))
                 self.present(alert, animated: true, completion: nil)
@@ -6158,6 +6648,237 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         task.resume()
     }
     
+    //MARK: - Credit Card Charge Api from Add new card from saved cards if billing info is available but their visibility is off
+    func paymentIntentAddNewCardApi(customerId: String?) {
+        showLoadingIndicator()
+        
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.charges.path()
+        
+        guard let serviceURL = URL(string: fullURL) else {
+            print("Invalid URL")
+            hideLoadingIndicator()
+            return
+        }
+        
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "POST"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        
+        let token = UserStoreSingleton.shared.clientToken
+        print("Setting clientToken header: \(token ?? "None")")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        
+        let emailPrefix = UserStoreSingleton.shared.verificationEmail?.components(separatedBy: "@").first ?? ""
+        
+        // Get the text fields from the selected cell and trim whitespace
+        let nameText = txtFieldNameOnCardNewCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+        let cvvText = txtFieldCVVNewCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+        let cardNumberText = (txtFieldCardNumberNewCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? "").replacingOccurrences(of: " ", with: "")
+        let expiryText = txtFieldExpiryDateNewCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+        
+        var params: [String: Any] = [
+            "name": nameText,
+            "card_number": cardNumberText,
+            "cardholder_name": nameText,
+            "exp_month": expiryText.components(separatedBy: "/").first ?? "",
+            "exp_year": expiryText.components(separatedBy: "/").last ?? "",
+            "cvc": cvvText,
+            "description": "TestDescription",
+            "currency": "usd",
+            "payment_method": "card",
+            "save_card": isSavedNewCardForFuture ? 1 : 0,
+            "email" : UserStoreSingleton.shared.verificationEmail ?? ""
+        ]
+        
+        // Add is_default parameter if save_card is 1
+        if isSavedNewCard {
+            params["is_default"] = "1"
+        }
+        
+        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 = txtFieldSelectDateNewCardView?.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"] = txtFieldSelectPlanNewCardView.text.lowercased()
+        }
+        
+        if let customerId = customerId {
+            params["customer"] = customerId
+            params["customer_id"] = customerId
+        } else {
+            params["username"] = emailPrefix
+            params["email"] = UserStoreSingleton.shared.verificationEmail
+        }
+        
+        print(params)
+        
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+            uRLRequest.httpBody = jsonData
+            if let jsonString = String(data: jsonData, encoding: .utf8) {
+                print("JSON Payload: \(jsonString)")
+            }
+        } catch let error {
+            print("Error creating JSON data: \(error)")
+            hideLoadingIndicator()
+            return
+        }
+        
+        let session = URLSession.shared
+        let task = session.dataTask(with: uRLRequest) { (serviceData, serviceResponse, error) in
+            
+            DispatchQueue.main.async {
+                self.hideLoadingIndicator() // Stop loader when response is received
+            }
+            
+            if let error = error {
+                self.presentPaymentErrorVC(errorMessage: error.localizedDescription)
+                return
+            }
+            
+            guard let httpResponse = serviceResponse as? HTTPURLResponse else {
+                self.presentPaymentErrorVC(errorMessage: "Invalid response")
+                return
+            }
+            
+            if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
+                if let data = serviceData {
+                    do {
+                        if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
+                            print("Response Data: \(responseObject)")
+                            
+                            // Check if status is 0 and handle the error
+                            if let status = responseObject["status"] as? Int, status == 0 {
+                                let errorMessage = responseObject["message"] as? String ?? "Unknown error"
+                                self.presentPaymentErrorVC(errorMessage: errorMessage)
+                            } else {
+                                DispatchQueue.main.async {
+                                    if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
+                                        paymentDoneVC.chargeData = responseObject
+                                        paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
+                                        paymentDoneVC.easyPayDelegate = self.easyPayDelegate
+                                        // Pass billing 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 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: - Update Cards Api.
     func updateCardApi(cardID: String) {
         showLoadingIndicator()
@@ -7691,44 +8412,22 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         paymentDoneVC.chargeData = responseObject
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
                                         paymentDoneVC.amount = self.amount
-//                                        // 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
-//                                            }
-//                                        }
-                                        
                                         // Pass billing info and additional info if available
                                         if let billingInfoData = self.request.billingInfoData,
                                            let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
                                             
-                                            paymentDoneVC.billingInfoData = fieldSection.billing
+                                            // 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] = [:]
-                                            fieldSection.billing.forEach { billingDict[$0.name] = $0.value }
+                                            filteredBilling.forEach { billingDict[$0.name] = $0.value }
                                             paymentDoneVC.billingInfo = billingDict
-                                            
-                                            paymentDoneVC.additionalInfoData = fieldSection.additional
+
+                                            // 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] = [:]
-                                            fieldSection.additional.forEach { additionalDict[$0.name] = $0.value }
+                                            filteredAdditional.forEach { additionalDict[$0.name] = $0.value }
                                             paymentDoneVC.additionalInfo = additionalDict
                                         }
                                         self.navigationController?.pushViewController(paymentDoneVC, animated: true)
@@ -8007,14 +8706,18 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         if let billingInfoData = self.request.billingInfoData,
                                            let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
                                             
-                                            paymentDoneVC.billingInfoData = fieldSection.billing
+                                            // 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] = [:]
-                                            fieldSection.billing.forEach { billingDict[$0.name] = $0.value }
+                                            filteredBilling.forEach { billingDict[$0.name] = $0.value }
                                             paymentDoneVC.billingInfo = billingDict
-                                            
-                                            paymentDoneVC.additionalInfoData = fieldSection.additional
+
+                                            // 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] = [:]
-                                            fieldSection.additional.forEach { additionalDict[$0.name] = $0.value }
+                                            filteredAdditional.forEach { additionalDict[$0.name] = $0.value }
                                             paymentDoneVC.additionalInfo = additionalDict
                                         }
                                         self.navigationController?.pushViewController(paymentDoneVC, animated: true)