@jimrising/easymerchantsdk-react-native 1.3.4 → 1.3.6

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

@@ -196,6 +196,10 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var imgGrailPayAbandonError: UIImageView!
     @IBOutlet weak var lblGrailPayAabandonError: UILabel!
     
+    @IBOutlet weak var txtFieldChosePlanGrailPayBankView: TextFieldStackView!
+    @IBOutlet weak var txtFieldSelectDateGrailPayBankView: TextFieldStackView!
+    @IBOutlet weak var bankIconGrailPayBankView: UIImageView!
+    
     //New GrailPay Account
     @IBOutlet weak var viewAddNewGrailPayAccount: UIView!
     @IBOutlet weak var lblGrailPayNewAccount: UILabel!
@@ -216,6 +220,10 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var lblTermsAndConditionNewGrailPayAccountView: UILabel!
     @IBOutlet weak var btnChangeNewGrailPayAccountView: UIButton!
     
+    @IBOutlet weak var txtFieldChosePlanNewGrailPayBankView: TextFieldStackView!
+    @IBOutlet weak var txtFieldSelectDateNewGrailPayBankView: TextFieldStackView!
+    @IBOutlet weak var imgViewBankIconGrailPayNewBank: UIImageView!
+    
     //SavedBank
     @IBOutlet weak var viewSingleSavedAccount: UIView!
     @IBOutlet weak var viewTermAndConditionsSingleAccountView: UIStackView!
@@ -345,7 +353,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?
@@ -378,8 +386,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     var selectedNewGrailPayAccountName: String?
     var grailPayNewAccountCustomerID: String?
     
-    //    let planOptions = ["Weekly", "Monthly"]
-    
     var startDatePickerHandler: DatePickerHandler?
     
     //MARK: - View Did Load
@@ -518,33 +524,50 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func viewAppearanceOn() {
         viewTermAndConditionsSingleAccountView.isHidden = true
         btnPayNowSingleAccountView.isHidden = true
-        //  viewSingleAccountViewHeight.constant = 68
-        
         viewNewBankAccount.isHidden = true
-        
         viewTxtFieldCVVSingleCard.isHidden = true
         btnPayNowSingleCard.isHidden = true
-        
         self.viewCrypto.isHidden = true
         
-        if request.enableRecurring == true {
+        if request.is_recurring == true {
             self.txtFieldChosePlanCard.isHidden = false
-            self.txtFieldStartDateCard.isHidden = false
+            if request.recurringStartDateType == .custom {
+                self.txtFieldStartDateCard.isHidden = false
+                self.txtFieldSelectDateSingleSavedCard.isHidden = false
+                self.txtFieldSelectDateNewCardView.isHidden = false
+                self.txtFieldSelectDateViewBankFields.isHidden = false
+                self.txtFieldSelectDateSingleSavedBankView.isHidden = false
+                self.txtFieldSelectDateNewAccountView.isHidden = false
+                self.txtFieldSelectDateGrailPayBankView.isHidden = false
+                self.txtFieldSelectDateNewGrailPayBankView.isHidden = false
+                
+                self.heightViewBankFields.constant = 696
+                self.heightViewNewCardFields.constant = 624
+                self.heightViewNewAccountFields.constant = 808
+                self.heightSubViewNewAccountFields.constant = 738
+            } else {
+                self.txtFieldStartDateCard.isHidden = true
+                self.txtFieldSelectDateSingleSavedCard.isHidden = true
+                self.txtFieldSelectDateNewCardView.isHidden = true
+                self.txtFieldSelectDateViewBankFields.isHidden = true
+                self.txtFieldSelectDateSingleSavedBankView.isHidden = true
+                self.txtFieldSelectDateNewAccountView.isHidden = true
+                self.txtFieldSelectDateGrailPayBankView.isHidden = true
+                self.txtFieldSelectDateNewGrailPayBankView.isHidden = true
+                
+                self.heightViewBankFields.constant = 600
+                self.heightViewNewCardFields.constant = 529
+                self.heightViewNewAccountFields.constant = 713
+                self.heightSubViewNewAccountFields.constant = 643
+            }
+            
             self.txtFieldSelectPlanSingleSavedCard.isHidden = false
-            self.txtFieldSelectDateSingleSavedCard.isHidden = false
             self.txtFieldSelectPlanNewCardView.isHidden = false
-            self.txtFieldSelectDateNewCardView.isHidden = false
             self.txtFieldSelectPlanViewBankFields.isHidden = false
-            self.txtFieldSelectDateViewBankFields.isHidden = false
             self.txtFieldSelectPlanSingleSavedBankView.isHidden = false
-            self.txtFieldSelectDateSingleSavedBankView.isHidden = false
             self.txtFieldSelectPlanNewAccountView.isHidden = false
-            self.txtFieldSelectDateNewAccountView.isHidden = false
-            
-            self.heightViewBankFields.constant = 696
-            self.heightViewNewCardFields.constant = 624
-            self.heightViewNewAccountFields.constant = 808
-            self.heightSubViewNewAccountFields.constant = 738
+            self.txtFieldChosePlanGrailPayBankView.isHidden = false
+            self.txtFieldChosePlanNewGrailPayBankView.isHidden = false
         }
         else {
             self.txtFieldChosePlanCard.isHidden = true
@@ -559,6 +582,10 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             self.txtFieldSelectDateSingleSavedBankView.isHidden = true
             self.txtFieldSelectPlanNewAccountView.isHidden = true
             self.txtFieldSelectDateNewAccountView.isHidden = true
+            self.txtFieldChosePlanGrailPayBankView.isHidden = true
+            self.txtFieldChosePlanNewGrailPayBankView.isHidden = true
+            self.txtFieldSelectDateGrailPayBankView.isHidden = true
+            self.txtFieldSelectDateNewGrailPayBankView.isHidden = true
             
             self.heightViewBankFields.constant = 506
             self.heightViewNewCardFields.constant = 434
@@ -612,9 +639,14 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         btnNext.isHidden = true
                         btnNextHeight.constant = 0
                         btnNextTopCon.constant = 0
-                        if request.enableRecurring == true {
+                        if request.is_recurring == true {
                             txtFieldSelectPlanSingleSavedCard.isHidden = false
-                            txtFieldSelectDateSingleSavedCard.isHidden = false
+                            if request.recurringStartDateType == .custom {
+                                txtFieldSelectDateSingleSavedCard.isHidden = false
+                            }
+                            else {
+                                txtFieldSelectDateSingleSavedCard.isHidden = true
+                            }
                         }
                         else {
                             txtFieldSelectPlanSingleSavedCard.isHidden = true
@@ -687,9 +719,14 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 if self.isSelectForPayBank {
                     self.viewTermAndConditionsSingleAccountView.isHidden = false
                     self.btnPayNowSingleAccountView.isHidden = false
-                    if request.enableRecurring == true {
+                    if request.is_recurring == true {
                         self.txtFieldSelectPlanSingleSavedBankView.isHidden = false
-                        self.txtFieldSelectDateSingleSavedBankView.isHidden = false
+                        if request.recurringStartDateType == .custom {
+                            self.txtFieldSelectDateSingleSavedBankView.isHidden = false
+                        }
+                        else {
+                            self.txtFieldSelectDateSingleSavedBankView.isHidden = true
+                        }
                     }
                     else {
                         self.txtFieldSelectPlanSingleSavedBankView.isHidden = true
@@ -734,8 +771,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     }
                 }
                 else {
-//                    self.viewBankFields.isHidden = false
-//                    self.viewTermsAndConditions.isHidden = false
+                    // self.viewBankFields.isHidden = false
+                    // self.viewTermsAndConditions.isHidden = false
                     self.grailPayBankLinkView.isHidden = true
                 }
             }
@@ -799,8 +836,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             tblViewAccountTypes.backgroundColor = uiColor
             viewAccountTypeNewAccountView.backgroundColor = uiColor
             tblViewAccountTypeNewAccountView.backgroundColor = uiColor
-            //            viewTblViewRecurring.backgroundColor = uiColor
-            //            tblViewRecurring.backgroundColor = uiColor
+            // viewTblViewRecurring.backgroundColor = uiColor
+            // tblViewRecurring.backgroundColor = uiColor
         }
         
         if let bodyBackGroundColor = UserStoreSingleton.shared.body_bg_col,
@@ -970,7 +1007,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         if let primaryFontColor = UserStoreSingleton.shared.primary_font_col,
            let uiColor = UIColor(hex: primaryFontColor) {
             lblChosePaymentMethod.textColor = uiColor
-            lblGrailPayNewAccount.tintColor = uiColor
+            lblGrailPayNewAccount.textColor = uiColor
             subLblGrailPayNewAccount.textColor = uiColor
             lblSavedInfoEmailView.textColor = uiColor
             subLblSavedEmailInfo.textColor = uiColor
@@ -989,6 +1026,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             lblCreateNewCard.textColor = uiColor
             lblAccountNumberSingleAccountView.textColor = uiColor
             bankIconImgView.tintColor = uiColor
+            imgViewSigleSavedCard.tintColor = uiColor
+            imgViewSigleSavedCard.tintColor = uiColor
+            bankIconGrailPayBankView.tintColor = uiColor
+            imgViewBankIconGrailPayNewBank.tintColor = uiColor
+            imgViewCardUpdateCardView.tintColor = uiColor
             lblChangeAccount.textColor = uiColor
             subLblChangeAccount.textColor = uiColor
             lblNewAccount.textColor = uiColor
@@ -1505,7 +1547,12 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         //            self.viewTblViewRecurring.isHidden.toggle()
         //        }
         
-        PlanSelector.presentPlanOptions(from: self, sourceView: sender) { selectedPlan in
+        guard let plans = request?.recurringIntervals, !plans.isEmpty else {
+            print("No recurring intervals available.")
+            return
+        }
+        
+        PlanSelector.presentPlanOptions(from: self, sourceView: sender, allowedPlans: plans) { selectedPlan in
             self.txtFieldChosePlanCard.text = selectedPlan
         }
     }
@@ -1519,7 +1566,12 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     @IBAction func actionBtnSelectPlanSingleSavedCard(_ sender: UIButton) {
-        PlanSelector.presentPlanOptions(from: self, sourceView: sender) { selectedPlan in
+        guard let plans = request?.recurringIntervals, !plans.isEmpty else {
+            print("No recurring intervals available.")
+            return
+        }
+        
+        PlanSelector.presentPlanOptions(from: self, sourceView: sender, allowedPlans: plans) { selectedPlan in
             self.txtFieldSelectPlanSingleSavedCard.text = selectedPlan
         }
     }
@@ -1533,7 +1585,12 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     @IBAction func actionBtnSelectPlanNewCardView(_ sender: UIButton) {
-        PlanSelector.presentPlanOptions(from: self, sourceView: sender) { selectedPlan in
+        guard let plans = request?.recurringIntervals, !plans.isEmpty else {
+            print("No recurring intervals available.")
+            return
+        }
+        
+        PlanSelector.presentPlanOptions(from: self, sourceView: sender, allowedPlans: plans) { selectedPlan in
             self.txtFieldSelectPlanNewCardView.text = selectedPlan
         }
     }
@@ -1547,7 +1604,12 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     @IBAction func actionBtnSelectPlanViewBankFields(_ sender: UIButton) {
-        PlanSelector.presentPlanOptions(from: self, sourceView: sender) { selectedPlan in
+        guard let plans = request?.recurringIntervals, !plans.isEmpty else {
+            print("No recurring intervals available.")
+            return
+        }
+        
+        PlanSelector.presentPlanOptions(from: self, sourceView: sender, allowedPlans: plans) { selectedPlan in
             self.txtFieldSelectPlanViewBankFields.text = selectedPlan
         }
     }
@@ -1561,7 +1623,12 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     @IBAction func actionBtnSelectPlanSingleSavedAccount(_ sender: UIButton) {
-        PlanSelector.presentPlanOptions(from: self, sourceView: sender) { selectedPlan in
+        guard let plans = request?.recurringIntervals, !plans.isEmpty else {
+            print("No recurring intervals available.")
+            return
+        }
+        
+        PlanSelector.presentPlanOptions(from: self, sourceView: sender, allowedPlans: plans) { selectedPlan in
             self.txtFieldSelectPlanSingleSavedBankView.text = selectedPlan
         }
     }
@@ -1575,7 +1642,12 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     @IBAction func actionBtnSelectPlanNewAccountView(_ sender: UIButton) {
-        PlanSelector.presentPlanOptions(from: self, sourceView: sender) { selectedPlan in
+        guard let plans = request?.recurringIntervals, !plans.isEmpty else {
+            print("No recurring intervals available.")
+            return
+        }
+        
+        PlanSelector.presentPlanOptions(from: self, sourceView: sender, allowedPlans: plans) { selectedPlan in
             self.txtFieldSelectPlanNewAccountView.text = selectedPlan
         }
     }
@@ -1591,6 +1663,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBAction func actionBtnClose(_ sender: UIButton) {
         UserStoreSingleton.shared.clearUserData()
         UserStoreSingleton.shared.isLoggedIn = false
+        
+        // Notify delegate about cancellation with custom message
+        let result = Result(type: .cancelled, chargeData: ["message": "You’ve exited the payment screen. No transaction was made."])
+        self.delegate?.easyPayController(self.navigationController as! EasyPayViewController, didFinishWith: result)
+        
         self.dismiss(animated: true)
     }
     
@@ -1620,6 +1697,12 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     @IBAction func actionBtnSelectSingleSavedCard(_ sender: UIButton) {
+        // Use the currently selectedCardIndex instead of sender.tag
+        guard let index = selectedCardIndex, index < savedCards.count else {
+            showAlert(title: "No Card Selected", message: "Please select a card from the list first.")
+            return
+        }
+        
         // Toggle selection state
         isSelectForPay.toggle()
         
@@ -1635,13 +1718,15 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         btnNextTopCon.constant = isSelectForPay ? 0 : 8
         
         // Handle recurring fields visibility
-        let showRecurringFields = isSelectForPay && request.enableRecurring == true
+        let showRecurringFields = isSelectForPay && request.is_recurring == true
+        let isCustomRecurring = request.recurringStartDateType == .custom
         txtFieldSelectPlanSingleSavedCard.isHidden = !showRecurringFields
-        txtFieldSelectDateSingleSavedCard.isHidden = !showRecurringFields
+        txtFieldSelectDateSingleSavedCard.isHidden = !(showRecurringFields && isCustomRecurring)
         
-        // Set selected card
-        if isSelectForPay, let firstCard = savedCards.first {
-            selectedCard = firstCard
+        // Set selected card based on tapped index
+        if isSelectForPay, index < savedCards.count {
+            selectedCard = savedCards[index]
+            selectedCardIndex = index // Optional: track selected index
         }
     }
     
@@ -1678,8 +1763,25 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             
             if cvvText.isEmpty {
                 self.showAlert(title: "Missing CVV", message: "Please enter the CVV to proceed.")
+                return
             } else if cvvText.count < 3 {
                 self.showAlert(title: "Invalid CVV", message: "CVV must be at least 3 digits.")
+                return
+            }
+            
+            // Recurring Plan + Date Validation (only if is_recurring is true)
+            if let req = self.request, req.is_recurring == true {
+                if txtFieldSelectPlanSingleSavedCard.text.isEmpty {
+                    self.showAlert(title: "Missing Information", message: "Please choose your plan.")
+                    return
+                }
+                
+                if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                    if txtFieldSelectDateSingleSavedCard.text.isEmpty {
+                        self.showAlert(title: "Missing Information", message: "Please select a plan start date.")
+                        return
+                    }
+                }
             }
             
             // Instantiate BillingInfoVC and pass the selected card data and CVV text
@@ -1698,6 +1800,10 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 billingInfoVC.billingInfoData = jsonDict
             }
             
+            billingInfoVC.request = self.request
+            billingInfoVC.chosenPlan = txtFieldSelectPlanSingleSavedCard.text
+            billingInfoVC.startDate = txtFieldSelectDateSingleSavedCard.text
+            
             // Navigate to BillingInfoVC
             self.navigationController?.pushViewController(billingInfoVC, animated: true)
         }
@@ -1707,13 +1813,29 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             
             if cvvText.isEmpty {
                 self.showAlert(title: "Missing CVV", message: "Please enter the CVV to proceed.")
-            }
-            else if cvvText.count < 3 {
+                return
+            } else if cvvText.count < 3 {
                 self.showAlert(title: "Invalid CVV", message: "CVV must be at least 3 digits.")
+                return
             }
-            else {
-                paymentIntentFromShowSavedCardApi()
+            
+            // Recurring Plan + Date Validation (only if is_recurring is true)
+            if let req = self.request, req.is_recurring == true {
+                if txtFieldSelectPlanSingleSavedCard.text.isEmpty {
+                    self.showAlert(title: "Missing Information", message: "Please choose your plan.")
+                    return
+                }
+                
+                if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                    if txtFieldSelectDateSingleSavedCard.text.isEmpty {
+                        self.showAlert(title: "Missing Information", message: "Please select a plan start date.")
+                        return
+                    }
+                }
             }
+            
+            // All validations passed, call the API
+            paymentIntentFromShowSavedCardApi()
         }
     }
     
@@ -1812,6 +1934,21 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     return
                 }
                 
+                // Recurring Plan + Date Validation (only if is_recurring is true)
+                if let req = self.request, req.is_recurring == true {
+                    if txtFieldSelectPlanNewCardView.text.isEmpty {
+                        self.showAlert(title: "Missing Information", message: "Please choose your plan.")
+                        return
+                    }
+                    
+                    if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                        if txtFieldSelectDateNewCardView.text.isEmpty {
+                            self.showAlert(title: "Missing Information", message: "Please select a plan start date.")
+                            return
+                        }
+                    }
+                }
+                
                 // Instantiate BillingInfoVC and pass the card details
                 let billingInfoVC = UIStoryboard(name: "easymerchantsdk", bundle: .easyPayBundle).instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
                 
@@ -1833,11 +1970,20 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     billingInfoVC.billingInfoData = jsonDict
                 }
                 
+                billingInfoVC.request = self.request
+                billingInfoVC.chosenPlan = txtFieldSelectPlanNewCardView.text
+                billingInfoVC.startDate = txtFieldSelectDateNewCardView.text
+                
                 // Navigate to BillingInfoVC
                 self.navigationController?.pushViewController(billingInfoVC, animated: true)
             }
             else {
-                paymentIntentFromAddNewCardApi(customerId: UserStoreSingleton.shared.customerId)
+                if request.enable3DS == true {
+                    threeDSecurePaymentNewCardApi(customerId: UserStoreSingleton.shared.customerId ?? "")
+                }
+                else {
+                    paymentIntentFromAddNewCardApi(customerId: UserStoreSingleton.shared.customerId)
+                }
             }
         }
     }
