@jimrising/easymerchantsdk-react-native 2.3.3 → 2.3.5

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

@@ -459,7 +459,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     //MARK: - View Did Load
     override func viewDidLoad() {
         super.viewDidLoad()
-        
+        logOut()
         // Add and center the loader
         view.addSubview(loadingIndicator)
         NSLayoutConstraint.activate([
@@ -477,11 +477,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
 //        DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
 //            if let clientToken = self.request.clientToken,
 //               !clientToken.isEmpty {
-//
+//                
 //                // Save clientToken in singleton
 //                UserStoreSingleton.shared.clientToken = clientToken
 //                print("Saved clientToken in UserStoreSingleton: \(clientToken)")
-//
+//                
 //                // Case 1: Already exist → Directly call hostedCheckout
 //                print("Skipping paymentIntentApi, using existing values")
 //                self.request.hostedCheckoutsApi { success in
@@ -490,7 +490,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
 //                            self.setupUI()
 //                        } else {
 //                            print("Hosted Checkout failed. Blocking SDK UI.")
-//
+//                            
 //                            // Stop flow and notify failure
 //                            let result = SDKResult(
 //                                type: .error,
@@ -514,7 +514,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
 //                            self.setupUI()
 //                        } else {
 //                            print("Payment Intent failed. Blocking SDK UI.")
-//
+//                            
 //                            // Stop flow and notify failure
 //                            let result = SDKResult(
 //                                type: .error,
@@ -589,14 +589,59 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                 self.request.selectedPaymentMethods = savedMethods.compactMap { PaymentMethod(rawValue: $0) }
                             }
                             self.setupUI()
+                            
+                            if let billingInfoData = self.request.fields,
+                                   let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
+                                    
+                                    let billingVisible = fieldSection.visibility.billing
+                                    let additionalVisible = fieldSection.visibility.additional
+                                    let submitText = self.request?.submitButtonText?.isEmpty == false ? self.request!.submitButtonText! : "Pay Now"
+                                    
+                                    // ❌ old way (was re-reading from request)
+                                    // let rawAmount = Double(self.request?.amount ?? 0)
+                                    // let amountText = String(format: "$%.2f", rawAmount)
+                                    
+                                    // ✅ new way: use parsedAmount immediately
+                                    let resolvedAmount = self.amount   // already set above
+                                let amountText = String(format: "$%.2f", resolvedAmount ?? 00.00)
+                                    
+                                    var buttonText: String
+                                    if !billingVisible && !additionalVisible {
+                                        buttonText = "\(submitText) (\(amountText))"
+                                    } else if billingVisible {
+                                        buttonText = "\(submitText) (Billing Info)"
+                                    } else if additionalVisible {
+                                        buttonText = "\(submitText) (Additional Info)"
+                                    } else {
+                                        buttonText = "\(submitText) (\(amountText))"
+                                    }
+                                    
+                                    self.btnNext.setTitle(buttonText, for: .normal)
+                                    self.btnPayNowNewCardView.setTitle(buttonText, for: .normal)
+                                    self.btnPayNowNewAccountView.setTitle(buttonText, for: .normal)
+                                    self.btnPayNowSingleCard.setTitle(buttonText, for: .normal)
+                                    self.btnPayNowSingleAccountView.setTitle(buttonText, for: .normal)
+                                } else {
+                                    /// When no billingInfoData present
+                                    let resolvedAmount = self.amount
+                                    let amountText = String(format: "$%.2f", resolvedAmount ?? 00.00)
+                                    
+                                    let submitText = self.request?.submitButtonText?.isEmpty == false ? self.request!.submitButtonText! : "Pay Now"
+                                    let defaultTitle = "\(submitText) (\(amountText))"
+                                    
+                                    self.btnNext.setTitle(defaultTitle, for: .normal)
+                                    self.btnPayNowNewCardView.setTitle(defaultTitle, for: .normal)
+                                    self.btnPayNowNewAccountView.setTitle(defaultTitle, for: .normal)
+                                    self.btnPayNowSingleCard.setTitle(defaultTitle, for: .normal)
+                                    self.btnPayNowSingleAccountView.setTitle(defaultTitle, for: .normal)
+                                }
+                            
                         } else {
                             print("Hosted Checkout failed. Blocking SDK UI.")
                             // Notify failure
                             let result = SDKResult(
                                 type: .error,
-                                chargeData: ["status": false, "message": "Hosted Checkout failed"],
-                                billingInfo: nil,
-                                additionalInfo: nil
+                                data: ["status": false, "message": "Hosted Checkout failed"] as NSDictionary
                             )
                             NotificationCenter.default.post(name: NSNotification.Name("EasyPayResult"), object: result)
                             self.dismiss(animated: true)
@@ -619,9 +664,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             // Notify failure
                             let result = SDKResult(
                                 type: .error,
-                                chargeData: ["status": false, "message": "Payment Intent failed"],
-                                billingInfo: nil,
-                                additionalInfo: nil
+                                data: ["status": false, "message": "Payment Intent failed"] as NSDictionary
                             )
                             NotificationCenter.default.post(name: NSNotification.Name("EasyPayResult"), object: result)
                             self.dismiss(animated: true)
@@ -649,52 +692,52 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         tapGesture.cancelsTouchesInView = false
         self.view.addGestureRecognizer(tapGesture)
         
-        if let billingInfoData = request.fields,
-           let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
-            
-            let billingVisible = fieldSection.visibility.billing
-            let additionalVisible = fieldSection.visibility.additional
-            let submitText = request?.submitButtonText?.isEmpty == false ? request!.submitButtonText! : "Pay Now"
-            // let amountText = String(format: "$%.2f", request?.amount ?? 0)
-            
-            let rawAmount = Double(request?.amount ?? 0)
-            let amountText = String(format: "$%.2f", rawAmount)
-            
-            var buttonText: String
-            
-            if !billingVisible && !additionalVisible {
-                // Both visibility false – show submitText with amount only
-                buttonText = "\(submitText) (\(amountText))"
-            } else if billingVisible {
-                buttonText = "\(submitText) (Billing Info)"
-            } else if additionalVisible {
-                buttonText = "\(submitText) (Additional Info)"
-            } else {
-                // Fallback
-                buttonText = "\(submitText) (\(amountText))"
-            }
-            
-            btnNext.setTitle(buttonText, for: .normal)
-            btnPayNowNewCardView.setTitle(buttonText, for: .normal)
-            btnPayNowNewAccountView.setTitle(buttonText, for: .normal)
-            btnPayNowSingleCard.setTitle(buttonText, for: .normal)
-            btnPayNowSingleAccountView.setTitle(buttonText, for: .normal)
-        } else {
-            /// When no billingInfoData present
-            // let amountText = String(format: "$%.2f", request?.amount ?? 0)
-            
-            let rawAmount = Double(request?.amount ?? 0)
-            let amountText = String(format: "$%.2f", rawAmount)
-            
-            let submitText = request?.submitButtonText?.isEmpty == false ? request!.submitButtonText! : "Pay Now"
-            let defaultTitle = "\(submitText) (\(amountText))"
-            
-            btnNext.setTitle(defaultTitle, for: .normal)
-            btnPayNowNewCardView.setTitle(defaultTitle, for: .normal)
-            btnPayNowNewAccountView.setTitle(defaultTitle, for: .normal)
-            btnPayNowSingleCard.setTitle(defaultTitle, for: .normal)
-            btnPayNowSingleAccountView.setTitle(defaultTitle, for: .normal)
-        }
+//        if let billingInfoData = request.fields,
+//           let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
+//            
+//            let billingVisible = fieldSection.visibility.billing
+//            let additionalVisible = fieldSection.visibility.additional
+//            let submitText = request?.submitButtonText?.isEmpty == false ? request!.submitButtonText! : "Pay Now"
+//            // let amountText = String(format: "$%.2f", request?.amount ?? 0)
+//            
+//            let rawAmount = Double(request?.amount ?? 0)
+//            let amountText = String(format: "$%.2f", rawAmount)
+//            
+//            var buttonText: String
+//            
+//            if !billingVisible && !additionalVisible {
+//                // Both visibility false – show submitText with amount only
+//                buttonText = "\(submitText) (\(amountText))"
+//            } else if billingVisible {
+//                buttonText = "\(submitText) (Billing Info)"
+//            } else if additionalVisible {
+//                buttonText = "\(submitText) (Additional Info)"
+//            } else {
+//                // Fallback
+//                buttonText = "\(submitText) (\(amountText))"
+//            }
+//            
+//            btnNext.setTitle(buttonText, for: .normal)
+//            btnPayNowNewCardView.setTitle(buttonText, for: .normal)
+//            btnPayNowNewAccountView.setTitle(buttonText, for: .normal)
+//            btnPayNowSingleCard.setTitle(buttonText, for: .normal)
+//            btnPayNowSingleAccountView.setTitle(buttonText, for: .normal)
+//        } else {
+//            /// When no billingInfoData present
+//            // let amountText = String(format: "$%.2f", request?.amount ?? 0)
+//            
+//            let rawAmount = Double(request?.amount ?? 0)
+//            let amountText = String(format: "$%.2f", rawAmount)
+//            
+//            let submitText = request?.submitButtonText?.isEmpty == false ? request!.submitButtonText! : "Pay Now"
+//            let defaultTitle = "\(submitText) (\(amountText))"
+//            
+//            btnNext.setTitle(defaultTitle, for: .normal)
+//            btnPayNowNewCardView.setTitle(defaultTitle, for: .normal)
+//            btnPayNowNewAccountView.setTitle(defaultTitle, for: .normal)
+//            btnPayNowSingleCard.setTitle(defaultTitle, for: .normal)
+//            btnPayNowSingleAccountView.setTitle(defaultTitle, for: .normal)
+//        }
         
         lblEasyMerchantOne.text = "POWERED BY \(UserStoreSingleton.shared.companyName?.uppercased() ?? "")"
         txtFieldEmailCardView.textField.text = request.email
