@jimrising/easymerchantsdk-react-native 1.3.5 → 1.3.7

package/ios/Pods/ViewControllers/AdditionalInfoVC.swift

@@ -25,6 +25,11 @@ class AdditionalInfoVC: BaseVC {
     @IBOutlet weak var lblEasyMerchant: UILabel!
     @IBOutlet weak var btnCountryCode: UIButton!
     
+    @IBOutlet weak var lblStarNameField: UILabel!
+    @IBOutlet weak var lblStarEmailField: UILabel!
+    @IBOutlet weak var lblStarPhoneField: UILabel!
+    @IBOutlet weak var lblStarDescriptionField: UILabel!
+    
     var cardNumber: String?
     var expiryDate: String?
     var cvv: String?
@@ -56,9 +61,26 @@ class AdditionalInfoVC: BaseVC {
     
     var isSavedNewAccount: Bool?
     
+    var request: Request!
+    
+    var chosenPlan: String?
+    var startDate: String?
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         
+        let amountValue = Double(amount ?? 0)
+        let amountText = String(format: "$%.2f", amountValue)
+        let submitText = request?.submitButtonText ?? ""
+        
+        let defaultTitle = !submitText.isEmpty
+        ? "\(submitText) (\(amountText))"
+        : "Pay Now (\(amountText))"
+        
+        DispatchQueue.main.async {
+            self.btnPayNow.setTitle(defaultTitle, for: .normal)
+        }
+        
         uiFinishingTouchElements()
         
         txtFieldName.delegate = self
@@ -103,15 +125,7 @@ class AdditionalInfoVC: BaseVC {
         usaCountry.flag = String.flag(for: "US")
         lblCountryCode.text = "\(usaCountry.flag ?? "") +\(usaCountry.extensionCode ?? "")"
         
-        //        print(amount ?? "")
-        //        let am = Int(amount ?? "0")
-        //        btnPayNow.setTitle("Pay Now ($\(am ?? 0))", for: .normal)
-        //
-        //        print("Received customerID: \(customerID ?? "nil")")
-        //        print("Received accountID: \(accountID ?? "nil")")
-        //        print(billingInfoData ?? "")
-        //        print(isFrom)
-        //        print(selectedPaymentMethod ?? "")
+        print(cvvText ?? "")
     }
     
     override func viewWillAppear(_ animated: Bool) {
@@ -178,6 +192,23 @@ class AdditionalInfoVC: BaseVC {
             btnPrevious.titleLabel?.font = UIFont.systemFont(ofSize: fontSize)
         }
         
+        configureFieldVisibility()
+    }
+    
+    private func configureFieldVisibility() {
+        if let billingInfoData = billingInfoData,
+           let additionalInfo = billingInfoData["additional_info"] as? [String: Any] {
+            
+            let name = additionalInfo["name"] as? String
+            let email = additionalInfo["email"] as? String
+            let phoneNumber = additionalInfo["phone_number"] as? String
+            let description = additionalInfo["description"] as? String
+            
+            lblStarNameField.isHidden = name == nil || name?.isEmpty == true
+            lblStarEmailField.isHidden = email == nil || email?.isEmpty == true
+            lblStarPhoneField.isHidden = phoneNumber == nil || phoneNumber?.isEmpty == true
+            lblStarDescriptionField.isHidden = description == nil || description?.isEmpty == true
+        }
     }
     
     @objc func didTapOutside() {
@@ -192,26 +223,39 @@ class AdditionalInfoVC: BaseVC {
     }
     
     @IBAction func actionBtnPrevious(_ sender: UIButton) {
-        self.navigationController?.popViewController(animated: true)
+        navigationController?.popViewController(animated: true)
     }
     
     @IBAction func actionBtnPayNow(_ sender: UIButton) {
-        if self.txtFieldName.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
-            self.showAlert(title: "Missing Information", message: "Please enter your name.")
+        if !lblStarNameField.isHidden &&
+            txtFieldName.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
+            showAlert(title: "Missing Information", message: "Please enter your name.")
+            return
         }
-        else if self.txtFieldEmail.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
-            self.showAlert(title: "Missing Information", message: "Please enter your email address.")
+        else if !lblStarEmailField.isHidden &&
+                    txtFieldEmail.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
+            showAlert(title: "Missing Information", message: "Please enter your email address.")
+            return
         }
-        else if self.txtFieldPhoneNumber.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
-            self.showAlert(title: "Missing Information", message: "Please enter your phone number.")
+        else if !lblStarPhoneField.isHidden &&
+                    txtFieldPhoneNumber.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
+            showAlert(title: "Missing Information", message: "Please enter your phone number.")
+            return
         }
-        else if self.txtFieldDescription.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
-            self.showAlert(title: "Missing Information", message: "Please enter description text.")
+        else if !lblStarDescriptionField.isHidden &&
+                    txtFieldDescription.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
+            showAlert(title: "Missing Information", message: "Please enter description text.")
+            return
         }
         else {
             if isSavedNewCard {
                 if isFrom == "AddNewCard" {
-                    self.paymentIntentAddNewCardApi(customerId: UserStoreSingleton.shared.customerId)
+                    if request.enable3DS == true {
+                        threeDSecurePaymentAddNewCardApi(customerId: UserStoreSingleton.shared.customerId)
+                    }
+                    else {
+                        self.paymentIntentAddNewCardApi(customerId: UserStoreSingleton.shared.customerId)
+                    }
                 }
             }
             else {
@@ -227,6 +271,9 @@ class AdditionalInfoVC: BaseVC {
                             emailVerificationVC.billingInfoData = billingInfoData
                             emailVerificationVC.selectedPaymentMethod = selectedPaymentMethod
                             emailVerificationVC.easyPayDelegate = self.easyPayDelegate
+                            emailVerificationVC.request = self.request
+                            emailVerificationVC.chosenPlan = self.chosenPlan
+                            emailVerificationVC.startDate = self.startDate
                             self.navigationController?.pushViewController(emailVerificationVC, animated: true)
                         }
                     } else if selectedPaymentMethod == "Bank" {
@@ -239,6 +286,9 @@ class AdditionalInfoVC: BaseVC {
                             emailVerificationVC.billingInfoData = billingInfoData
                             emailVerificationVC.selectedPaymentMethod = selectedPaymentMethod
                             emailVerificationVC.easyPayDelegate = self.easyPayDelegate
+                            emailVerificationVC.request = self.request
+                            emailVerificationVC.chosenPlan = self.chosenPlan
+                            emailVerificationVC.startDate = self.startDate
                             self.navigationController?.pushViewController(emailVerificationVC, animated: true)
                         }
                     }
@@ -249,7 +299,12 @@ class AdditionalInfoVC: BaseVC {
                             paymentIntentFromShowCardApi()
                         }
                         else {
-                            paymentIntentApi()
+                            if request.enable3DS == true {
+                                threeDSecurePaymentApi()
+                            }
+                            else {
+                                paymentIntentApi()
+                            }
                         }
                     }
                     else if selectedPaymentMethod == "Bank" {
@@ -293,13 +348,13 @@ class AdditionalInfoVC: BaseVC {
             return
         }
         
-        var request = URLRequest(url: serviceURL)
-        request.httpMethod = "POST"
-        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        var urlRequest = URLRequest(url: serviceURL)
+        urlRequest.httpMethod = "POST"
+        urlRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
         print("Setting clientToken header: \(token ?? "None")")
-        request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        urlRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
         guard let billingInfoData = billingInfoData else {
             print("Billing info data is nil")
@@ -325,7 +380,7 @@ class AdditionalInfoVC: BaseVC {
             "postal_code": billingInfoData["postal_code"] as? String ?? ""
         ]
         
-        let params: [String: Any] = [
+        var params: [String: Any] = [
             "name": txtFieldName.text ?? "",
             "email": txtFieldEmail.text ?? "",
             "card_number": cardNumber?.replacingOccurrences(of: " ", with: "") ?? "",
@@ -341,9 +396,32 @@ class AdditionalInfoVC: BaseVC {
             "save_card": 0
         ]
         
+        // Add these if recurring is enabled
+        if let req = request, req.is_recurring == true {
+            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                // Only send start_date if type is .custom and field is not empty
+                if let startDateText = startDate, !startDateText.isEmpty {
+                    let inputFormatter = DateFormatter()
+                    inputFormatter.dateFormat = "dd/MM/yyyy"
+                    
+                    let outputFormatter = DateFormatter()
+                    outputFormatter.dateFormat = "MM/dd/yyyy"
+                    
+                    if let date = inputFormatter.date(from: startDateText) {
+                        let apiFormattedDate = outputFormatter.string(from: date)
+                        params["start_date"] = apiFormattedDate
+                    } else {
+                        print("Invalid date format in startDateText")
+                    }
+                }
+            }
+            
+            params["interval"] = chosenPlan?.lowercased()
+        }
+        
         do {
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
-            request.httpBody = jsonData
+            urlRequest.httpBody = jsonData
             if let jsonString = String(data: jsonData, encoding: .utf8) {
                 print("JSON Payload: \(jsonString)")
             }
@@ -354,7 +432,7 @@ class AdditionalInfoVC: BaseVC {
         }
         
         let session = URLSession.shared
-        let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
+        let task = session.dataTask(with: urlRequest) { (serviceData, serviceResponse, error) in
             
             DispatchQueue.main.async {
                 self.hideLoadingIndicator()
@@ -412,7 +490,7 @@ class AdditionalInfoVC: BaseVC {
         }
         task.resume()
     }
-
+    
     //MARK: - Credit Card Charge Api from Saved cards
     func paymentIntentFromShowCardApi() {
         showLoadingIndicator()
@@ -425,24 +503,24 @@ class AdditionalInfoVC: BaseVC {
             return
         }
         
-        var request = URLRequest(url: serviceURL)
-        request.httpMethod = "POST"
-        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "POST"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
         print("Setting clientToken header: \(token ?? "None")")
-        request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
         guard let billingInfoData = billingInfoData else {
             print("Billing info data is nil")
             return
         }
         
-//        // Remove the flag and "+" sign from lblCountryCode.text
-//        let countryCode = lblCountryCode.text ?? ""
-//        let cleanedCountryCode = countryCode.replacingOccurrences(of: "[^0-9]", with: "", options: .regularExpression)
-//        // Format phone number parameter by combining cleaned country code and phone number
-//        let phoneNumber = "\(cleanedCountryCode)\(txtFieldPhoneNumber.text ?? "")"
+        //        // Remove the flag and "+" sign from lblCountryCode.text
+        //        let countryCode = lblCountryCode.text ?? ""
+        //        let cleanedCountryCode = countryCode.replacingOccurrences(of: "[^0-9]", with: "", options: .regularExpression)
+        //        // Format phone number parameter by combining cleaned country code and phone number
+        //        let phoneNumber = "\(cleanedCountryCode)\(txtFieldPhoneNumber.text ?? "")"
         
         // Extract only the digits from the phone number (local only, no country code)
         let localPhone = txtFieldPhoneNumber.text?.components(separatedBy: CharacterSet.decimalDigits.inverted).joined() ?? ""
@@ -451,7 +529,7 @@ class AdditionalInfoVC: BaseVC {
             "name": txtFieldName.text ?? "",
             "email": txtFieldEmail.text ?? "",
             "phone_number": localPhone,
-//            "phone_number": phoneNumber,
+            //            "phone_number": phoneNumber,
             "description": txtFieldDescription.text ?? ""
         ]
         
@@ -463,7 +541,7 @@ class AdditionalInfoVC: BaseVC {
             "postal_code": billingInfoData["postal_code"] as? String ?? ""
         ]
         
-        let params: [String: Any] = [
+        var params: [String: Any] = [
             "name": txtFieldName.text ?? "",
             "email": txtFieldEmail.text ?? "",
             "description": txtFieldDescription.text ?? "",
@@ -478,9 +556,32 @@ class AdditionalInfoVC: BaseVC {
             "cvc" : cvvText ?? ""
         ]
         
+        // Add these if recurring is enabled
+        if let req = request, req.is_recurring == true {
+            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                // Only send start_date if type is .custom and field is not empty
+                if let startDateText = startDate, !startDateText.isEmpty {
+                    let inputFormatter = DateFormatter()
+                    inputFormatter.dateFormat = "dd/MM/yyyy"
+                    
+                    let outputFormatter = DateFormatter()
+                    outputFormatter.dateFormat = "MM/dd/yyyy"
+                    
+                    if let date = inputFormatter.date(from: startDateText) {
+                        let apiFormattedDate = outputFormatter.string(from: date)
+                        params["start_date"] = apiFormattedDate
+                    } else {
+                        print("Invalid date format in startDateText")
+                    }
+                }
+            }
+            
+            params["interval"] = chosenPlan?.lowercased()
+        }
+        
         do {
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
-            request.httpBody = jsonData
+            uRLRequest.httpBody = jsonData
             if let jsonString = String(data: jsonData, encoding: .utf8) {
                 print("JSON Payload: \(jsonString)")
             }
@@ -491,7 +592,7 @@ class AdditionalInfoVC: BaseVC {
         }
         
         let session = URLSession.shared
-        let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
+        let task = session.dataTask(with: uRLRequest) { (serviceData, serviceResponse, error) in
             
             DispatchQueue.main.async {
                 self.hideLoadingIndicator() // Stop loader when response is received
@@ -561,13 +662,13 @@ class AdditionalInfoVC: BaseVC {
             return
         }
         
-        var request = URLRequest(url: serviceURL)
-        request.httpMethod = "POST"
-        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "POST"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
         print("Setting clientToken header: \(token ?? "None")")
-        request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
         guard let billingInfoData = billingInfoData else {
             print("Billing info data is nil")
@@ -613,6 +714,29 @@ class AdditionalInfoVC: BaseVC {
             params["is_default"] = "1"
         }
         
+        // Add these if recurring is enabled
+        if let req = request, req.is_recurring == true {
+            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                // Only send start_date if type is .custom and field is not empty
+                if let startDateText = startDate, !startDateText.isEmpty {
+                    let inputFormatter = DateFormatter()
+                    inputFormatter.dateFormat = "dd/MM/yyyy"
+                    
+                    let outputFormatter = DateFormatter()
+                    outputFormatter.dateFormat = "MM/dd/yyyy"
+                    
+                    if let date = inputFormatter.date(from: startDateText) {
+                        let apiFormattedDate = outputFormatter.string(from: date)
+                        params["start_date"] = apiFormattedDate
+                    } else {
+                        print("Invalid date format in startDateText")
+                    }
+                }
+            }
+            
+            params["interval"] = chosenPlan?.lowercased()
+        }
+        
         if let customerId = customerId {
             params["customer"] = customerId
             params["customer_id"] = customerId
@@ -625,7 +749,7 @@ class AdditionalInfoVC: BaseVC {
         
         do {
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
-            request.httpBody = jsonData
+            uRLRequest.httpBody = jsonData
             if let jsonString = String(data: jsonData, encoding: .utf8) {
                 print("JSON Payload: \(jsonString)")
             }
@@ -636,7 +760,7 @@ class AdditionalInfoVC: BaseVC {
         }
         
         let session = URLSession.shared
-        let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
+        let task = session.dataTask(with: uRLRequest) { (serviceData, serviceResponse, error) in
             
             DispatchQueue.main.async {
                 self.hideLoadingIndicator() // Stop loader when response is received
@@ -706,24 +830,24 @@ class AdditionalInfoVC: BaseVC {
             return
         }
         
-        var request = URLRequest(url: serviceURL)
-        request.httpMethod = "POST"
-        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "POST"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
         print("Setting clientToken header: \(token ?? "None")")
-        request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
         guard let billingInfoData = billingInfoData else {
             print("Billing info data is nil")
             return
         }
         
-//        // Remove the flag and "+" sign from lblCountryCode.text
-//        let countryCode = lblCountryCode.text ?? ""
-//        let cleanedCountryCode = countryCode.replacingOccurrences(of: "[^0-9]", with: "", options: .regularExpression)
-//        // Format phone number parameter by combining cleaned country code and phone number
-//        let phoneNumber = "\(cleanedCountryCode)\(txtFieldPhoneNumber.text ?? "")"
+        //        // Remove the flag and "+" sign from lblCountryCode.text
+        //        let countryCode = lblCountryCode.text ?? ""
+        //        let cleanedCountryCode = countryCode.replacingOccurrences(of: "[^0-9]", with: "", options: .regularExpression)
+        //        // Format phone number parameter by combining cleaned country code and phone number
+        //        let phoneNumber = "\(cleanedCountryCode)\(txtFieldPhoneNumber.text ?? "")"
         
         // Extract only the digits from the phone number (local only, no country code)
         let localPhone = txtFieldPhoneNumber.text?.components(separatedBy: CharacterSet.decimalDigits.inverted).joined() ?? ""
@@ -732,7 +856,7 @@ class AdditionalInfoVC: BaseVC {
             "name": txtFieldName.text ?? "",
             "email": txtFieldEmail.text ?? "",
             "phone_number": localPhone,
-           // "phone_number": phoneNumber,
+            // "phone_number": phoneNumber,
             "description": txtFieldDescription.text ?? ""
         ]
         
@@ -744,7 +868,7 @@ class AdditionalInfoVC: BaseVC {
             "postal_code": billingInfoData["postal_code"] as? String ?? ""
         ]
         
-        let params: [String: Any] = [
+        var params: [String: Any] = [
             "name": txtFieldName.text ?? "",
             "email": txtFieldEmail.text ?? "",
             "description": txtFieldDescription.text ?? "",
@@ -759,11 +883,34 @@ class AdditionalInfoVC: BaseVC {
             "levelIndicator": 1,
         ]
         
+        // Add these if recurring is enabled
+        if let req = request, req.is_recurring == true {
+            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                // Only send start_date if type is .custom and field is not empty
+                if let startDateText = startDate, !startDateText.isEmpty {
+                    let inputFormatter = DateFormatter()
+                    inputFormatter.dateFormat = "dd/MM/yyyy"
+                    
+                    let outputFormatter = DateFormatter()
+                    outputFormatter.dateFormat = "MM/dd/yyyy"
+                    
+                    if let date = inputFormatter.date(from: startDateText) {
+                        let apiFormattedDate = outputFormatter.string(from: date)
+                        params["start_date"] = apiFormattedDate
+                    } else {
+                        print("Invalid date format in startDateText")
+                    }
+                }
+            }
+            
+            params["interval"] = chosenPlan?.lowercased()
+        }
+        
         print(params)
         
         do {
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
-            request.httpBody = jsonData
+            uRLRequest.httpBody = jsonData
             if let jsonString = String(data: jsonData, encoding: .utf8) {
                 print("JSON Payload: \(jsonString)")
             }
@@ -774,7 +921,7 @@ class AdditionalInfoVC: BaseVC {
         }
         
         let session = URLSession.shared
-        let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
+        let task = session.dataTask(with: uRLRequest) { (serviceData, serviceResponse, error) in
             
             DispatchQueue.main.async {
                 self.hideLoadingIndicator() // Stop loader when response is received
@@ -845,24 +992,24 @@ class AdditionalInfoVC: BaseVC {
             return
         }
         
-        var request = URLRequest(url: serviceURL)
-        request.httpMethod = "POST"
-        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "POST"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
         print("Setting clientToken header: \(token ?? "None")")
-        request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
         guard let billingInfoData = billingInfoData else {
             print("Billing info data is nil")
             return
         }
         
-//        // Remove the flag and "+" sign from lblCountryCode.text
-//        let countryCode = lblCountryCode.text ?? ""
-//        let cleanedCountryCode = countryCode.replacingOccurrences(of: "[^0-9]", with: "", options: .regularExpression)
-//        // Format phone number parameter by combining cleaned country code and phone number
-//        let phoneNumber = "\(cleanedCountryCode)\(txtFieldPhoneNumber.text ?? "")"
+        //        // Remove the flag and "+" sign from lblCountryCode.text
+        //        let countryCode = lblCountryCode.text ?? ""
+        //        let cleanedCountryCode = countryCode.replacingOccurrences(of: "[^0-9]", with: "", options: .regularExpression)
+        //        // Format phone number parameter by combining cleaned country code and phone number
+        //        let phoneNumber = "\(cleanedCountryCode)\(txtFieldPhoneNumber.text ?? "")"
         
         // Extract only the digits from the phone number (local only, no country code)
         let localPhone = txtFieldPhoneNumber.text?.components(separatedBy: CharacterSet.decimalDigits.inverted).joined() ?? ""
@@ -871,7 +1018,7 @@ class AdditionalInfoVC: BaseVC {
             "name": txtFieldName.text ?? "",
             "email": txtFieldEmail.text ?? "",
             "phone_number": localPhone,
-           // "phone_number": phoneNumber,
+            // "phone_number": phoneNumber,
             "description": txtFieldDescription.text ?? ""
         ]
         
@@ -883,7 +1030,7 @@ class AdditionalInfoVC: BaseVC {
             "postal_code": billingInfoData["postal_code"] as? String ?? ""
         ]
         
-        let params: [String: Any] = [
+        var params: [String: Any] = [
             "name": UserStoreSingleton.shared.merchantName ?? "",
             "account_id": accountID ?? "",
             "payment_method": "ach",
@@ -895,11 +1042,34 @@ class AdditionalInfoVC: BaseVC {
             "additional_info": additionalInfo
         ]
         
+        // Add these if recurring is enabled
+        if let req = request, req.is_recurring == true {
+            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                // Only send start_date if type is .custom and field is not empty
+                if let startDateText = startDate, !startDateText.isEmpty {
+                    let inputFormatter = DateFormatter()
+                    inputFormatter.dateFormat = "dd/MM/yyyy"
+                    
+                    let outputFormatter = DateFormatter()
+                    outputFormatter.dateFormat = "MM/dd/yyyy"
+                    
+                    if let date = inputFormatter.date(from: startDateText) {
+                        let apiFormattedDate = outputFormatter.string(from: date)
+                        params["start_date"] = apiFormattedDate
+                    } else {
+                        print("Invalid date format in startDateText")
+                    }
+                }
+            }
+            
+            params["interval"] = chosenPlan?.lowercased()
+        }
+        
         print(params)
         
         do {
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
-            request.httpBody = jsonData
+            uRLRequest.httpBody = jsonData
             if let jsonString = String(data: jsonData, encoding: .utf8) {
                 print("JSON Payload: \(jsonString)")
             }
@@ -910,7 +1080,7 @@ class AdditionalInfoVC: BaseVC {
         }
         
         let session = URLSession.shared
-        let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
+        let task = session.dataTask(with: uRLRequest) { (serviceData, serviceResponse, error) in
             
             DispatchQueue.main.async {
                 self.hideLoadingIndicator() // Stop loader when response is received
@@ -981,13 +1151,13 @@ class AdditionalInfoVC: BaseVC {
             return
         }
         
-        var request = URLRequest(url: serviceURL)
-        request.httpMethod = "POST"
-        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "POST"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
         print("Setting clientToken header: \(token ?? "None")")
-        request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
         guard let billingInfoData = billingInfoData else {
             print("Billing info data is nil")
@@ -1036,11 +1206,34 @@ class AdditionalInfoVC: BaseVC {
             params["username"] = emailPrefix
         }
         
+        // Add these if recurring is enabled
+        if let req = request, req.is_recurring == true {
+            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                // Only send start_date if type is .custom and field is not empty
+                if let startDateText = startDate, !startDateText.isEmpty {
+                    let inputFormatter = DateFormatter()
+                    inputFormatter.dateFormat = "dd/MM/yyyy"
+                    
+                    let outputFormatter = DateFormatter()
+                    outputFormatter.dateFormat = "MM/dd/yyyy"
+                    
+                    if let date = inputFormatter.date(from: startDateText) {
+                        let apiFormattedDate = outputFormatter.string(from: date)
+                        params["start_date"] = apiFormattedDate
+                    } else {
+                        print("Invalid date format in startDateText")
+                    }
+                }
+            }
+            
+            params["interval"] = chosenPlan?.lowercased()
+        }
+        
         print(params)
         
         do {
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
-            request.httpBody = jsonData
+            uRLRequest.httpBody = jsonData
             if let jsonString = String(data: jsonData, encoding: .utf8) {
                 print("JSON Payload: \(jsonString)")
             }
@@ -1051,7 +1244,7 @@ class AdditionalInfoVC: BaseVC {
         }
         
         let session = URLSession.shared
-        let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
+        let task = session.dataTask(with: uRLRequest) { (serviceData, serviceResponse, error) in
             
             DispatchQueue.main.async {
                 self.hideLoadingIndicator() // Stop loader when response is received
@@ -1109,6 +1302,343 @@ class AdditionalInfoVC: BaseVC {
         task.resume()
     }
     
+    // MARK: - 3DS Functionality
+    
+    // MARK: - Credit Card Charge Api If Billing info is not nil and Without Login.
+    func threeDSecurePaymentApi() {
+        showLoadingIndicator()
+        
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.threeDSecure.path()
+        
+        guard let serviceURL = URL(string: fullURL) else {
+            print("Invalid URL")
+            hideLoadingIndicator()
+            return
+        }
+        
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "POST"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        
+        let token = UserStoreSingleton.shared.clientToken
+        print("Setting clientToken header: \(token ?? "None")")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
+        guard let billingInfoData = billingInfoData else {
+            print("Billing info data is nil")
+            hideLoadingIndicator()
+            return
+        }
+        
+        // Extract only the digits from the phone number (local only, no country code)
+        let localPhone = txtFieldPhoneNumber.text?.components(separatedBy: CharacterSet.decimalDigits.inverted).joined() ?? ""
+        
+        let additionalInfo: [String: Any] = [
+            "name": txtFieldName.text ?? "",
+            "email": txtFieldEmail.text ?? "",
+            "phone_number": localPhone,
+            "description": txtFieldDescription.text ?? ""
+        ]
+        
+        let billingInfo: [String: Any] = [
+            "address": billingInfoData["address"] as? String ?? "",
+            "country": billingInfoData["country"] as? String ?? "",
+            "state": billingInfoData["state"] as? String ?? "",
+            "city": billingInfoData["city"] as? String ?? "",
+            "postal_code": billingInfoData["postal_code"] as? String ?? ""
+        ]
+        
+        var params: [String: Any] = [
+            "name": nameOnCard ?? "",
+            "email": txtFieldEmail.text ?? "",
+            "card_number": cardNumber?.replacingOccurrences(of: " ", with: "") ?? "",
+            "cardholder_name": nameOnCard ?? "",
+            "exp_month": expiryDate?.components(separatedBy: "/").first ?? "",
+            "exp_year": expiryDate?.components(separatedBy: "/").last ?? "",
+            "cvc": cvv ?? "",
+            "description": "Test",
+            "currency": "usd",
+            "tokenize": request.tokenOnly ?? false,
+            "address": billingInfoData["address"] as? String ?? "",
+            "billing_info": billingInfo,
+            "additional_info": additionalInfo
+        ]
+        
+        // Add these if recurring is enabled
+        if let req = request, req.is_recurring == true {
+            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                // Only send start_date if type is .custom and field is not empty
+                if let startDateText = startDate, !startDateText.isEmpty {
+                    let inputFormatter = DateFormatter()
+                    inputFormatter.dateFormat = "dd/MM/yyyy"
+                    
+                    let outputFormatter = DateFormatter()
+                    outputFormatter.dateFormat = "MM/dd/yyyy"
+                    
+                    if let date = inputFormatter.date(from: startDateText) {
+                        let apiFormattedDate = outputFormatter.string(from: date)
+                        params["start_date"] = apiFormattedDate
+                    } else {
+                        print("Invalid date format in startDateText")
+                    }
+                }
+            }
+            
+            params["interval"] = chosenPlan?.lowercased()
+        }
+        
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+            uRLRequest.httpBody = jsonData
+            if let jsonString = String(data: jsonData, encoding: .utf8) {
+                print("JSON Payload: \(jsonString)")
+            }
+        } catch let error {
+            print("Error creating JSON data: \(error)")
+            hideLoadingIndicator()
+            return
+        }
+        
+        let session = URLSession.shared
+        let task = session.dataTask(with: uRLRequest) { (serviceData, serviceResponse, error) in
+            
+            DispatchQueue.main.async {
+                self.hideLoadingIndicator() // Stop loader when response is received
+            }
+            
+            if let error = error {
+                print("Error: \(error.localizedDescription)")
+                return
+            }
+            
+            guard let httpResponse = serviceResponse as? HTTPURLResponse else {
+                print("Invalid response")
+                return
+            }
+            
+            if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
+                if let data = serviceData {
+                    do {
+                        if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
+                            print("Response Data: \(responseObject)")
+                            
+                            // Check if status is 0 and handle the error
+                            if let status = responseObject["status"] as? Int, status == 0 {
+                                let errorMessage = responseObject["message"] as? String ?? "Unknown error"
+                                self.presentPaymentErrorVC(errorMessage: errorMessage)
+                            } else {
+                                DispatchQueue.main.async {
+                                    if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "ThreeDSecurePaymentDoneVC") as? ThreeDSecurePaymentDoneVC {
+                                        
+                                        let urlString = responseObject["redirect_url"] as? String ?? responseObject["location_url"] as? String ?? ""
+                                        paymentDoneVC.redirectURL = urlString
+                                        paymentDoneVC.chargeData = responseObject
+                                        paymentDoneVC.easyPayDelegate = self.easyPayDelegate
+                                        
+                                        self.navigationController?.pushViewController(paymentDoneVC, animated: true)
+                                    }
+                                }
+                            }
+                        } else {
+                            self.presentPaymentErrorVC(errorMessage: "Invalid JSON format")
+                        }
+                    } catch let jsonError {
+                        self.presentPaymentErrorVC(errorMessage: "Error parsing JSON: \(jsonError)")
+                    }
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "No data received")
+                }
+            } else {
+                if let data = serviceData,
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let message = responseObj["message"] as? String {
+                    self.presentPaymentErrorVC(errorMessage: message)
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                }
+            }
+        }
+        task.resume()
+    }
+    
+    // MARK: - Credit Card Charge Api If Billing info is not nil With Login from Add New Card.
+    func threeDSecurePaymentAddNewCardApi(customerId: String?) {
+        showLoadingIndicator()
+        
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.threeDSecure.path()
+        
+        guard let serviceURL = URL(string: fullURL) else {
+            print("Invalid URL")
+            hideLoadingIndicator()
+            return
+        }
+        
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "POST"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        
+        let token = UserStoreSingleton.shared.clientToken
+        print("Setting clientToken header: \(token ?? "None")")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
+        guard let billingInfoData = billingInfoData else {
+            print("Billing info data is nil")
+            hideLoadingIndicator()
+            return
+        }
+        
+        // Extract only the digits from the phone number (local only, no country code)
+        let localPhone = txtFieldPhoneNumber.text?.components(separatedBy: CharacterSet.decimalDigits.inverted).joined() ?? ""
+        
+        let additionalInfo: [String: Any] = [
+            "name": txtFieldName.text ?? "",
+            "email": txtFieldEmail.text ?? "",
+            "phone_number": localPhone,
+            "description": txtFieldDescription.text ?? ""
+        ]
+        
+        let billingInfo: [String: Any] = [
+            "address": billingInfoData["address"] as? String ?? "",
+            "country": billingInfoData["country"] as? String ?? "",
+            "state": billingInfoData["state"] as? String ?? "",
+            "city": billingInfoData["city"] as? String ?? "",
+            "postal_code": billingInfoData["postal_code"] as? String ?? ""
+        ]
+        
+        var params: [String: Any] = [
+            "name": nameOnCard ?? "",
+            "email": txtFieldEmail.text ?? "",
+            "card_number": cardNumber?.replacingOccurrences(of: " ", with: "") ?? "",
+            "cardholder_name": nameOnCard ?? "",
+            "exp_month": expiryDate?.components(separatedBy: "/").first ?? "",
+            "exp_year": expiryDate?.components(separatedBy: "/").last ?? "",
+            "cvc": cvv ?? "",
+            "description": "Test",
+            "currency": "usd",
+            "tokenize": request.tokenOnly ?? false,
+            "address": billingInfoData["address"] as? String ?? "",
+            "billing_info": billingInfo,
+            "additional_info": additionalInfo,
+            "save_card": isSavedNewCard ? 1 : 0,
+            "customer_id": customerId ?? ""
+        ]
+        
+        // Add is_default parameter if save_card is 1
+        if isSavedNewCard {
+            params["is_default"] = "1"
+        }
+        
+        // Add these if recurring is enabled
+        if let req = request, req.is_recurring == true {
+            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                // Only send start_date if type is .custom and field is not empty
+                if let startDateText = startDate, !startDateText.isEmpty {
+                    let inputFormatter = DateFormatter()
+                    inputFormatter.dateFormat = "dd/MM/yyyy"
+                    
+                    let outputFormatter = DateFormatter()
+                    outputFormatter.dateFormat = "MM/dd/yyyy"
+                    
+                    if let date = inputFormatter.date(from: startDateText) {
+                        let apiFormattedDate = outputFormatter.string(from: date)
+                        params["start_date"] = apiFormattedDate
+                    } else {
+                        print("Invalid date format in startDateText")
+                    }
+                }
+            }
+            
+            params["interval"] = chosenPlan?.lowercased()
+        }
+        
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+            uRLRequest.httpBody = jsonData
+            if let jsonString = String(data: jsonData, encoding: .utf8) {
+                print("JSON Payload: \(jsonString)")
+            }
+        } catch let error {
+            print("Error creating JSON data: \(error)")
+            hideLoadingIndicator()
+            return
+        }
+        
+        let session = URLSession.shared
+        let task = session.dataTask(with: uRLRequest) { (serviceData, serviceResponse, error) in
+            
+            DispatchQueue.main.async {
+                self.hideLoadingIndicator() // Stop loader when response is received
+            }
+            
+            if let error = error {
+                print("Error: \(error.localizedDescription)")
+                return
+            }
+            
+            guard let httpResponse = serviceResponse as? HTTPURLResponse else {
+                print("Invalid response")
+                return
+            }
+            
+            if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
+                if let data = serviceData {
+                    do {
+                        if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
+                            print("Response Data: \(responseObject)")
+                            
+                            // Check if status is 0 and handle the error
+                            if let status = responseObject["status"] as? Int, status == 0 {
+                                let errorMessage = responseObject["message"] as? String ?? "Unknown error"
+                                self.presentPaymentErrorVC(errorMessage: errorMessage)
+                            } else {
+                                DispatchQueue.main.async {
+                                    if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "ThreeDSecurePaymentDoneVC") as? ThreeDSecurePaymentDoneVC {
+                                        
+                                        let urlString = responseObject["redirect_url"] as? String ?? responseObject["location_url"] as? String ?? ""
+                                        paymentDoneVC.redirectURL = urlString
+                                        paymentDoneVC.chargeData = responseObject
+                                        paymentDoneVC.easyPayDelegate = self.easyPayDelegate
+                                        
+                                        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()
+    }
+    
 }
 
 extension AdditionalInfoVC: UITextFieldDelegate {