@@ -1894,6 +2040,44 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         self.viewSingleSavedAccount.isHidden = false
     }
     
+    @IBAction func actionBtnChosePlanGrailPayBankView(_ sender: UIButton) {
+        guard let plans = request?.recurringIntervals, !plans.isEmpty else {
+            print("No recurring intervals available.")
+            return
+        }
+        
+        PlanSelector.presentPlanOptions(from: self, sourceView: sender, allowedPlans: plans) { selectedPlan in
+            self.txtFieldChosePlanGrailPayBankView.text = selectedPlan
+        }
+    }
+    
+    @IBAction func actionBtnSelectDateGrailPayBankView(_ sender: UIButton) {
+        startDatePickerHandler = DatePickerHandler(textField: txtFieldSelectDateGrailPayBankView.textField)
+        startDatePickerHandler?.onDateSelected = { selectedDate in
+            
+        }
+        txtFieldSelectDateGrailPayBankView.textField.becomeFirstResponder()
+    }
+    
+    @IBAction func actionBtnSelectPlanNewGrailPayBankView(_ sender: UIButton) {
+        guard let plans = request?.recurringIntervals, !plans.isEmpty else {
+            print("No recurring intervals available.")
+            return
+        }
+        
+        PlanSelector.presentPlanOptions(from: self, sourceView: sender, allowedPlans: plans) { selectedPlan in
+            self.txtFieldChosePlanNewGrailPayBankView.text = selectedPlan
+        }
+    }
+    
+    @IBAction func actionBtnSelectDateNewGrailPayBankView(_ sender: UIButton) {
+        startDatePickerHandler = DatePickerHandler(textField: txtFieldSelectDateNewGrailPayBankView.textField)
+        startDatePickerHandler?.onDateSelected = { selectedDate in
+            
+        }
+        txtFieldSelectDateNewGrailPayBankView.textField.becomeFirstResponder()
+    }
+    
     //MARK: - Account Connect Api
     func accountConnectApi(account: [String: Any]) {
         showLoadingIndicator()
@@ -1906,15 +2090,15 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             return
         }
         
-        var request = URLRequest(url: serviceURL)
-        request.httpMethod = "POST"
-        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "POST"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         // Add API headers
         if let apiKey = EnvironmentConfig.apiKey,
            let apiSecret = EnvironmentConfig.apiSecret {
-            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
         }
         
         // Prepare parameters
@@ -1937,7 +2121,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         
         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:\n\(jsonString)")
@@ -1948,7 +2132,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             return
         }
         