@@ -862,7 +905,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         self.viewCrypto.isHidden = true
         
         if request.is_recurring == true {
-            
             // Check if there is only one recurring interval
             if let intervals = request.recurringIntervals, intervals.count == 1, let singleInterval = intervals.first {
                 // Set the text field to the single interval's display name
@@ -1166,7 +1208,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 self.heightViewNewCardFields.constant = 458
             }
             
-            self.heightSubViewNewAccountFields.constant = 662
+            self.heightSubViewNewAccountFields.constant = 702
         }
         
         if selectedPaymentMethod == "Card" {
@@ -2327,7 +2369,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "message": "User cancelled the payment."
         ]
         
-        let result = SDKResult(type: .cancelled, chargeData: cancelData)
+        let result = SDKResult(type: .cancelled, data: cancelData as NSDictionary)
         self.delegate?.easyPayController(self.navigationController as! EasyPayViewController, didFinishWith: result)
         
         self.dismiss(animated: true)
@@ -3607,6 +3649,21 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 self.showErrorOnce(errorMessage: errorMsg)
                 return
                 
+//                if let chargeData = result.chargeData,
+//                       let data = chargeData["data"] as? [String: Any],
+//                       let status = data["status"] as? String,
+//                       status == "ACTION_ABANDONED" {
+//                        
+//                        let reason = data["reason"] as? String ?? "User abandoned the action."
+//                        print("⚠️ GrailPay abandoned: \(reason)")
+//                        self.showErrorOnce(errorMessage: reason)
+//                    } else {
+//                        print("⚠️ GrailPay cancelled by user")
+//                        let errorMsg = "User cancelled GrailPay account linking."
+//                        self.showErrorOnce(errorMessage: errorMsg)
+//                    }
+//                    return
+                
             case .error:
                 let errorMsg = result.error?.localizedDescription ?? "An unknown error occurred while launching GrailPay."
                 print("❌ GrailPay error: \(errorMsg)")