-        let task = URLSession.shared.dataTask(with: request) { data, response, error in
+        let task = URLSession.shared.dataTask(with: uRLRequest) { data, response, error in
             DispatchQueue.main.async { self.hideLoadingIndicator() }
             
             if let error = error {
@@ -1986,6 +2170,16 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             self.viewGrailPaySavedBank.isHidden = false
                             self.viewGrailPaySavedAccount.isHidden = false
                             
+                            if self.request.is_recurring == true {
+                                self.txtFieldChosePlanGrailPayBankView.isHidden = false
+                                if self.request.recurringStartDateType == .custom {
+                                    self.txtFieldSelectDateGrailPayBankView.isHidden = false
+                                }
+                                else {
+                                    self.txtFieldSelectDateGrailPayBankView.isHidden = true
+                                }
+                            }
+                            
                             if let accountNumber = account["account_number"] as? String {
                                 let last4 = String(accountNumber.suffix(4))
                                 self.lblGrailPaySavedAccountNumber.text = "****\(last4)"
@@ -2131,6 +2325,16 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             self.grailPayNewSavedAccountView.isHidden = false
                             self.viewGrailPayNewAccountDetail.isHidden = false
                             
+                            if self.request.is_recurring == true {
+                                self.txtFieldChosePlanNewGrailPayBankView.isHidden = false
+                                if self.request.recurringStartDateType == .custom {
+                                    self.txtFieldSelectDateNewGrailPayBankView.isHidden = false
+                                }
+                                else {
+                                    self.txtFieldSelectDateNewGrailPayBankView.isHidden = true
+                                }
+                            }
+                            
                             if let accountNumber = account["account_number"] as? String {
                                 let last4 = String(accountNumber.suffix(4))
                                 self.lblGrailPayNewAccountNumber.text = "****\(last4)"
@@ -2177,6 +2381,21 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     
     @IBAction private func actionBtnLinkGrailPayBankAccount(_ sender: UIButton) {
         if isBankAccountConnected {
+            // Recurring Plan + Date Validation (only if is_recurring is true)
+            if let req = self.request, req.is_recurring == true {
+                if self.txtFieldChosePlanGrailPayBankView.text.isEmpty {
+                    self.showAlert(title: "Missing Information", message: "Please choose your plan.")
+                    return
+                }
+                
+                if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                    if self.txtFieldSelectDateGrailPayBankView.text.isEmpty {
+                        self.showAlert(title: "Missing Information", message: "Please select start date.")
+                        return
+                    }
+                }
+            }
+            
             guard agreeTermsAndCondtition else {
                 self.showAlert(title: "Terms and Conditions", message: "Please agree to the terms and conditions")
                 return
@@ -2203,6 +2422,21 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     
     @IBAction func actionLinkNewGrailPayAccount(_ sender: UIButton) {
         if isNewBankAccountConnected {
+            // Recurring Plan + Date Validation (only if is_recurring is true)
+            if let req = self.request, req.is_recurring == true {
+                if self.txtFieldChosePlanNewGrailPayBankView.text.isEmpty {
+                    self.showAlert(title: "Missing Information", message: "Please choose your plan.")
+                    return
+                }
+                
+                if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                    if self.txtFieldSelectDateNewGrailPayBankView.text.isEmpty {
+                        self.showAlert(title: "Missing Information", message: "Please select start date.")
+                        return
+                    }
+                }
+            }
+            
             guard agreeTermsAndCondtition else {
                 self.showAlert(title: "Terms and Conditions", message: "Please agree to the terms and conditions")
                 return
@@ -2316,22 +2550,22 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             return
         }
         
-        var request = URLRequest(url: serviceURL)
-        request.httpMethod = "POST"
-        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "POST"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
         print("Setting clientToken header: \(token ?? "None")")
-        request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
         if let apiKey = EnvironmentConfig.apiKey {
-            request.addValue(apiKey, forHTTPHeaderField: "X-Api-Key")
+            uRLRequest.addValue(apiKey, forHTTPHeaderField: "X-Api-Key")
         }
         if let apiSecret = EnvironmentConfig.apiSecret {
-            request.addValue(apiSecret, forHTTPHeaderField: "X-Api-Secret")
+            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "X-Api-Secret")
         }
         
-        let params: [String: Any] = [
+        var params: [String: Any] = [
             "account_id": self.grailPayAccountID ?? "",
             "account_type": self.selectedGrailPayAccountType ?? "",
             "name": self.selectedGrailPayAccountName ?? "",
@@ -2339,11 +2573,34 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "email": "newmerchantadminuser12@test.com"
         ]
         
+        // Add these if recurring is enabled
+        if let req = request, req.is_recurring == true {
+            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                // Only send start_date if type is .custom and field is not empty
+                if let startDateText = txtFieldSelectDateGrailPayBankView?.text, !startDateText.isEmpty {
+                    let inputFormatter = DateFormatter()
+                    inputFormatter.dateFormat = "dd/MM/yyyy"
+                    
+                    let outputFormatter = DateFormatter()
+                    outputFormatter.dateFormat = "MM/dd/yyyy"
+                    
+                    if let date = inputFormatter.date(from: startDateText) {
+                        let apiFormattedDate = outputFormatter.string(from: date)
+                        params["start_date"] = apiFormattedDate
+                    } else {
+                        print("Invalid date format in startDateText")
+                    }
+                }
+            }
+            
+            params["interval"] = txtFieldChosePlanGrailPayBankView.text.lowercased()
+        }
+        
         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)")
             }
@@ -2354,7 +2611,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
         
         let session = URLSession.shared
-        let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
+        let task = session.dataTask(with: uRLRequest) { (serviceData, serviceResponse, error) in
             
             DispatchQueue.main.async {
                 self.hideLoadingIndicator() // Stop loader when response is received
@@ -2424,22 +2681,22 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             return
         }
         
-        var request = URLRequest(url: serviceURL)
-        request.httpMethod = "POST"
-        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "POST"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
         print("Setting clientToken header: \(token ?? "None")")
-        request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
         if let apiKey = EnvironmentConfig.apiKey {
-            request.addValue(apiKey, forHTTPHeaderField: "X-Api-Key")
+            uRLRequest.addValue(apiKey, forHTTPHeaderField: "X-Api-Key")
         }
         if let apiSecret = EnvironmentConfig.apiSecret {
-            request.addValue(apiSecret, forHTTPHeaderField: "X-Api-Secret")
+            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "X-Api-Secret")
         }
         
-        let params: [String: Any] = [
+        var params: [String: Any] = [
             "account_id": self.newGrailPayAccountID ?? "",
             "account_type": self.selectedNewGrailPayAccountType ?? "",
             "name": self.selectedNewGrailPayAccountName ?? "",
@@ -2447,11 +2704,34 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "customer_id": self.grailPayNewAccountCustomerID ?? ""
         ]
         
+        // 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 = txtFieldSelectDateNewGrailPayBankView?.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"] = txtFieldChosePlanNewGrailPayBankView.text.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)")
             }
@@ -2462,7 +2742,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
         
         let session = URLSession.shared
-        let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
+        let task = session.dataTask(with: uRLRequest) { (serviceData, serviceResponse, error) in
             
             DispatchQueue.main.async {
                 self.hideLoadingIndicator() // Stop loader when response is received
@@ -2532,22 +2812,22 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             return
         }
         
-        var request = URLRequest(url: serviceURL)
-        request.httpMethod = "POST"
-        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "POST"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
         print("Setting clientToken header: \(token ?? "None")")
-        request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
         if let apiKey = EnvironmentConfig.apiKey {
-            request.addValue(apiKey, forHTTPHeaderField: "X-Api-Key")
+            uRLRequest.addValue(apiKey, forHTTPHeaderField: "X-Api-Key")
         }
         if let apiSecret = EnvironmentConfig.apiSecret {
-            request.addValue(apiSecret, forHTTPHeaderField: "X-Api-Secret")
+            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "X-Api-Secret")
         }
         
-        let params: [String: Any] = [
+        var params: [String: Any] = [
             "account_id": self.newGrailPayAccountID ?? "",
             "account_type": self.selectedNewGrailPayAccountType ?? "",
             "name": self.selectedNewGrailPayAccountName ?? "",
@@ -2557,11 +2837,34 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "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 = txtFieldSelectDateNewGrailPayBankView?.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"] = txtFieldChosePlanNewGrailPayBankView.text.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)")
             }
@@ -2572,7 +2875,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
         
         let session = URLSession.shared
-        let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
+        let task = session.dataTask(with: uRLRequest) { (serviceData, serviceResponse, error) in
             
             DispatchQueue.main.async {
                 self.hideLoadingIndicator() // Stop loader when response is received
@@ -2643,33 +2946,56 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             return
         }
         
-        var request = URLRequest(url: serviceURL)
-        request.httpMethod = "POST"
-        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "POST"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
         print("Setting clientToken header: \(token ?? "None")")
-        request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
         if let apiKey = EnvironmentConfig.apiKey {
-            request.addValue(apiKey, forHTTPHeaderField: "X-Api-Key")
+            uRLRequest.addValue(apiKey, forHTTPHeaderField: "X-Api-Key")
         }
         if let apiSecret = EnvironmentConfig.apiSecret {
-            request.addValue(apiSecret, forHTTPHeaderField: "X-Api-Secret")
+            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "X-Api-Secret")
         }
         
-        let params: [String: Any] = [
+        var params: [String: Any] = [
             "account_id": selectedbankAccounts?.account_id ?? "",
             "customer": selectedbankAccounts?.customer_id ?? "",
             "description": "payment checkout",
             "currency": "usd",
         ]
         
+        // 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 = txtFieldSelectDateSingleSavedBankView?.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"] = txtFieldSelectPlanSingleSavedBankView.text.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)")
             }
@@ -2680,7 +3006,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
         
         let session = URLSession.shared
-        let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
+        let task = session.dataTask(with: uRLRequest) { (serviceData, serviceResponse, error) in
             
             DispatchQueue.main.async {
                 self.hideLoadingIndicator() // Stop loader when response is received
@@ -2773,71 +3099,145 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         // Validation checks
                         if cardNumber.isEmpty {
                             self.showAlert(title: "Missing Information", message: "Card Number is required.")
+                            return
                         } else if sanitizedCardNumber.count != 16 {
                             self.showAlert(title: "Invalid Card Number", message: "Card Number must be 16 digits.")
+                            return
                         } else if expiryDate.isEmpty {
                             self.showAlert(title: "Missing Information", message: "Card Expiry Date is required.")
-                        } else if !expiryDate.matches(expiryDateRegex) {
+                            return
+                        }
+                        else if !expiryDate.matches(expiryDateRegex) {
                             self.showAlert(title: "Invalid Expiry Date", message: "Expiry Date must be in format MM/yyyy (e.g., 02/2026).")
-                        } else if cvv.isEmpty {
+                            return
+                        }
+                        else {
+                            // Check if expiry date is past tomorrow
+                            let dateFormatter = DateFormatter()
+                            dateFormatter.dateFormat = "MM/yyyy"
+                            dateFormatter.timeZone = TimeZone.current
+                            if let expDate = dateFormatter.date(from: expiryDate) {
+                                let calendar = Calendar.current
+                                // Get start of the month following expiry
+                                let expiryMonthStart = calendar.date(from: calendar.dateComponents([.year, .month], from: expDate))!
+                                let endOfMonth = calendar.date(byAdding: DateComponents(month: 1, day: -1), to: expiryMonthStart)!
+                                
+                                let tomorrow = calendar.date(byAdding: .day, value: 1, to: Date())!
+                                if endOfMonth < tomorrow {
+                                    self.showAlert(title: "Expired Card", message: "Card is expired or please enter a valid expiry date.")
+                                    return
+                                }
+                            } else {
+                                self.showAlert(title: "Invalid Expiry Date", message: "Unable to parse expiry date.")
+                                return
+                            }
+                        }
+                        
+                        if cvv.isEmpty {
                             self.showAlert(title: "Missing Information", message: "Card CVV Number is required.")
+                            return
                         } else if cvv.count < 3 {
                             self.showAlert(title: "Invalid CVV", message: "CVV must be at least 3 digits.")
+                            return
                         } else if cardName.isEmpty {
                             self.showAlert(title: "Missing Information", message: "Card Name is required.")
+                            return
                         } else if !cardName.matches(nameRegex) {
                             self.showAlert(title: "Invalid Name", message: "Name must contain only letters and spaces.")
-                        } else {
-                            // Proceed to BillingInfoVC
-                            let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
-                            vc.billingInfoData = jsonDict
-                            vc.cardNumber = cardNumber
-                            vc.expiryDate = expiryDate
-                            vc.cvv = cvv
-                            vc.nameOnCard = cardName
-                            vc.selectedPaymentMethod = self.selectedPaymentMethod
-                            vc.isSavedForFuture = self.isSavedForFuture
-                            self.navigationController?.pushViewController(vc, animated: true)
+                            return
+                        }
+                        
+                        // Recurring Plan + Date Validation (only if is_recurring is true)
+                        if let req = self.request, req.is_recurring == true {
+                            if self.txtFieldChosePlanCard.text.isEmpty {
+                                self.showAlert(title: "Missing Information", message: "Please choose your plan.")
+                                return
+                            }
+                            
+                            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                                if self.txtFieldStartDateCard.text.isEmpty {
+                                    self.showAlert(title: "Missing Information", message: "Please select start date.")
+                                    return
+                                }
+                            }
                         }
+                        
+                        // Proceed to BillingInfoVC
+                        let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
+                        vc.billingInfoData = jsonDict
+                        vc.cardNumber = cardNumber
+                        vc.expiryDate = expiryDate
+                        vc.cvv = cvv
+                        vc.nameOnCard = cardName
+                        vc.selectedPaymentMethod = self.selectedPaymentMethod
+                        vc.isSavedForFuture = self.isSavedForFuture
+                        vc.request = self.request
+                        vc.chosenPlan = self.txtFieldChosePlanCard.text
+                        vc.startDate = self.txtFieldStartDateCard.text
+                        self.navigationController?.pushViewController(vc, animated: true)
                     }
                     else if self.selectedPaymentMethod == "Bank" {
                         // Bank Case
                         if self.txtFieldAccountName.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
                             self.showAlert(title: "Missing Information", message: "Bank account name is required.")
+                            return
                         } else if self.txtFieldRoutingNumber.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
                             self.showAlert(title: "Missing Information", message: "Routing number is required.")
+                            return
                         }
                         else if let routingNumber = self.txtFieldRoutingNumber.text?.replacingOccurrences(of: " ", with: ""), routingNumber.count != 9 || !CharacterSet.decimalDigits.isSuperset(of: CharacterSet(charactersIn: routingNumber)) {
                             self.showAlert(title: "Invalid Routing Number", message: "Routing number is not correct. It must be exactly 9 digits.")
+                            return
                         }
                         else if self.txtFieldAccountType.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
                             self.showAlert(title: "Missing Information", message: "Bank account type is required.")
+                            return
                         } else if self.txtFieldAccountNumber.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
                             self.showAlert(title: "Missing Information", message: "Bank account number is required.")
+                            return
                         }
                         else if self.txtFieldConfirmBankAccount.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
                             self.showAlert(title: "Missing Information", message: "Please confirm your bank account number.")
+                            return
                         }
                         else if self.txtFieldAccountNumber.text?.trimmingCharacters(in: .whitespacesAndNewlines) != self.txtFieldConfirmBankAccount.text?.trimmingCharacters(in: .whitespacesAndNewlines) {
                             self.showAlert(title: "Account Mismatch", message: "Bank account number and confirmation do not match.")
+                            return
                         }
                         else if !self.agreeTermsAndCondtition {
                             self.showAlert(title: "Terms and Conditions", message: "Please agree to the terms and conditions")
                             return
                         }