@@ -3735,26 +3792,47 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             params["description"] = "Hosted payment checkout"
         }
         
+//        // Add these if recurring is enabled
+//        if let req = request, req.is_recurring == true {
+//            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+//                // Only send start_date if type is .custom and field is not empty
+//                if let startDateText = txtFieldSelectDateGrailPayBankView?.text, !startDateText.isEmpty {
+//                    let inputFormatter = DateFormatter()
+//                    inputFormatter.dateFormat = "dd/MM/yyyy"
+//                    
+//                    let outputFormatter = DateFormatter()
+//                    outputFormatter.dateFormat = "MM/dd/yyyy"
+//                    
+//                    if let date = inputFormatter.date(from: startDateText) {
+//                        let apiFormattedDate = outputFormatter.string(from: date)
+//                        params["start_date"] = apiFormattedDate
+//                    } else {
+//                        print("Invalid date format in startDateText")
+//                    }
+//                }
+//            }
+//            
+//            params["interval"] = txtFieldChosePlanGrailPayBankView.text.lowercased()
+//        }
+        
         // 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")
-                    }
+            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")
                 }
             }
             
+            // interval is still required
             params["interval"] = txtFieldChosePlanGrailPayBankView.text.lowercased()
         }
         
@@ -3958,26 +4036,47 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             params["description"] = "Hosted payment checkout"
         }
         
+        // Add these if recurring is enabled
+//        if let req = request, req.is_recurring == true {
+//            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+//                // Only send start_date if type is .custom and field is not empty
+//                if let startDateText = txtFieldSelectDateGrailPayBankView?.text, !startDateText.isEmpty {
+//                    let inputFormatter = DateFormatter()
+//                    inputFormatter.dateFormat = "dd/MM/yyyy"
+//                    
+//                    let outputFormatter = DateFormatter()
+//                    outputFormatter.dateFormat = "MM/dd/yyyy"
+//                    
+//                    if let date = inputFormatter.date(from: startDateText) {
+//                        let apiFormattedDate = outputFormatter.string(from: date)
+//                        params["start_date"] = apiFormattedDate
+//                    } else {
+//                        print("Invalid date format in startDateText")
+//                    }
+//                }
+//            }
+//            
+//            params["interval"] = txtFieldChosePlanGrailPayBankView.text.lowercased()
+//        }
+        
         // 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")
-                    }
+            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")
                 }
             }
             
+            // interval is still required
             params["interval"] = txtFieldChosePlanGrailPayBankView.text.lowercased()
         }
         
@@ -4171,26 +4270,47 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             params["description"] = "Hosted payment checkout"
         }
         
+        // Add these if recurring is enabled
+//        if let req = request, req.is_recurring == true {
+//            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+//                // Only send start_date if type is .custom and field is not empty
+//                if let startDateText = 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()
+//        }
+        
         // 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")
-                    }
+            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")
                 }
             }
             
+            // interval is still required
             params["interval"] = txtFieldChosePlanNewGrailPayBankView.text.lowercased()
         }
         
@@ -4379,26 +4499,47 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             params["description"] = "Hosted payment checkout"
         }
         
+        // Add these if recurring is enabled
+//        if let req = request, req.is_recurring == true {
+//            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+//                // Only send start_date if type is .custom and field is not empty
+//                if let startDateText = 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()
+//        }
+        
         // 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")
-                    }
+            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")
                 }
             }
             
+            // interval is still required
             params["interval"] = txtFieldSelectPlanSingleSavedBankView.text.lowercased()
         }
         
@@ -5980,7 +6121,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.customerToken
-        print("🔑 Setting customerToken header: \(token ?? "None")")
+       // print("🔑 Setting customerToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Customer-Token")
         
         let session = URLSession.shared
@@ -6001,10 +6142,10 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             }
             
             do {
-                // Print raw JSON string for inspection
-                if let rawJSON = String(data: data, encoding: .utf8) {
-                    print("📦 Raw JSON Response:\n\(rawJSON)")
-                }
+//                // 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]] {
@@ -6096,9 +6237,10 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             self.txtFieldSelectDateSingleSavedCard.isHidden = true
                         }
                     }
-                } else {
-                    print("⚠️ JSON structure unexpected or 'Cards' key missing")
                 }
+//                else {
+//                    print("⚠️ JSON structure unexpected or 'Cards' key missing")
+//                }
             } catch {
                 print("❌ JSON parsing failed: \(error.localizedDescription)")
             }
@@ -6142,9 +6284,30 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             }
         }
         