-                        else {
-                            // Proceed to BillingInfoVC
-                            let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
-                            vc.accountName = self.txtFieldAccountName.text
-                            vc.routingNumber = self.txtFieldRoutingNumber.text
-                            vc.accountType = self.txtFieldAccountType.text
-                            vc.accountNumber = self.txtFieldAccountNumber.text
-                            vc.billingInfoData = jsonDict
-                            vc.selectedPaymentMethod = self.selectedPaymentMethod
-                            vc.isSavedForFuture = self.isSavedForFuture
-                            vc.isFrom = "NormalBankPayWithoutSave"
-                            self.navigationController?.pushViewController(vc, animated: true)
+                        
+                        // Recurring Plan + Date Validation (only if is_recurring is true)
+                        if let req = self.request, req.is_recurring == true {
+                            if self.txtFieldSelectPlanViewBankFields.text.isEmpty {
+                                self.showAlert(title: "Missing Information", message: "Please choose your plan.")
+                                return
+                            }
+                            
+                            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                                if self.txtFieldSelectDateViewBankFields.text.isEmpty {
+                                    self.showAlert(title: "Missing Information", message: "Please select start date.")
+                                    return
+                                }
+                            }
                         }
+                        
+                        // Proceed to BillingInfoVC
+                        let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
+                        vc.accountName = self.txtFieldAccountName.text
+                        vc.routingNumber = self.txtFieldRoutingNumber.text
+                        vc.accountType = self.txtFieldAccountType.text
+                        vc.accountNumber = self.txtFieldAccountNumber.text
+                        vc.billingInfoData = jsonDict
+                        vc.selectedPaymentMethod = self.selectedPaymentMethod
+                        vc.isSavedForFuture = self.isSavedForFuture
+                        vc.isFrom = "NormalBankPayWithoutSave"
+                        vc.chosenPlan = self.txtFieldSelectPlanViewBankFields.text
+                        vc.startDate = self.txtFieldSelectDateViewBankFields.text
+                        vc.request = self.request
+                        self.navigationController?.pushViewController(vc, animated: true)
                     }
                 }
             }
@@ -2864,27 +3264,79 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 // Validation checks
                 if cardNumber.isEmpty {
                     self.showAlert(title: "Missing Information", message: "Card Number is required.")
+                    return
                 } else if sanitizedCardNumber.count != 16 {
                     self.showAlert(title: "Invalid Card Number", message: "Card Number must be 16 digits.")
+                    return
                 } else if expiryDate.isEmpty {
                     self.showAlert(title: "Missing Information", message: "Card Expiry Date is required.")
-                } else if !expiryDate.matches(expiryDateRegex) {
+                    return
+                }
+                
+                else if !expiryDate.matches(expiryDateRegex) {
                     self.showAlert(title: "Invalid Expiry Date", message: "Expiry Date must be in format MM/yyyy (e.g., 02/2026).")
-                } else if cvv.isEmpty {
-                    self.showAlert(title: "Missing Information", message: "Card CVV Number is required.")
-                } else if cvv.count < 3 {
-                    self.showAlert(title: "Invalid CVV", message: "CVV must be at least 3 digits.")
-                } else if cardName.isEmpty {
-                    self.showAlert(title: "Missing Information", message: "Card Name is required.")
-                } else if !cardName.matches(nameRegex) {
-                    self.showAlert(title: "Invalid Name", message: "Name must contain only letters and spaces.")
+                    return
                 }
                 else {
-                    // Navigate to EmailVerificationVC if isSavedForFuture is true, else call paymentIntentApi
-                    if isSavedForFuture {
-                        navigateCardDataToEmailVerificationVC()
+                    // Check if expiry date is past tomorrow
+                    let dateFormatter = DateFormatter()
+                    dateFormatter.dateFormat = "MM/yyyy"
+                    dateFormatter.timeZone = TimeZone.current
+                    if let expDate = dateFormatter.date(from: expiryDate) {
+                        let calendar = Calendar.current
+                        // Get start of the month following expiry
+                        let expiryMonthStart = calendar.date(from: calendar.dateComponents([.year, .month], from: expDate))!
+                        let endOfMonth = calendar.date(byAdding: DateComponents(month: 1, day: -1), to: expiryMonthStart)!
+                        
+                        let tomorrow = calendar.date(byAdding: .day, value: 1, to: Date())!
+                        if endOfMonth < tomorrow {
+                            self.showAlert(title: "Expired Card", message: "Card is expired or please enter a valid expiry date.")
+                            return
+                        }
                     } else {
-                        paymentIntentApi()
+                        self.showAlert(title: "Invalid Expiry Date", message: "Unable to parse expiry date.")
+                        return
+                    }
+                }
+                
+                if cvv.isEmpty {
+                    self.showAlert(title: "Missing Information", message: "Card CVV Number is required.")
+                    return
+                } else if cvv.count < 3 {
+                    self.showAlert(title: "Invalid CVV", message: "CVV must be at least 3 digits.")
+                    return
+                } else if cardName.isEmpty {
+                    self.showAlert(title: "Missing Information", message: "Card Name is required.")
+                    return
+                } else if !cardName.matches(nameRegex) {
+                    self.showAlert(title: "Invalid Name", message: "Name must contain only letters and spaces.")
+                    return
+                }
+                
+                // Recurring Plan + Date Validation (only if is_recurring is true)
+                if let req = self.request, req.is_recurring == true {
+                    if self.txtFieldChosePlanCard.text.isEmpty {
+                        self.showAlert(title: "Missing Information", message: "Please choose your plan.")
+                        return
+                    }
+                    
+                    if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                        if self.txtFieldStartDateCard.text.isEmpty {
+                            self.showAlert(title: "Missing Information", message: "Please select start date.")
+                            return
+                        }
+                    }
+                }
+                
+                // Navigate to EmailVerificationVC if isSavedForFuture is true, else call paymentIntentApi
+                if isSavedForFuture {
+                    navigateCardDataToEmailVerificationVC()
+                } else {
+                    if request.enable3DS == true {
+                        threeDSecurePaymentApi()
+                    }
+                    else {
+                        paymentIntentApi()
                     }
                 }
             }
@@ -2892,36 +3344,57 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 // Bank Case
                 if txtFieldAccountName.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
                     showAlert(title: "Missing Information", message: "Bank account name is required.")
+                    return
                 }
                 else if txtFieldRoutingNumber.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
                     showAlert(title: "Missing Information", message: "Routing number is required.")
+                    return
                 }
                 else if let routingNumber = self.txtFieldRoutingNumber.text?.replacingOccurrences(of: " ", with: ""), routingNumber.count != 9 || !CharacterSet.decimalDigits.isSuperset(of: CharacterSet(charactersIn: routingNumber)) {
                     self.showAlert(title: "Invalid Routing Number", message: "Routing number is not correct. It must be exactly 9 digits.")
+                    return
                 }
                 else if txtFieldAccountType.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
                     showAlert(title: "Missing Information", message: "Bank account type is required.")
+                    return
                 }
                 else if txtFieldAccountNumber.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
                     showAlert(title: "Missing Information", message: "Bank account number is required.")
+                    return
                 }
                 else if self.txtFieldConfirmBankAccount.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
                     self.showAlert(title: "Missing Information", message: "Please confirm your bank account number.")
+                    return
                 }
                 else if self.txtFieldAccountNumber.text?.trimmingCharacters(in: .whitespacesAndNewlines) != self.txtFieldConfirmBankAccount.text?.trimmingCharacters(in: .whitespacesAndNewlines) {
                     self.showAlert(title: "Account Mismatch", message: "Bank account number and confirmation do not match.")
+                    return
                 }
                 else if !agreeTermsAndCondtition {
                     showAlert(title: "Terms and Conditions", message: "Please agree to the terms and conditions")
                     return
                 }