+//        if let req = request, req.is_recurring == true {
+//            if let recurringType = req.recurringStartDateType, recurringType == .custom,
+//               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) {
+//                    requestBody["start_date"] = outputFormatter.string(from: date)
+//                } else {
+//                    print("Invalid start date format.")
+//                }
+//            }
+//            
+//            if let plan = txtFieldChosePlanCard?.text, !plan.isEmpty {
+//                requestBody["interval"] = plan.lowercased()
+//            }
+//        }
+        
+        // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
-            if let recurringType = req.recurringStartDateType, recurringType == .custom,
-               let startDateText = txtFieldStartDateCard?.text, !startDateText.isEmpty {
+            if let startDateText = txtFieldStartDateCard?.text, !startDateText.isEmpty {
                 let inputFormatter = DateFormatter()
                 inputFormatter.dateFormat = "dd/MM/yyyy"
                 
@@ -6152,15 +6315,15 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 outputFormatter.dateFormat = "MM/dd/yyyy"
                 
                 if let date = inputFormatter.date(from: startDateText) {
-                    requestBody["start_date"] = outputFormatter.string(from: date)
+                    let apiFormattedDate = outputFormatter.string(from: date)
+                    requestBody["start_date"] = apiFormattedDate
                 } else {
-                    print("Invalid start date format.")
+                    print("Invalid date format in startDateText")
                 }
             }
             
-            if let plan = txtFieldChosePlanCard?.text, !plan.isEmpty {
-                requestBody["interval"] = plan.lowercased()
-            }
+            // interval is still required
+            requestBody["interval"] = txtFieldChosePlanCard.text.lowercased()
         }
         
         // ✅ Include metadata only if it has at least 1 key-value pair
@@ -6311,26 +6474,47 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             params["description"] = "Hosted payment checkout"
         }
         
+        // Add these if recurring is enabled
+//        if let req = request, req.is_recurring == true {
+//            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+//                // Only send start_date if type is .custom and field is not empty
+//                if let startDateText = txtFieldStartDateCard?.text, !startDateText.isEmpty {
+//                    let inputFormatter = DateFormatter()
+//                    inputFormatter.dateFormat = "dd/MM/yyyy"
+//                    
+//                    let outputFormatter = DateFormatter()
+//                    outputFormatter.dateFormat = "MM/dd/yyyy"
+//                    
+//                    if let date = inputFormatter.date(from: startDateText) {
+//                        let apiFormattedDate = outputFormatter.string(from: date)
+//                        params["start_date"] = apiFormattedDate
+//                    } else {
+//                        print("Invalid date format in startDateText")
+//                    }
+//                }
+//            }
+//            
+//            params["interval"] = txtFieldChosePlanCard.text.lowercased()
+//        }
+        
         // 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")
-                    }
+            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")
                 }
             }
             
+            // interval is still required
             params["interval"] = txtFieldChosePlanCard.text.lowercased()
         }
         
@@ -6446,26 +6630,47 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "email": UserStoreSingleton.shared.verificationEmail ?? ""
         ]
         
+        // Add these if recurring is enabled
+//        if let req = request, req.is_recurring == true {
+//            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+//                // Only send start_date if type is .custom and field is not empty
+//                if let startDateText = txtFieldSelectDateSingleSavedCard?.text, !startDateText.isEmpty {
+//                    let inputFormatter = DateFormatter()
+//                    inputFormatter.dateFormat = "dd/MM/yyyy"
+//                    
+//                    let outputFormatter = DateFormatter()
+//                    outputFormatter.dateFormat = "MM/dd/yyyy"
+//                    
+//                    if let date = inputFormatter.date(from: startDateText) {
+//                        let apiFormattedDate = outputFormatter.string(from: date)
+//                        params["start_date"] = apiFormattedDate
+//                    } else {
+//                        print("Invalid date format in startDateText")
+//                    }
+//                }
+//            }
+//            
+//            params["interval"] = txtFieldSelectPlanSingleSavedCard.text.lowercased()
+//        }
+        
         // 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")
-                    }
+            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")
                 }
             }
             
+            // interval is still required
             params["interval"] = txtFieldSelectPlanSingleSavedCard.text.lowercased()
         }
         
@@ -6634,26 +6839,47 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             params["description"] = "Hosted payment checkout"
         }
         
+        // Add these if recurring is enabled
+//        if let req = request, req.is_recurring == true {
+//            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+//                // Only send start_date if type is .custom and field is not empty
+//                if let startDateText = txtFieldSelectDateSingleSavedCard?.text, !startDateText.isEmpty {
+//                    let inputFormatter = DateFormatter()
+//                    inputFormatter.dateFormat = "dd/MM/yyyy"
+//                    
+//                    let outputFormatter = DateFormatter()
+//                    outputFormatter.dateFormat = "MM/dd/yyyy"
+//                    
+//                    if let date = inputFormatter.date(from: startDateText) {
+//                        let apiFormattedDate = outputFormatter.string(from: date)
+//                        params["start_date"] = apiFormattedDate
+//                    } else {
+//                        print("Invalid date format in startDateText")
+//                    }
+//                }
+//            }
+//            
+//            params["interval"] = txtFieldSelectPlanSingleSavedCard.text.lowercased()
+//        }
+        
         // 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")
-                    }
+            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")
                 }
             }
             
+            // interval is still required
             params["interval"] = txtFieldSelectPlanSingleSavedCard.text.lowercased()
         }
         
@@ -6869,26 +7095,47 @@ 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()
+//        }
+        
         // 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")
-                    }
+            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")
                 }
             }
             
+            // interval is still required
             params["interval"] = txtFieldSelectPlanNewCardView.text.lowercased()
         }
         
@@ -7105,26 +7352,47 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             params["description"] = "Hosted payment checkout"
         }
         
+        // Add these if recurring is enabled
+//        if let req = request, req.is_recurring == true {
+//            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+//                // Only send start_date if type is .custom and field is not empty
+//                if let startDateText = txtFieldSelectDateNewCardView?.text, !startDateText.isEmpty {
+//                    let inputFormatter = DateFormatter()
+//                    inputFormatter.dateFormat = "dd/MM/yyyy"
+//                    
+//                    let outputFormatter = DateFormatter()
+//                    outputFormatter.dateFormat = "MM/dd/yyyy"
+//                    
+//                    if let date = inputFormatter.date(from: startDateText) {
+//                        let apiFormattedDate = outputFormatter.string(from: date)
+//                        params["start_date"] = apiFormattedDate
+//                    } else {
+//                        print("Invalid date format in startDateText")
+//                    }
+//                }
+//            }
+//            
+//            params["interval"] = txtFieldSelectPlanNewCardView.text.lowercased()
+//        }
+        
         // 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")
-                    }
+            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")
                 }
             }
             
+            // interval is still required
             params["interval"] = txtFieldSelectPlanNewCardView.text.lowercased()
         }
         
@@ -7250,7 +7518,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         request.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.customerToken
-        print("Setting customerToken header: \(token ?? "None")")
+       // print("Setting customerToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Customer-Token")
         
         // Get the text fields from the selected cell and trim whitespace
@@ -7499,7 +7767,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             return
         }
         
-        print("Setting customerToken header: \(token)")
+       // print("Setting customerToken header: \(token)")
         urlRequest.addValue(token, forHTTPHeaderField: "Customer-Token")
         
         let session = URLSession.shared
@@ -7691,26 +7959,47 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             }
         }
         
+        // 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()
+//        }
+        
         // 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")
-                    }
+            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")
                 }
             }
             
+            // interval is still required
             params["interval"] = txtFieldSelectPlanViewBankFields.text.lowercased()
         }
         
@@ -7932,26 +8221,47 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             params["description"] = "Hosted payment checkout"
         }
         
+        // Add these if recurring is enabled
+//        if let req = request, req.is_recurring == true {
+//            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+//                // Only send start_date if type is .custom and field is not empty
+//                if let startDateText = 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()
+//        }
+        
         // 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")
-                    }
+            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")
                 }
             }
             
+            // interval is still required
             params["interval"] = txtFieldSelectPlanViewBankFields.text.lowercased()
         }
         
@@ -8083,26 +8393,47 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "email": UserStoreSingleton.shared.verificationEmail ?? ""
         ]
         
+        // Add these if recurring is enabled
+//        if let req = request, req.is_recurring == true {
+//            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+//                // Only send start_date if type is .custom and field is not empty
+//                if let startDateText = 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()
+//        }
+        
         // 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")
-                    }
+            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")
                 }
             }
             
+            // interval is still required
             params["interval"] = txtFieldSelectPlanSingleSavedBankView.text.lowercased()
         }
         