-                else {
-                    if isSavedForFuture {
-                        navigateBankDataToEmailVerificationVC()
-                    } else {
-                        accountChargeApi()
+                
+                // Recurring Plan + Date Validation (only if is_recurring is true)
+                if let req = self.request, req.is_recurring == true {
+                    if self.txtFieldSelectPlanViewBankFields.text.isEmpty {
+                        self.showAlert(title: "Missing Information", message: "Please choose your plan.")
+                        return
+                    }
+                    
+                    if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                        if self.txtFieldSelectDateViewBankFields.text.isEmpty {
+                            self.showAlert(title: "Missing Information", message: "Please select start date.")
+                            return
+                        }
                     }
                 }
+                
+                if isSavedForFuture {
+                    navigateBankDataToEmailVerificationVC()
+                } else {
+                    accountChargeApi()
+                }
             }
         }
     }
@@ -2936,6 +3409,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             emailVerificationVC.selectedPaymentMethod = self.selectedPaymentMethod
             emailVerificationVC.isSavedForFuture = isSavedForFuture
             emailVerificationVC.easyPayDelegate = self.easyPayDelegate // Pass delegate if needed
+            emailVerificationVC.request = self.request
+            emailVerificationVC.chosenPlan = self.txtFieldChosePlanCard.text
+            emailVerificationVC.startDate = self.txtFieldStartDateCard.text
             self.navigationController?.pushViewController(emailVerificationVC, animated: true)
         }
     }
@@ -2949,6 +3425,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             emailVerificationVC.selectedPaymentMethod = self.selectedPaymentMethod
             emailVerificationVC.isSavedForFuture = isSavedForFuture
             emailVerificationVC.easyPayDelegate = self.easyPayDelegate // Pass delegate if needed
+            emailVerificationVC.chosenPlan = self.txtFieldSelectPlanViewBankFields.text
+            emailVerificationVC.startDate = self.txtFieldSelectDateViewBankFields.text
+            emailVerificationVC.request = self.request
             self.navigationController?.pushViewController(emailVerificationVC, animated: true)
         }
     }
@@ -3010,6 +3489,23 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             self.viewCrypto.isHidden = true
             self.viewSingleSavedAccount.isHidden = true
             self.viewChangedAccount.isHidden = true
+            
+            if request?.authenticatedACH == true {
+                self.viewBankFields.isHidden = true
+                self.viewBtnShowSavedCards.isHidden = true
+                self.btnNext.isHidden = true
+                self.viewTermsAndConditions.isHidden = true
+                self.btnNextHeight.constant = 0
+                self.btnNextTopCon.constant = 0
+                
+                self.viewBtnShowSavedCards.isHidden = false
+                self.lblBtnShowSaveCard.text = "Show Saved Accounts"
+                self.viewBtnShowSavedCardHeight.constant = 50
+                self.viewBtnShowSavedCardTopCon.constant = 20
+                grailPayBankLinkView.isHidden = false
+                viewAddNewGrailPayAccount.isHidden = true
+            }
+            
         }
     }
     
@@ -3052,9 +3548,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         
         if isSelectForPayBank {
             // Show or hide recurring plan fields based on request.enableRecurring
-            if request?.enableRecurring == true {
+            if request?.is_recurring == true {
                 txtFieldSelectPlanSingleSavedBankView.isHidden = false
-                txtFieldSelectDateSingleSavedBankView.isHidden = false
+                if request.recurringStartDateType == .custom {
+                    txtFieldSelectDateSingleSavedBankView.isHidden = false
+                } else {
+                    txtFieldSelectDateSingleSavedBankView.isHidden = true
+                }
             } else {
                 txtFieldSelectPlanSingleSavedBankView.isHidden = true
                 txtFieldSelectDateSingleSavedBankView.isHidden = true
@@ -3083,7 +3583,31 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     @IBAction func actionBtnPayNowSingleAccountView(_ sender: UIButton) {
+        guard let selectedIndex = selectedBankIndex else {
+            showAlert(message: "Please select a bank account")
+            return
+        }
+        
+        let selectedBank = bankAccounts[selectedIndex]
+        // Log for debugging
+        print("Pay Now tapped with account: ****\(selectedBank.account_number_last_4 ?? "")")
+        
         if request.authenticatedACH == true {
+            // Recurring Plan + Date Validation (only if is_recurring is true)
+            if let req = self.request, req.is_recurring == true {
+                if txtFieldSelectPlanSingleSavedBankView.text.isEmpty {
+                    self.showAlert(title: "Missing Information", message: "Please choose your plan.")
+                    return
+                }
+                
+                if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                    if txtFieldSelectDateSingleSavedBankView.text.isEmpty {
+                        self.showAlert(title: "Missing Information", message: "Please select a plan start date.")
+                        return
+                    }
+                }
+            }
+            
             // Check if the terms and conditions are agreed
             if !agreeTermsAndCondtition {
                 showAlert(title: "Terms and Conditions", message: "Please agree to the terms and conditions")
@@ -3096,12 +3620,26 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                let json = try? JSONSerialization.jsonObject(with: billingInfoData, options: []),
                let jsonDict = json as? [String: Any], !jsonDict.isEmpty {
                 
+                // Recurring Plan + Date Validation (only if is_recurring is true)
+                if let req = self.request, req.is_recurring == true {
+                    if txtFieldSelectPlanSingleSavedBankView.text.isEmpty {
+                        self.showAlert(title: "Missing Information", message: "Please choose your plan.")
+                        return
+                    }
+                    
+                    if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                        if txtFieldSelectDateSingleSavedBankView.text.isEmpty {
+                            self.showAlert(title: "Missing Information", message: "Please select a plan start date.")
+                            return
+                        }
+                    }
+                }
+                
                 // Check if the terms and conditions are agreed
                 if !agreeTermsAndCondtition {
                     showAlert(title: "Terms and Conditions", message: "Please agree to the terms and conditions")
                     return
                 }
-                
                 // Proceed with the Pay Now action
                 let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
                 // Pass the customer_id and account_id to BillingInfoVC
@@ -3110,14 +3648,32 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 vc.billingInfoData = jsonDict
                 vc.isFrom = "SavedBank"
                 vc.selectedPaymentMethod = "Bank"
+                vc.chosenPlan = self.txtFieldSelectPlanSingleSavedBankView.text
+                vc.startDate = self.txtFieldSelectDateSingleSavedBankView.text
+                vc.request = self.request
                 self.navigationController?.pushViewController(vc, animated: true)
             }
             else {
                 //If Billing info is nil or empty
+                if let req = self.request, req.is_recurring == true {
+                    if txtFieldSelectPlanSingleSavedBankView.text.isEmpty {
+                        self.showAlert(title: "Missing Information", message: "Please choose your plan.")
+                        return
+                    }
+                    
+                    if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                        if txtFieldSelectDateSingleSavedBankView.text.isEmpty {
+                            self.showAlert(title: "Missing Information", message: "Please select a plan start date.")
+                            return
+                        }
+                    }
+                }
+                
                 if !agreeTermsAndCondtition {
                     showAlert(title: "Terms and Conditions", message: "Please agree to the terms and conditions")
                     return
                 }
+                
                 accountChargeSavedBankAccountApi()
             }
         }
@@ -3175,6 +3731,21 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 return
             }
             
+            // Recurring Plan + Date Validation (only if is_recurring is true)
+            if let req = self.request, req.is_recurring == true {
+                if txtFieldSelectPlanNewAccountView.text.isEmpty {
+                    self.showAlert(title: "Missing Information", message: "Please choose your plan.")
+                    return
+                }
+                
+                if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                    if txtFieldSelectDateNewAccountView.text.isEmpty {
+                        self.showAlert(title: "Missing Information", message: "Please select a plan start date.")
+                        return
+                    }
+                }
+            }
+            
             // Determine the vc.isFrom value based on isSavedNewAccount
             let isSavedNewAccount = isSavedNewAccount
             let isFromValue = isSavedNewAccount ? "AddNewAccountWithSave" : "AddNewAccountWithoutSave"
@@ -3190,10 +3761,56 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             vc.isFrom = isFromValue
             vc.isSavedNewAccount = isSavedNewAccount
             vc.delegate = self