@@ -8303,26 +8634,47 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             params["description"] = "Hosted payment checkout"
         }
         
+        // Add these if recurring is enabled
+//        if let req = request, req.is_recurring == true {
+//            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+//                // Only send start_date if type is .custom and field is not empty
+//                if let startDateText = 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()
+//        }
+        
         // 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")
-                    }
+            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")
                 }
             }
             
+            // interval is still required
             params["interval"] = txtFieldSelectPlanSingleSavedBankView.text.lowercased()
         }
         
@@ -8463,26 +8815,47 @@ 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()
+//        }
+        
         // 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")
-                    }
+            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")
                 }
             }
             
+            // interval is still required
             params["interval"] = txtFieldSelectPlanNewAccountView.text.lowercased()
         }
         
@@ -8691,26 +9064,47 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             params["description"] = "Hosted payment checkout"
         }
         
+        // Add these if recurring is enabled
+//        if let req = request, req.is_recurring == true {
+//            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+//                // Only send start_date if type is .custom and field is not empty
+//                if let startDateText = 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()
+//        }
+        
         // 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")
-                    }
+            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")
                 }
             }
             
+            // interval is still required
             params["interval"] = txtFieldSelectPlanNewAccountView.text.lowercased()
         }
         
@@ -8861,26 +9255,47 @@ 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()
+//        }
+        
         // 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")
-                    }
+            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")
                 }
             }
             
+            // interval is still required
             params["interval"] = txtFieldSelectPlanNewAccountView.text.lowercased()
         }
         
@@ -9006,7 +9421,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         request.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.customerToken
-        print("Setting customerToken header: \(token ?? "None")")
+       // print("Setting customerToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Customer-Token")
         
         let session = URLSession.shared
@@ -9387,26 +9802,47 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             params["description"] = "Hosted payment checkout"
         }
         
+        // Add these if recurring is enabled
+//        if let req = request, req.is_recurring == true {
+//            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+//                // Only send start_date if type is .custom and field is not empty
+//                if let startDateText = txtFieldStartDateCard?.text, !startDateText.isEmpty {
+//                    let inputFormatter = DateFormatter()
+//                    inputFormatter.dateFormat = "dd/MM/yyyy"
+//                    
+//                    let outputFormatter = DateFormatter()
+//                    outputFormatter.dateFormat = "MM/dd/yyyy"
+//                    
+//                    if let date = inputFormatter.date(from: startDateText) {
+//                        let apiFormattedDate = outputFormatter.string(from: date)
+//                        params["start_date"] = apiFormattedDate
+//                    } else {
+//                        print("Invalid date format in startDateText")
+//                    }
+//                }
+//            }
+//            
+//            params["interval"] = txtFieldChosePlanCard.text.lowercased()
+//        }
+        
         // 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")
-                    }
+            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")
                 }
             }
             
+            // interval is still required
             params["interval"] = txtFieldChosePlanCard.text.lowercased()
         }
         
@@ -9679,26 +10115,47 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             params["description"] = "Hosted payment checkout"
         }
         
+        // Add these if recurring is enabled
+//        if let req = request, req.is_recurring == true {
+//            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+//                // Only send start_date if type is .custom and field is not empty
+//                if let startDateText = txtFieldSelectDateNewCardView?.text, !startDateText.isEmpty {
+//                    let inputFormatter = DateFormatter()
+//                    inputFormatter.dateFormat = "dd/MM/yyyy"
+//                    
+//                    let outputFormatter = DateFormatter()
+//                    outputFormatter.dateFormat = "MM/dd/yyyy"
+//                    
+//                    if let date = inputFormatter.date(from: startDateText) {
+//                        let apiFormattedDate = outputFormatter.string(from: date)
+//                        params["start_date"] = apiFormattedDate
+//                    } else {
+//                        print("Invalid date format in startDateText")
+//                    }
+//                }
+//            }
+//            
+//            params["interval"] = txtFieldSelectPlanNewCardView.text.lowercased()
+//        }
+        
         // 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")
-                    }
+            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")
                 }
             }
             
+            // interval is still required
             params["interval"] = txtFieldSelectPlanNewCardView.text.lowercased()
         }