+            vc.chosenPlan = self.txtFieldSelectPlanNewAccountView.text
+            vc.startDate = self.txtFieldSelectDateNewAccountView.text
+            vc.request = self.request
             self.navigationController?.pushViewController(vc, animated: true)
         }
         else {
             //If Billing info is nil or empty
+            
+            // Retrieve and trim text field values (removing leading and trailing whitespace)
+            let accountName = txtFieldAccountNameNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+            let routingNumber = txtFieldRoutingNumberNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+            let accountType = txtFieldAccountTypeNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+            let accountNumber = txtFieldAccountNumberNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+            let confirmAccountNumber = txtFieldConfirmAccountNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+            
+            // Check if any field is empty
+            if accountName.isEmpty || routingNumber.isEmpty || accountType.isEmpty || accountNumber.isEmpty || confirmAccountNumber.isEmpty {
+                let alert = UIAlertController(title: "Missing Information", message: "Please fill in all bank details.", preferredStyle: .alert)
+                alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))
+                self.present(alert, animated: true, completion: nil)
+                return
+            }
+            
+            // Check if routing number is exactly 9 digits and numeric
+            if routingNumber.count != 9 || !CharacterSet.decimalDigits.isSuperset(of: CharacterSet(charactersIn: routingNumber)) {
+                self.showAlert(title: "Invalid Routing Number", message: "Routing number is not correct. It must be exactly 9 digits.")
+                return
+            }
+            
+            // Check if account number and confirmation match
+            if accountNumber != confirmAccountNumber {
+                self.showAlert(title: "Account Mismatch", message: "Bank account number and confirmation do not match.")
+                return
+            }
+            
+            // Recurring Plan + Date Validation (only if is_recurring is true)
+            if let req = self.request, req.is_recurring == true {
+                if txtFieldSelectPlanNewAccountView.text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
+                    self.showAlert(title: "Missing Information", message: "Please choose your plan.")
+                    return
+                }
+                
+                if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                    if txtFieldSelectDateNewAccountView.text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
+                        self.showAlert(title: "Missing Information", message: "Please select a plan start date.")
+                        return
+                    }
+                }
+            }
+            
             let isSavedNewAccount = isSavedNewAccount
             // If Billing info is nil or empty, call the appropriate API
             if isSavedNewAccount {
@@ -3614,38 +4231,40 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     // MARK: - GET Show Cards API
     func getShowCardsApi() {
         showLoadingIndicator()
-
+        
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.getCards.path()
-
+        
         guard let serviceURL = URL(string: fullURL) else {
             print("❌ Invalid URL: \(fullURL)")
             hideLoadingIndicator()
             return
         }
-
-        var request = URLRequest(url: serviceURL)
-        request.httpMethod = "GET"
-        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
-
+        
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "GET"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        
         let token = UserStoreSingleton.shared.customerToken
         print("🔑 Setting customerToken header: \(token ?? "None")")
-        request.addValue(token ?? "", forHTTPHeaderField: "Customer-Token")
-
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Customer-Token")
+        
         // Add API headers
         if let apiKey = EnvironmentConfig.apiKey,
            let apiSecret = EnvironmentConfig.apiSecret {
-            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
         }
-
+        
         let session = URLSession.shared
-        let task = session.dataTask(with: request) { [weak self] (data, response, error) in
+        let task = session.dataTask(with: uRLRequest) { [weak self] (data, response, error) in
             guard let self = self else { return }
-
-            DispatchQueue.main.async {
-                self.hideLoadingIndicator()
+            
+            defer {
+                DispatchQueue.main.async {
+                    self.hideLoadingIndicator()
+                }
             }
-
+            
             if let error = error {
                 print("❌ Error in getShowCardsApi: \(error.localizedDescription)")
                 if let httpResponse = response as? HTTPURLResponse {
@@ -3653,23 +4272,23 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 }
                 return
             }
-
+            
             guard let data = data else {
                 print("❌ No data received in getShowCardsApi.")
                 return
             }
-
+            
             do {
                 // Print raw JSON string for inspection
                 if let rawJSON = String(data: data, encoding: .utf8) {
                     print("📦 Raw JSON Response:\n\(rawJSON)")
                 }
-
+                
                 if let jsonResponse = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
                    let cards = jsonResponse["Cards"] as? [[String: Any]] {
-
+                    
                     print("✅ Parsed JSON Response:\n\(jsonResponse)")
-
+                    
                     // Map JSON response to CardModel array
                     self.savedCards = cards.compactMap { cardDict in
                         return CardModel(
@@ -3697,25 +4316,32 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         --------------------------
                         """)
                     }
-
+                    
                     DispatchQueue.main.async {
                         if let firstCard = self.savedCards.first {
                             self.lblCardNumberSigleSavedCard.text = "****\(firstCard.ccLast4)"
                             self.lblExpireDateSingelSavedCard.text = "Expiry: \(firstCard.ccValidThru)"
+                            
+                            self.selectedCardIndex = 0
+                            self.selectedCard = self.savedCards[0]
+                            self.updateSingleCardView(for: 0)
+                            
                         }
-
+                        
                         self.tblViewSavedCardsList.reloadData()
-
+                        
                         if self.isSelectForPay {
                             self.viewTxtFieldCVVSingleCard.isHidden = false
                             self.btnPayNowSingleCard.isHidden = false
                             self.btnNext.isHidden = true
                             self.btnNextHeight.constant = 0
                             self.btnNextTopCon.constant = 0
-
-                            if self.request.enableRecurring == true {
+                            
+                            if self.request.is_recurring == true {
                                 self.txtFieldSelectPlanSingleSavedCard.isHidden = false
-                                self.txtFieldSelectDateSingleSavedCard.isHidden = false
+                                if self.request.recurringStartDateType == .custom {
+                                    self.txtFieldSelectDateSingleSavedCard.isHidden = false
+                                }
                             } else {
                                 self.txtFieldSelectPlanSingleSavedCard.isHidden = true
                                 self.txtFieldSelectDateSingleSavedCard.isHidden = true
@@ -3744,7 +4370,10 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func paymentIntentApi() {
         showLoadingIndicator()
         
-        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.creditCharges.path()
+        ///Old Using URL Endpoints
+        // let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.creditCharges.path()
+        
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.charges.path()
         
         guard let serviceURL = URL(string: fullURL) else {
             print("Invalid URL")
@@ -3752,37 +4381,62 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             return
         }
         
-        var request = URLRequest(url: serviceURL)
-        request.httpMethod = "POST"
-        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "POST"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
         print("Setting clientToken header: \(token ?? "None")")
-        request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
         // Add API headers
         if let apiKey = EnvironmentConfig.apiKey,
            let apiSecret = EnvironmentConfig.apiSecret {
-            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
         }
         
-        let params: [String: Any] = [
+        var params: [String: Any] = [
             "name": cardNameTextField.text,
-            "email": "test@gmail.com",
+            "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,
-            "description": "TestDescription",
-            "currency": "usd",
-            "payment_method": "card"
+            "description": "payment checkout",
+            "currency": "usd"
+            // "payment_method": "card"
         ]
         
+        // Add these if recurring is enabled
+        if let req = request, req.is_recurring == true {
+            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                // Only send start_date if type is .custom and field is not empty
+                if let startDateText = txtFieldStartDateCard?.text, !startDateText.isEmpty {
+                    let inputFormatter = DateFormatter()
+                    inputFormatter.dateFormat = "dd/MM/yyyy"
+                    
+                    let outputFormatter = DateFormatter()
+                    outputFormatter.dateFormat = "MM/dd/yyyy"
+                    
+                    if let date = inputFormatter.date(from: startDateText) {
+                        let apiFormattedDate = outputFormatter.string(from: date)
+                        params["start_date"] = apiFormattedDate
+                    } else {
+                        print("Invalid date format in startDateText")
+                    }
+                }
+            }
+            
+            params["interval"] = txtFieldChosePlanCard.text.lowercased()
+        }
+        
+        print(params)
+        
         do {
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
-            request.httpBody = jsonData
+            uRLRequest.httpBody = jsonData
             if let jsonString = String(data: jsonData, encoding: .utf8) {
                 print("JSON Payload: \(jsonString)")
             }
@@ -3793,7 +4447,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
         
         let session = URLSession.shared
-        let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
+        let task = session.dataTask(with: uRLRequest) { (serviceData, serviceResponse, error) in
             
             DispatchQueue.main.async {
                 self.hideLoadingIndicator() // Stop loader when response is received
@@ -3854,54 +4508,89 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     // MARK: - Credit Card Charge API (Saved Cards, No Billing Info, Logged In)
     func paymentIntentFromShowSavedCardApi() {
         showLoadingIndicator()
-
-        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.creditCharges.path()
-
+        
+        ///Old Using URL Endpoints
+        // let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.creditCharges.path()
+        
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.charges.path()
+        
         guard let serviceURL = URL(string: fullURL) else {
             print("Invalid URL")
             hideLoadingIndicator()
             return
         }
-
-        var 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")
+        
         // Add client token
         let token = UserStoreSingleton.shared.clientToken
         print("Setting clientToken header: \(token ?? "None")")
-        request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
-
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        
         // Add API headers
         if let apiKey = EnvironmentConfig.apiKey,
            let apiSecret = EnvironmentConfig.apiSecret {
-            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
         }
-
-        // Prepare parameters
-        let email = UserStoreSingleton.shared.verificationEmail ?? ""
-        let namePart = email.split(separator: "@").first.map(String.init) ?? ""
-
-        let params: [String: Any] = [
-            "name": namePart,
-            "email": email,
-            "description": "TestDescription",
+        
+        ///OLD Params
+        //        // Prepare parameters
+        //        let email = UserStoreSingleton.shared.verificationEmail ?? ""
+        //        let namePart = email.split(separator: "@").first.map(String.init) ?? ""
+        //
+        //        var params: [String: Any] = [
+        //            "name": namePart,
+        //            "email": email,
+        //            "description": "TestDescription",
+        //            "currency": "usd",
+        //            "payment_method": "card",
+        //            "save_card": 0,
+        //            "customer": selectedCard?.customerId ?? "",
+        //            "card_id": selectedCard?.cardId ?? "",
+        //            "cvc": txtFieldCVVSingleSavedCard.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? "",
+        //            "customer_id": selectedCard?.customerId ?? ""
+        //        ]
+        
+        var params: [String: Any] = [
+            "description": "payment checkout",
             "currency": "usd",
-            "payment_method": "card",
-            "save_card": 0,
-            "customer": selectedCard?.customerId ?? "",
             "card_id": selectedCard?.cardId ?? "",
             "cvc": txtFieldCVVSingleSavedCard.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? "",
             "customer_id": selectedCard?.customerId ?? ""
         ]
-
+        
+        // Add these if recurring is enabled
+        if let req = request, req.is_recurring == true {
+            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                // Only send start_date if type is .custom and field is not empty
+                if let startDateText = txtFieldSelectDateSingleSavedCard?.text, !startDateText.isEmpty {
+                    let inputFormatter = DateFormatter()
+                    inputFormatter.dateFormat = "dd/MM/yyyy"
+                    
+                    let outputFormatter = DateFormatter()
+                    outputFormatter.dateFormat = "MM/dd/yyyy"
+                    
+                    if let date = inputFormatter.date(from: startDateText) {
+                        let apiFormattedDate = outputFormatter.string(from: date)
+                        params["start_date"] = apiFormattedDate
+                    } else {
+                        print("Invalid date format in startDateText")
+                    }
+                }
+            }
+            
+            params["interval"] = txtFieldSelectPlanSingleSavedCard.text.lowercased()
+        }
+        
         print("Request Params: \(params)")
-
+        
         do {
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
-            request.httpBody = jsonData
-
+            uRLRequest.httpBody = jsonData
+            
             if let jsonString = String(data: jsonData, encoding: .utf8) {
                 print("JSON Payload: \(jsonString)")
             }
@@ -3910,29 +4599,29 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             hideLoadingIndicator()
             return
         }
-
+        
         // API Call
-        let task = URLSession.shared.dataTask(with: request) { (data, response, error) in
+        let task = URLSession.shared.dataTask(with: uRLRequest) { (data, response, error) in
             DispatchQueue.main.async {
                 self.hideLoadingIndicator()
             }
-
+            
             if let error = error {
                 print("Error: \(error.localizedDescription)")
                 return
             }
-
+            
             guard let httpResponse = response as? HTTPURLResponse else {
                 print("Invalid response")
                 return
             }
-
+            
             if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
                 if let data = data {
                     do {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
                             print("Response Data: \(responseObject)")
-
+                            
                             if let status = responseObject["status"] as? Int, status == 0 {
                                 let errorMessage = responseObject["message"] as? String ?? "Unknown error"
                                 self.presentPaymentErrorVC(errorMessage: errorMessage)
@@ -3970,31 +4659,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     
     //MARK: - Credit Card Charge Api from Add new cards If Billing info is nil and Logged in.
     func paymentIntentFromAddNewCardApi(customerId: String?) {
-        showLoadingIndicator()
-        
-        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.creditCharges.path()
-        
-        guard let serviceURL = URL(string: fullURL) else {
-            print("Invalid URL")
-            hideLoadingIndicator()
-            return
-        }
-        
-        var request = URLRequest(url: serviceURL)
-        request.httpMethod = "POST"
-        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
-        
-        let token = UserStoreSingleton.shared.clientToken
-        print("Setting clientToken header: \(token ?? "None")")
-        request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
-        
-        // Add API headers
-        if let apiKey = EnvironmentConfig.apiKey,
-           let apiSecret = EnvironmentConfig.apiSecret {
-            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
-        }
-        
         // 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) ?? ""
@@ -4044,6 +4708,48 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             return
         }
         
+        // Recurring Plan + Date Validation (only if is_recurring is true)
+        if let req = self.request, req.is_recurring == true {
+            let planText = txtFieldSelectPlanNewCardView.text.trimmingCharacters(in: .whitespacesAndNewlines)
+            let dateText = txtFieldSelectDateNewCardView.text.trimmingCharacters(in: .whitespacesAndNewlines)
+            
+            if planText.isEmpty {
+                self.showAlert(title: "Missing Information", message: "Please choose your plan.")
+                return
+            }
+            
+            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                if dateText.isEmpty {
+                    self.showAlert(title: "Missing Information", message: "Please select a plan start date.")
+                    return
+                }
+            }
+        }
+        
+        showLoadingIndicator()
+        
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.creditCharges.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")
+        }
         
         let emailPrefix = UserStoreSingleton.shared.verificationEmail?.components(separatedBy: "@").first ?? ""
         
@@ -4073,11 +4779,34 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             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 = 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()
+        }
+        
         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)")
             }
@@ -4088,7 +4817,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
         
         let session = URLSession.shared
-        let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
+        let task = session.dataTask(with: uRLRequest) { (serviceData, serviceResponse, error) in
             
             DispatchQueue.main.async {
                 self.hideLoadingIndicator() // Stop loader when response is received
@@ -4504,9 +5233,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             self.viewTermAndConditionsSingleAccountView.isHidden = false
                             self.btnPayNowSingleAccountView.isHidden = false
                             
-                            if self.request.enableRecurring == true {
+                            if self.request.is_recurring == true {
                                 self.txtFieldSelectPlanSingleSavedBankView.isHidden = false
-                                self.txtFieldSelectDateSingleSavedBankView.isHidden = false
+                                if self.request.recurringStartDateType == .custom {
+                                    self.txtFieldSelectDateSingleSavedBankView.isHidden = false
+                                } else {
+                                    self.txtFieldSelectDateSingleSavedBankView.isHidden = true
+                                }
                             }
                             else {
                                 self.txtFieldSelectPlanSingleSavedBankView.isHidden = true
@@ -4553,22 +5286,22 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             return
         }
         
-        var request = URLRequest(url: serviceURL)
-        request.httpMethod = "POST"
-        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "POST"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
         print("Setting clientToken header: \(token ?? "None")")
-        request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
         // Add API headers
         if let apiKey = EnvironmentConfig.apiKey,
            let apiSecret = EnvironmentConfig.apiSecret {
-            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
         }
         
-        let params: [String: Any] = [
+        var params: [String: Any] = [
             "name": txtFieldAccountName.text ?? "",
             "email": "test@gmail.com",
             "description": "TestDescription",
@@ -4581,9 +5314,32 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "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 = txtFieldSelectDateViewBankFields?.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"] = txtFieldSelectPlanViewBankFields.text.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)")
             }
@@ -4594,7 +5350,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
         
         let session = URLSession.shared
-        let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
+        let task = session.dataTask(with: uRLRequest) { (serviceData, serviceResponse, error) in
             
             DispatchQueue.main.async {
                 self.hideLoadingIndicator() // Stop loader when response is received
@@ -4665,22 +5421,22 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             return
         }
         
-        var request = URLRequest(url: serviceURL)
-        request.httpMethod = "POST"
-        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "POST"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
         print("Setting clientToken header: \(token ?? "None")")
-        request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
         // Add API headers
         if let apiKey = EnvironmentConfig.apiKey,
            let apiSecret = EnvironmentConfig.apiSecret {
-            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
         }
         
-        let params: [String: Any] = [
+        var params: [String: Any] = [
             "account_id": selectedbankAccounts?.account_id ?? "",
             "customer": selectedbankAccounts?.customer_id ?? "",
             "payment_method": "ach",
@@ -4688,11 +5444,34 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "currency": "usd",
         ]
         
+        // 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 = txtFieldSelectDateSingleSavedBankView?.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"] = txtFieldSelectPlanSingleSavedBankView.text.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)")
             }
@@ -4703,7 +5482,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
         
         let session = URLSession.shared
-        let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
+        let task = session.dataTask(with: uRLRequest) { (serviceData, serviceResponse, error) in
             
             DispatchQueue.main.async {
                 self.hideLoadingIndicator() // Stop loader when response is received
@@ -4774,19 +5553,19 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             return
         }
         
-        var request = URLRequest(url: serviceURL)
-        request.httpMethod = "POST"
-        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "POST"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
         print("Setting clientToken header: \(token ?? "None")")
-        request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
         // Add API headers
         if let apiKey = EnvironmentConfig.apiKey,
            let apiSecret = EnvironmentConfig.apiSecret {
-            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
         }
         
         let accountName = txtFieldAccountNameNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
@@ -4794,7 +5573,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         let accountType = txtFieldAccountTypeNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         let accountNumber = txtFieldAccountNumberNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         
-        let params: [String: Any] = [
+        var params: [String: Any] = [
             "name": accountName,
             "email": UserStoreSingleton.shared.verificationEmail ?? "",
             "description": "Test Description",
@@ -4807,11 +5586,34 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "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 = txtFieldSelectDateNewAccountView?.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"] = txtFieldSelectPlanNewAccountView.text.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)")
             }
@@ -4822,7 +5624,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
         
         let session = URLSession.shared
-        let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
+        let task = session.dataTask(with: uRLRequest) { (serviceData, serviceResponse, error) in
             
             DispatchQueue.main.async {
                 self.hideLoadingIndicator() // Stop loader when response is received
@@ -4893,19 +5695,19 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             return
         }
         
-        var request = URLRequest(url: serviceURL)
-        request.httpMethod = "POST"
-        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "POST"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
         print("Setting clientToken header: \(token ?? "None")")
-        request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
         // Add API headers
         if let apiKey = EnvironmentConfig.apiKey,
            let apiSecret = EnvironmentConfig.apiSecret {
-            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
         }
         
         // Retrieve and trim text field values (removing leading and trailing whitespace)
@@ -4937,11 +5739,34 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             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 = txtFieldSelectDateNewAccountView?.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"] = txtFieldSelectPlanNewAccountView.text.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)")
             }
@@ -4952,7 +5777,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
         
         let session = URLSession.shared
-        let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
+        let task = session.dataTask(with: uRLRequest) { (serviceData, serviceResponse, error) in
             
             DispatchQueue.main.async {
                 self.hideLoadingIndicator() // Stop loader when response is received
@@ -5110,31 +5935,270 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         
         let token = UserStoreSingleton.shared.clientToken
         print("Setting clientToken header: \(token ?? "None")")
-        request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
+        let params: [String: Any] = [
+            "name": UserStoreSingleton.shared.merchantName ?? "",
+            "email": UserStoreSingleton.shared.merchantEmail ?? "",
+            "description": "Payment checkout",
+            "amount": amount ?? "",
+            "currency": "satoshi",
+            "payment_account": UserStoreSingleton.shared.paymentAccount ?? "",
+            "success_url": "https://stage-api.stage-easymerchant.io/webhook/crypto",
+            "callback_url": "https://stage-api.stage-easymerchant.io/webhook/crypto"
+        ]
+        
+        print(params)
+        
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+            request.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: request) { (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 {
+                                // Extract charge_id
+                                if let chargeId = responseObject["charge_id"] as? String {
+                                    self.chargeId = chargeId
+                                    print("Charge ID: \(chargeId)")
+                                }
+                                
+                                // Extract chain_invoice address and lightning invoice fields
+                                if let data = responseObject["data"] as? [String: Any] {
+                                    self.chainInvoiceAddress = (data["chain_invoice"] as? [String: Any])?["address"] as? String
+                                    self.lightningURI = (data["lightning_invoice"] as? [String: Any])?["payreq"] as? String
+                                    
+                                    // Default to OnChain QR code initially
+                                    DispatchQueue.main.async {
+                                        if let address = self.chainInvoiceAddress {
+                                            self.qrImageView.image = self.generateQRCode(from: address)
+                                            self.lblBTCAddress.text = "BTC Address: \(address)"
+                                            
+                                            // Extract the amount from the URI
+                                            if let uri = data["uri"] as? String {
+                                                if let amountString = self.extractAmount(from: uri) {
+                                                    // Update the label with the extracted amount
+                                                    DispatchQueue.main.async {
+                                                        self.lblAmmoutCrypto.text = "\(amountString) BTC = $\(self.amount ?? 0) USD"
+                                                        self.lblCryptoAmmountViewTryAgain.text = "\(amountString) BTC = $\(self.amount ?? 0) USD"
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        
+                                        self.viewCryptoQRCode.isHidden = false
+                                        self.viewCryptoTryAgain.isHidden = true
+                                    }
+                                } else {
+                                    self.presentPaymentErrorVC(errorMessage: "Invalid response format")
+                                }
+                            }
+                        } 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()
+    }
+    
+    // Helper function to extract the amount from the URI
+    func extractAmount(from uri: String) -> String? {
+        let regex = try? NSRegularExpression(pattern: "amount=([\\d.]+)", options: [])
+        let matches = regex?.matches(in: uri, options: [], range: NSRange(location: 0, length: uri.count))
+        
+        if let match = matches?.first, let amountRange = Range(match.range(at: 1), in: uri) {
+            return String(uri[amountRange])
+        }
+        return nil
+    }
+    
+    //MARK: - GET Crypto Payment Info API
+    func getCryptoPaymentInfoApi(chargeId: String) {
+        
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.charges.path()+"/\(chargeId)"
+        
+        guard let serviceURL = URL(string: fullURL) else {
+            print("Invalid URL")
+            hideLoadingIndicator()
+            return
+        }
+        
+        var request = URLRequest(url: serviceURL)
+        request.httpMethod = "GET"
+        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        
+        let token = UserStoreSingleton.shared.clientToken
+        print("Setting clientToken header: \(token ?? "None")")
+        request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
+        let session = URLSession.shared
+        let task = session.dataTask(with: request) { [weak self] (data, response, error) in
+            guard let self = self else { return }
+            
+            if let error = error {
+                print("Error: \(error.localizedDescription)")
+                return
+            }
+            
+            guard let data = data else { return }
+            
+            do {
+                if let jsonResponse = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let responseData = jsonResponse["data"] as? [String: Any] {
+                    
+                    // Extract required data
+                    let amount = responseData["amount"] as? String ?? ""
+                    let dateCreated = responseData["date_created"] as? String ?? ""
+                    let status = responseData["status"] as? String ?? ""
+                    let transactionId = responseData["transaction_id"] as? String ?? ""
+                    
+                    print("Amount: \(amount), Date Created: \(dateCreated), Status: \(status), Transaction ID: \(transactionId)")
+                    
+                    // Check if the status is "completed"
+                    if status.lowercased() == "completed" {
+                        DispatchQueue.main.async {
+                            // Navigate to PaymentDoneVC and pass data
+                            self.navigateToPaymentDoneVC(amount: amount, dateCreated: dateCreated, transactionId: transactionId)
+                        }
+                    }
+                }
+            } catch {
+                print("Failed to parse response: \(error.localizedDescription)")
+            }
+        }
+        task.resume()
+    }
+    
+    // MARK: - 3DS Functionality
+    
+    // MARK: - Credit Card Charge Api If Billing info is 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 {
-            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
         }
         
-        let params: [String: Any] = [
-            "name": UserStoreSingleton.shared.merchantName ?? "",
+        var params: [String: Any] = [
+            "name": cardNameTextField.text,
             "email": UserStoreSingleton.shared.merchantEmail ?? "",
-            "description": "Payment checkout",
-            "amount": amount ?? "",
-            "currency": "satoshi",
-            "payment_account": UserStoreSingleton.shared.paymentAccount ?? "",
-            "success_url": "https://stage-api.stage-easymerchant.io/webhook/crypto",
-            "callback_url": "https://stage-api.stage-easymerchant.io/webhook/crypto"
+            "card_number": cardNumberTextField.text.replacingOccurrences(of: " ", with: ""),
+            "cardholder_name": cardNameTextField.text,
+            "exp_month": cardExpiryTextField.text.components(separatedBy: "/").first ?? "",
+            "exp_year": cardExpiryTextField.text.components(separatedBy: "/").last ?? "",
+            "cvc": cardCvvTextField.text,
+            "description": "payment checkout",
+            "currency": "usd",
+            "payment_method": "card",
+            "tokenize": request.tokenOnly ?? false,
         ]
         
-        print(params)
+        // 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()
+        }
         
         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)")
             }
@@ -5145,7 +6209,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
         
         let session = URLSession.shared
-        let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
+        let task = session.dataTask(with: uRLRequest) { (serviceData, serviceResponse, error) in
             
             DispatchQueue.main.async {
                 self.hideLoadingIndicator() // Stop loader when response is received
@@ -5172,40 +6236,16 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                 let errorMessage = responseObject["message"] as? String ?? "Unknown error"
                                 self.presentPaymentErrorVC(errorMessage: errorMessage)
                             } else {
-                                // Extract charge_id
-                                if let chargeId = responseObject["charge_id"] as? String {
-                                    self.chargeId = chargeId
-                                    print("Charge ID: \(chargeId)")
-                                }
-                                
-                                // Extract chain_invoice address and lightning invoice fields
-                                if let data = responseObject["data"] as? [String: Any] {
-                                    self.chainInvoiceAddress = (data["chain_invoice"] as? [String: Any])?["address"] as? String
-                                    self.lightningURI = (data["lightning_invoice"] as? [String: Any])?["payreq"] as? String
-                                    
-                                    // Default to OnChain QR code initially
-                                    DispatchQueue.main.async {
-                                        if let address = self.chainInvoiceAddress {
-                                            self.qrImageView.image = self.generateQRCode(from: address)
-                                            self.lblBTCAddress.text = "BTC Address: \(address)"
-                                            
-                                            // Extract the amount from the URI
-                                            if let uri = data["uri"] as? String {
-                                                if let amountString = self.extractAmount(from: uri) {
-                                                    // Update the label with the extracted amount
-                                                    DispatchQueue.main.async {
-                                                        self.lblAmmoutCrypto.text = "\(amountString) BTC = $\(self.amount ?? 0) USD"
-                                                        self.lblCryptoAmmountViewTryAgain.text = "\(amountString) BTC = $\(self.amount ?? 0) USD"
-                                                    }
-                                                }
-                                            }
-                                        }
+                                DispatchQueue.main.async {
+                                    if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "ThreeDSecurePaymentDoneVC") as? ThreeDSecurePaymentDoneVC {
                                         
-                                        self.viewCryptoQRCode.isHidden = false
-                                        self.viewCryptoTryAgain.isHidden = true
+                                        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 response format")
                                 }
                             }
                         } else {
@@ -5230,21 +6270,77 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         task.resume()
     }
     
-    // Helper function to extract the amount from the URI
-    func extractAmount(from uri: String) -> String? {
-        let regex = try? NSRegularExpression(pattern: "amount=([\\d.]+)", options: [])
-        let matches = regex?.matches(in: uri, options: [], range: NSRange(location: 0, length: uri.count))
+    // MARK: - Credit Card Charge Api If Billing info is nil from New Card.
+    func threeDSecurePaymentNewCardApi(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) ?? ""
         
-        if let match = matches?.first, let amountRange = Range(match.range(at: 1), in: uri) {
-            return String(uri[amountRange])
+        // 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
         }
-        return nil
-    }
-    
-    //MARK: - GET Crypto Payment Info API
-    func getCryptoPaymentInfoApi(chargeId: String) {
         
-        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.charges.path()+"/\(chargeId)"
+        // 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)
+                return
+            }
+        } else {
+            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
+        }
+        
+        // Recurring Plan + Date Validation (only if is_recurring is true)
+        if let req = self.request, req.is_recurring == true {
+            let planText = txtFieldSelectPlanNewCardView.text.trimmingCharacters(in: .whitespacesAndNewlines)
+            let dateText = txtFieldSelectDateNewCardView.text.trimmingCharacters(in: .whitespacesAndNewlines)
+            
+            if planText.isEmpty {
+                self.showAlert(title: "Missing Information", message: "Please choose your plan.")
+                return
+            }
+            
+            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                if dateText.isEmpty {
+                    self.showAlert(title: "Missing Information", message: "Please select a plan start date.")
+                    return
+                }
+            }
+        }
+        
+        showLoadingIndicator()
+        
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.threeDSecure.path()
         
         guard let serviceURL = URL(string: fullURL) else {
             print("Invalid URL")
@@ -5252,54 +6348,133 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             return
         }
         
-        var request = URLRequest(url: serviceURL)
-        request.httpMethod = "GET"
-        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "POST"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
         print("Setting clientToken header: \(token ?? "None")")
-        request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
         // Add API headers
         if let apiKey = EnvironmentConfig.apiKey,
            let apiSecret = EnvironmentConfig.apiSecret {
-            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
+        var params: [String: Any] = [
+            "name": nameText,
+            "email": txtFieldEmail.text ?? "",
+            "card_number": cardNumberText,
+            "cardholder_name": nameText,
+            "exp_month": expiryText.components(separatedBy: "/").first ?? "",
+            "exp_year": expiryText.components(separatedBy: "/").last ?? "",
+            "cvc": cvvText,
+            "description": "payment checkout",
+            "currency": "usd",
+            "tokenize": request.tokenOnly ?? false,
+            "customer_id": customerId,
+            "save_card": isSavedNewCardForFuture ? 1 : 0,
+        ]
+        
+        // Add is_default parameter if save_card is 1
+        if isSavedNewCardForFuture {
+            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 = 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()
+        }
+        
+        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: request) { [weak self] (data, response, error) in
-            guard let self = self else { return }
+        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 data = data else { return }
+            guard let httpResponse = serviceResponse as? HTTPURLResponse else {
+                print("Invalid response")
+                return
+            }
             
-            do {
-                if let jsonResponse = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
-                   let responseData = jsonResponse["data"] as? [String: Any] {
-                    
-                    // Extract required data
-                    let amount = responseData["amount"] as? String ?? ""
-                    let dateCreated = responseData["date_created"] as? String ?? ""
-                    let status = responseData["status"] as? String ?? ""
-                    let transactionId = responseData["transaction_id"] as? String ?? ""
-                    
-                    print("Amount: \(amount), Date Created: \(dateCreated), Status: \(status), Transaction ID: \(transactionId)")
-                    
-                    // Check if the status is "completed"
-                    if status.lowercased() == "completed" {
-                        DispatchQueue.main.async {
-                            // Navigate to PaymentDoneVC and pass data
-                            self.navigateToPaymentDoneVC(amount: amount, dateCreated: dateCreated, transactionId: transactionId)
+            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)")
                 }
-            } catch {
-                print("Failed to parse response: \(error.localizedDescription)")
             }
         }
         task.resume()
@@ -5341,9 +6516,17 @@ extension PaymentInfoVC: UICollectionViewDelegate, UICollectionViewDataSource, U
                 cell.lblPayment.textColor = uiColor
             }
         } else {
-            cell.vwMain.layer.borderColor = UIColor.gray.cgColor
-            cell.imgVwPayments.tintColor = .systemGray
-            cell.lblPayment.textColor = .systemGray
+            if let primaryFontColor = UserStoreSingleton.shared.primary_font_col,
+               let uiColor = UIColor(hex: primaryFontColor) {
+                cell.vwMain.layer.borderColor = uiColor.cgColor
+                cell.imgVwPayments.tintColor = uiColor
+                cell.lblPayment.textColor = uiColor
+            }
+            else {
+                cell.vwMain.layer.borderColor = UIColor.gray.cgColor
+                cell.imgVwPayments.tintColor = .systemGray
+                cell.lblPayment.textColor = .systemGray
+            }
         }
         
         return cell
@@ -5446,9 +6629,11 @@ extension PaymentInfoVC: UICollectionViewDelegate, UICollectionViewDataSource, U
                     self.btnNext.isHidden = true
                     self.btnNextHeight.constant = 0
                     self.btnNextTopCon.constant = 0
-                    if self.request.enableRecurring == true {
+                    if self.request.is_recurring == true {
                         self.txtFieldSelectPlanSingleSavedCard.isHidden = false
-                        self.txtFieldSelectDateSingleSavedCard.isHidden = false
+                        if request.recurringStartDateType == .custom {
+                            self.txtFieldSelectDateSingleSavedCard.isHidden = false
+                        }
                     }
                     else {
                         self.txtFieldSelectPlanSingleSavedCard.isHidden = true
@@ -5620,10 +6805,10 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
             cell.btnRemoveBankAccount.removeTarget(nil, action: nil, for: .allEvents)
             
             if indexPath.row == bankAccounts.count {
-                print("Showing 'Add New Account' cell")
+                // print("Showing 'Add New Account' cell")
                 configureAddNewAccountCell(cell)
             } else {
-                print("Configuring saved account cell at row: \(indexPath.row)")
+                // print("Configuring saved account cell at row: \(indexPath.row)")
                 configureSavedAccountCell(cell, at: indexPath)
             }
             
@@ -5962,11 +7147,9 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
         if isSelectForPayBank {
             viewTermAndConditionsSingleAccountView.isHidden = false
             btnPayNowSingleAccountView.isHidden = false
-            //   viewSingleAccountViewHeight.constant = 170
         } else {
             viewTermAndConditionsSingleAccountView.isHidden = true
             btnPayNowSingleAccountView.isHidden = true
-            //   viewSingleAccountViewHeight.constant = 68
             btnNext.isHidden = true
             btnNextHeight.constant = 0
             btnNextTopCon.constant = 0
@@ -6069,7 +7252,7 @@ extension PaymentInfoVC: UITextFieldDelegate {
         }
         
         // Handle card CVV input for both old and new card fields
-        else if textField == cardCvvTextField.textField || textField == txtFieldCVVNewCardView || textField == txtFieldCVVUpdateCardView {
+        else if textField == cardCvvTextField.textField || textField == txtFieldCVVNewCardView || textField == txtFieldCVVUpdateCardView || textField == txtFieldCVVSingleSavedCard {
             let maxLength = 3
             let currentString = (textField.text ?? "") as NSString
             let newString = currentString.replacingCharacters(in: range, with: string)
@@ -6675,11 +7858,9 @@ extension PaymentInfoVC: UITextFieldDelegate {
 //    
 //    func blinkCardOverlayViewControllerDidFinishEditing(_ blinkCardOverlayViewController: MBCBlinkCardOverlayViewController, editResult: MBCBlinkCardEditResult) {
 //        blinkCardOverlayViewController.recognizerRunnerViewController?.pauseScanning()
-//        
 //        /** Needs to be called on main thread beacuse everything prior is on background thread */
 //        DispatchQueue.main.async {
 //            // present the alert view with scanned results
-//            
 //            let alertController: UIAlertController = UIAlertController.init(title: "BlinkCard Edit Results", message: editResult.description, preferredStyle: .alert)
 //            
 //            let okAction: UIAlertAction = UIAlertAction.init(title: "OK", style: .default,
@@ -6692,7 +7873,7 @@ extension PaymentInfoVC: UITextFieldDelegate {
 //    }
 //    
 //}
-//
+
 //extension PaymentInfoVC: CustomOverlayDelegate {
 //    func didFinishScanningCard(cardNumber: String, expiryDate: String, cvv: String, nameOnCard: String) {
 //        // Update the text fields with scanned details