@jimrising/easymerchantsdk-react-native 1.4.2 → 1.4.4

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

@@ -205,6 +205,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var txtFieldSelectDateGrailPayBankView: TextFieldStackView!
     @IBOutlet weak var bankIconGrailPayBankView: UIImageView!
     @IBOutlet weak var viewSaveAccountForFutureGrailPayView: UIStackView!
+    @IBOutlet weak var txtFieldEmailGrailPayView: TextFieldStackView!
+    @IBOutlet weak var viewTxtFieldEmailGrailPayView: UIView!
     
     //New GrailPay Account
     @IBOutlet weak var viewAddNewGrailPayAccount: UIView!
@@ -274,7 +276,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var heightSubViewNewAccountFields: NSLayoutConstraint!
     @IBOutlet weak var viewSaveAccountForFutureNewAccountView: UIStackView!
     
-    
     //Crypto
     @IBOutlet weak var viewCrypto: UIView!
     @IBOutlet weak var viewCryptoTryAgain: UIView!
@@ -422,29 +423,69 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         self.view.addGestureRecognizer(tapGesture)
         
         //// Check if billingInfoData is available
+//        if let billingInfoData = request.billingInfoData,
+//           let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
+//            
+//            let billingVisible = fieldSection.visibility.billing
+//            let suffix = billingVisible ? " (Billing Info)" : " (Additional Info)"
+//            let buttonText = (request?.submitButtonText?.isEmpty == false
+//                              ? request!.submitButtonText! + suffix
+//                              : "Next" + suffix)
+//            
+//            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 {
+//            let amountValue = request?.amount ?? 0
+//            let amountText = String(format: "$%.2f", amountValue)
+//            let submitText = request?.submitButtonText
+//            
+//            let defaultTitle = (submitText?.isEmpty == false)
+//            ? "\(submitText!) (\(amountText))"
+//            : "Pay Now (\(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.billingInfoData,
            let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
             
             let billingVisible = fieldSection.visibility.billing
-            let suffix = billingVisible ? " (Billing Info)" : " (Additional Info)"
-            let buttonText = (request?.submitButtonText?.isEmpty == false
-                              ? request!.submitButtonText! + suffix
-                              : "Next" + suffix)
-            
+            let additionalVisible = fieldSection.visibility.additional
+            let submitText = request?.submitButtonText?.isEmpty == false ? request!.submitButtonText! : "Pay Now"
+            let amountText = String(format: "$%.2f", request?.amount ?? 0)
+
+            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 {
-            let amountValue = request?.amount ?? 0
-            let amountText = String(format: "$%.2f", amountValue)
-            let submitText = request?.submitButtonText
-            
-            let defaultTitle = (submitText?.isEmpty == false)
-            ? "\(submitText!) (\(amountText))"
-            : "Pay Now (\(amountText))"
-            
+            // When no billingInfoData present
+            let amountText = String(format: "$%.2f", request?.amount ?? 0)
+            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)
@@ -989,6 +1030,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             txtFieldRoutingNumberNewAccountView.tintColor = uiColor
             txtFieldNameOnCardNewCardView.tintColor = uiColor
             txtFieldNameOnCardUpdateCardView.tintColor = uiColor
+            txtFieldEmailGrailPayView.tintColor = uiColor
+            txtFieldEmailCardView.tintColor = uiColor
+            txtFieldEmailAccountView.tintColor = uiColor
             cardNumberTextField.tintColor = uiColor
             cardExpiryTextField.tintColor = uiColor
             cardCvvTextField.tintColor = uiColor
@@ -1260,6 +1304,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         txtFieldAccountNumber.delegate = self
         txtFieldConfirmBankAccount.delegate = self
         txtFieldEmailAccountView.textField.delegate = self
+        txtFieldEmailGrailPayView.textField.delegate = self
     }
     
     private func updateSaveButtons() {
@@ -1886,8 +1931,62 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     }
                     
                     // Redirect based on billing visibility
-                    if fieldSection.visibility.billing {
-                        // Instantiate BillingInfoVC and pass the selected card data and CVV text
+//                    if fieldSection.visibility.billing {
+//                        // Instantiate BillingInfoVC and pass the selected card data and CVV text
+//                        let billingInfoVC = UIStoryboard(name: "easymerchantsdk", bundle: .easyPayBundle).instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
+//                        
+//                        billingInfoVC.isFrom = "SavedCards"
+//                        billingInfoVC.selectedCard = self.selectedCard // Passing the selected card data
+//                        billingInfoVC.cvvText = cvvText // Passing the CVV text
+//                        billingInfoVC.amount = Int(self.request.amount ?? 0)
+//                        billingInfoVC.selectedPaymentMethod = self.selectedPaymentMethod
+//                        
+//                        if let billingInfoData = self.request.billingInfoData {
+//                            billingInfoVC.billingInfoData = billingInfoData
+//                        }
+//                        
+//                        billingInfoVC.request = self.request
+//                        billingInfoVC.chosenPlan = self.txtFieldSelectPlanSingleSavedCard.text
+//                        billingInfoVC.startDate = self.txtFieldSelectDateSingleSavedCard.text
+//                        
+//                        billingInfoVC.billingInfo = fieldSection.billing
+//                        billingInfoVC.additionalInfo = fieldSection.additional
+//                        billingInfoVC.visibility = fieldSection.visibility
+//                        
+//                        // Navigate to BillingInfoVC
+//                        self.navigationController?.pushViewController(billingInfoVC, animated: true)
+//                    }
+//                    else {
+//                        let additionalInfoVC = UIStoryboard(name: "easymerchantsdk", bundle: .easyPayBundle).instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
+//                        additionalInfoVC.isFrom = "SavedCards"
+//                        additionalInfoVC.selectedCard = self.selectedCard // Passing the selected card data
+//                        additionalInfoVC.cvvText = cvvText // Passing the CVV text
+//                        additionalInfoVC.amount = Int(self.request.amount ?? 0)
+//                        additionalInfoVC.selectedPaymentMethod = self.selectedPaymentMethod
+//                        
+//                        if let billingInfoData = self.request.billingInfoData {
+//                            additionalInfoVC.billingInfoData = billingInfoData
+//                        }
+//                        
+//                        additionalInfoVC.request = self.request
+//                        additionalInfoVC.chosenPlan = self.txtFieldSelectPlanSingleSavedCard.text
+//                        additionalInfoVC.startDate = self.txtFieldSelectDateSingleSavedCard.text
+//                        
+//                        additionalInfoVC.billingInfo = fieldSection.billing
+//                        additionalInfoVC.additionalInfo = fieldSection.additional
+//                        additionalInfoVC.visibility = fieldSection.visibility
+//                        
+//                        self.navigationController?.pushViewController(additionalInfoVC, animated: true)
+//                    }
+                    
+                    let showBilling = fieldSection.visibility.billing
+                    let showAdditional = fieldSection.visibility.additional
+
+                    if !showBilling && !showAdditional {
+                        self.paymentIntentFromShowCardApi()
+                    }
+                    else if showBilling {
+                        // Push to BillingInfoVC
                         let billingInfoVC = UIStoryboard(name: "easymerchantsdk", bundle: .easyPayBundle).instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
                         
                         billingInfoVC.isFrom = "SavedCards"
@@ -1912,6 +2011,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         self.navigationController?.pushViewController(billingInfoVC, animated: true)
                     }
                     else {
+                        // Push to AdditionalInfoVC
                         let additionalInfoVC = UIStoryboard(name: "easymerchantsdk", bundle: .easyPayBundle).instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
                         additionalInfoVC.isFrom = "SavedCards"
                         additionalInfoVC.selectedCard = self.selectedCard // Passing the selected card data
@@ -1933,6 +2033,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         
                         self.navigationController?.pushViewController(additionalInfoVC, animated: true)
                     }
+
                 }
             }
             catch {
@@ -2086,10 +2187,75 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         }
                         
                         // Redirect based on billing visibility
-                        if fieldSection.visibility.billing {
-                            // Instantiate BillingInfoVC and pass the card details
-                            let billingInfoVC = UIStoryboard(name: "easymerchantsdk", bundle: .easyPayBundle).instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
-                            
+//                        if fieldSection.visibility.billing {
+//                            // Instantiate BillingInfoVC and pass the card details
+//                            let billingInfoVC = UIStoryboard(name: "easymerchantsdk", bundle: .easyPayBundle).instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
+//                            
+//                            // Pass the card details
+//                            billingInfoVC.cardNumber = cardNumber
+//                            billingInfoVC.expiryDate = expiryDate
+//                            billingInfoVC.cvv = cvv
+//                            billingInfoVC.nameOnCard = nameOnCard
+//                            billingInfoVC.isSavedNewCard = self.isSavedNewCardForFuture
+//                            
+//                            billingInfoVC.isFrom = "AddNewCard"
+//                            billingInfoVC.amount = Int(self.request.amount ?? 0)
+//                            billingInfoVC.selectedPaymentMethod = self.selectedPaymentMethod
+//                            
+//                            if let billingInfoData = self.request.billingInfoData {
+//                                billingInfoVC.billingInfoData = billingInfoData
+//                            }
+//                            
+//                            billingInfoVC.request = self.request
+//                            billingInfoVC.chosenPlan = self.txtFieldSelectPlanNewCardView.text
+//                            billingInfoVC.startDate = self.txtFieldSelectDateNewCardView.text
+//                            
+//                            billingInfoVC.billingInfo = fieldSection.billing
+//                            billingInfoVC.additionalInfo = fieldSection.additional
+//                            billingInfoVC.visibility = fieldSection.visibility
+//                            
+//                            // Navigate to BillingInfoVC
+//                            self.navigationController?.pushViewController(billingInfoVC, animated: true)
+//                        }
+//                        else {
+//                            let additionalInfoVC = UIStoryboard(name: "easymerchantsdk", bundle: .easyPayBundle).instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
+//                            
+//                            // Pass the card details
+//                            additionalInfoVC.cardNumber = cardNumber
+//                            additionalInfoVC.expiryDate = expiryDate
+//                            additionalInfoVC.cvv = cvv
+//                            additionalInfoVC.nameOnCard = nameOnCard
+//                            additionalInfoVC.isSavedNewCard = self.isSavedNewCardForFuture
+//                            
+//                            additionalInfoVC.isFrom = "AddNewCard"
+//                            additionalInfoVC.amount = Int(self.request.amount ?? 0)
+//                            additionalInfoVC.selectedPaymentMethod = self.selectedPaymentMethod
+//                            
+//                            if let billingInfoData = self.request.billingInfoData {
+//                                additionalInfoVC.billingInfoData = billingInfoData
+//                            }
+//                            
+//                            additionalInfoVC.request = self.request
+//                            additionalInfoVC.chosenPlan = self.txtFieldSelectPlanNewCardView.text
+//                            additionalInfoVC.startDate = self.txtFieldSelectDateNewCardView.text
+//                            
+//                            additionalInfoVC.billingInfo = fieldSection.billing
+//                            additionalInfoVC.additionalInfo = fieldSection.additional
+//                            additionalInfoVC.visibility = fieldSection.visibility
+//                            
+//                            self.navigationController?.pushViewController(additionalInfoVC, animated: true)
+//                        }
+                        
+                        
+                        let showBilling = fieldSection.visibility.billing
+                        let showAdditional = fieldSection.visibility.additional
+                        
+                        if !showBilling && !showAdditional {
+                            self.threeDSecurePaymentNewCardApi(customerId: UserStoreSingleton.shared.customerId ?? "")
+                        }
+                        else if showBilling {
+                            // Push to BillingInfoVC
+                            let billingInfoVC = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
                             // Pass the card details
                             billingInfoVC.cardNumber = cardNumber
                             billingInfoVC.expiryDate = expiryDate
@@ -2112,13 +2278,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             billingInfoVC.billingInfo = fieldSection.billing
                             billingInfoVC.additionalInfo = fieldSection.additional
                             billingInfoVC.visibility = fieldSection.visibility
-                            
-                            // Navigate to BillingInfoVC
                             self.navigationController?.pushViewController(billingInfoVC, animated: true)
                         }
                         else {
-                            let additionalInfoVC = UIStoryboard(name: "easymerchantsdk", bundle: .easyPayBundle).instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
-                            
+                            // Push to AdditionalInfoVC
+                            let additionalInfoVC = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
                             // Pass the card details
                             additionalInfoVC.cardNumber = cardNumber
                             additionalInfoVC.expiryDate = expiryDate
@@ -2141,7 +2305,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             additionalInfoVC.billingInfo = fieldSection.billing
                             additionalInfoVC.additionalInfo = fieldSection.additional
                             additionalInfoVC.visibility = fieldSection.visibility
-                            
                             self.navigationController?.pushViewController(additionalInfoVC, animated: true)
                         }
                     }
@@ -2554,6 +2717,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     
     @IBAction private func actionBtnLinkGrailPayBankAccount(_ sender: UIButton) {
         if isBankAccountConnected {
+            
+            let email = self.txtFieldEmailGrailPayView.text.trimmingCharacters(in: .whitespacesAndNewlines)
+            
             // Recurring Plan + Date Validation (only if is_recurring is true)
             if let req = self.request, req.is_recurring == true {
                 if self.txtFieldChosePlanGrailPayBankView.text.isEmpty {
@@ -2569,6 +2735,15 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 }
             }
             
+            if email.isEmpty {
+                self.showAlert(title: "Missing Information", message: "Please enter an email address.")
+                return
+            }
+            else if !self.isValidEmail(email) {
+                self.showAlert(title: "Invalid Email", message: "Please enter a valid email address.")
+                return
+            }
+            
             guard agreeTermsAndCondtition else {
                 self.showAlert(title: "Terms and Conditions", message: "Please agree to the terms and conditions.")
                 return
@@ -2588,7 +2763,72 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                 print("Billing Info Data: \(jsonDict)")
                                 
                                 // Redirect based on billing visibility
-                                if fieldSection.visibility.billing {
+//                                if fieldSection.visibility.billing {
+//                                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
+//                                    vc.billingInfoData = billingInfoData
+//                                    vc.request = self.request
+//                                    vc.chosenPlan = self.txtFieldChosePlanGrailPayBankView.text
+//                                    vc.startDate = self.txtFieldSelectDateGrailPayBankView.text
+//                                    vc.selectedPaymentMethod = "GrailPay"
+//                                    vc.isSavedForFuture = self.isSavedForFuture
+//                                    vc.grailPayAccountID = self.grailPayAccountID
+//                                    vc.selectedGrailPayAccountType = self.selectedGrailPayAccountType
+//                                    vc.selectedGrailPayAccountName = self.selectedGrailPayAccountName
+//                                    vc.amount = self.amount
+//                                    vc.billingInfo = fieldSection.billing
+//                                    vc.additionalInfo = fieldSection.additional
+//                                    vc.visibility = fieldSection.visibility
+//                                    vc.easyPayDelegate = self.easyPayDelegate
+//                                    vc.userEmail = self.txtFieldEmailGrailPayView.text
+//                                    self.navigationController?.pushViewController(vc, animated: true)
+//                                }
+//                                else {
+//                                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
+//                                    vc.billingInfoData = billingInfoData
+//                                    vc.request = self.request
+//                                    vc.chosenPlan = self.txtFieldChosePlanGrailPayBankView.text
+//                                    vc.startDate = self.txtFieldSelectDateGrailPayBankView.text
+//                                    vc.selectedPaymentMethod = "GrailPay"
+//                                    vc.isSavedForFuture = self.isSavedForFuture
+//                                    vc.grailPayAccountID = self.grailPayAccountID
+//                                    vc.selectedGrailPayAccountType = self.selectedGrailPayAccountType
+//                                    vc.selectedGrailPayAccountName = self.selectedGrailPayAccountName
+//                                    vc.amount = self.amount
+//                                    vc.billingInfo = fieldSection.billing
+//                                    vc.additionalInfo = fieldSection.additional
+//                                    vc.visibility = fieldSection.visibility
+//                                    vc.easyPayDelegate = self.easyPayDelegate
+//                                    vc.userEmail = self.txtFieldEmailGrailPayView.text
+//                                    self.navigationController?.pushViewController(vc, animated: true)
+//                                }
+                                
+                                let showBilling = fieldSection.visibility.billing
+                                let showAdditional = fieldSection.visibility.additional
+
+                                if !showBilling && !showAdditional {
+                                    // Navigate directly to EmailVerificationVC
+//                                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
+                                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "OTPVerificationVC") as! OTPVerificationVC
+                                    vc.easyPayDelegate = self.easyPayDelegate
+                                    vc.grailPayAccountID = self.grailPayAccountID
+                                    vc.selectedGrailPayAccountType = self.selectedGrailPayAccountType
+                                    vc.selectedGrailPayAccountName = self.selectedGrailPayAccountName
+                                    vc.chosenPlan = self.txtFieldChosePlanGrailPayBankView.text
+                                    vc.startDate = self.txtFieldSelectDateGrailPayBankView.text
+                                    vc.request = self.request
+                                    vc.isSavedForFuture = self.isSavedForFuture
+                                    vc.selectedPaymentMethod = "GrailPay"
+                                    vc.userEmail = self.txtFieldEmailGrailPayView.text
+                                    vc.billingInfoData = billingInfoData // Send the data even if not shown
+                                    vc.billingInfo = fieldSection.billing
+                                    vc.additionalInfo = fieldSection.additional
+                                    vc.visibility = fieldSection.visibility
+                                    vc.amount = self.amount
+                                    vc.email = self.txtFieldEmailGrailPayView.text
+                                    self.navigationController?.pushViewController(vc, animated: true)
+                                }
+                                else if showBilling {
+                                    // Push to BillingInfoVC
                                     let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
                                     vc.billingInfoData = billingInfoData
                                     vc.request = self.request
@@ -2604,9 +2844,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                     vc.additionalInfo = fieldSection.additional
                                     vc.visibility = fieldSection.visibility
                                     vc.easyPayDelegate = self.easyPayDelegate
+                                    vc.userEmail = self.txtFieldEmailGrailPayView.text
                                     self.navigationController?.pushViewController(vc, animated: true)
                                 }
                                 else {
+                                    // Push to AdditionalInfoVC
                                     let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
                                     vc.billingInfoData = billingInfoData
                                     vc.request = self.request
@@ -2622,8 +2864,10 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                     vc.additionalInfo = fieldSection.additional
                                     vc.visibility = fieldSection.visibility
                                     vc.easyPayDelegate = self.easyPayDelegate
+                                    vc.userEmail = self.txtFieldEmailGrailPayView.text
                                     self.navigationController?.pushViewController(vc, animated: true)
                                 }
+
                             }
                         }
                     }
@@ -2634,7 +2878,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 else {
                     //If billing info is nil
                     // Navigate to EmailVerificationVC directly
-                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
+//                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
+                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "OTPVerificationVC") as! OTPVerificationVC
                     vc.easyPayDelegate = self.easyPayDelegate
                     vc.grailPayAccountID = self.grailPayAccountID
                     vc.selectedGrailPayAccountType = self.selectedGrailPayAccountType
@@ -2644,6 +2889,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     vc.request = self.request
                     vc.isSavedForFuture = self.isSavedForFuture
                     vc.selectedPaymentMethod = "GrailPay"
+                    vc.email = self.txtFieldEmailGrailPayView.text
+                    vc.amount = self.amount
                     self.navigationController?.pushViewController(vc, animated: true)
                 }
             } else {
@@ -2660,7 +2907,54 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                 print("Billing Info Data: \(jsonDict)")
                                 
                                 // Redirect based on billing visibility
-                                if fieldSection.visibility.billing {
+//                                if fieldSection.visibility.billing {
+//                                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
+//                                    vc.billingInfoData = billingInfoData
+//                                    vc.request = self.request
+//                                    vc.chosenPlan = self.txtFieldChosePlanGrailPayBankView.text
+//                                    vc.startDate = self.txtFieldSelectDateGrailPayBankView.text
+//                                    vc.selectedPaymentMethod = "GrailPay"
+//                                    vc.isSavedForFuture = self.isSavedForFuture
+//                                    vc.grailPayAccountID = self.grailPayAccountID
+//                                    vc.selectedGrailPayAccountType = self.selectedGrailPayAccountType
+//                                    vc.selectedGrailPayAccountName = self.selectedGrailPayAccountName
+//                                    vc.amount = self.amount
+//                                    vc.billingInfo = fieldSection.billing
+//                                    vc.additionalInfo = fieldSection.additional
+//                                    vc.visibility = fieldSection.visibility
+//                                    vc.easyPayDelegate = self.easyPayDelegate
+//                                    vc.userEmail = self.txtFieldEmailGrailPayView.text
+//                                    self.navigationController?.pushViewController(vc, animated: true)
+//                                }
+//                                else {
+//                                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
+//                                    vc.billingInfoData = billingInfoData
+//                                    vc.request = self.request
+//                                    vc.chosenPlan = self.txtFieldChosePlanGrailPayBankView.text
+//                                    vc.startDate = self.txtFieldSelectDateGrailPayBankView.text
+//                                    vc.selectedPaymentMethod = "GrailPay"
+//                                    vc.isSavedForFuture = self.isSavedForFuture
+//                                    vc.grailPayAccountID = self.grailPayAccountID
+//                                    vc.selectedGrailPayAccountType = self.selectedGrailPayAccountType
+//                                    vc.selectedGrailPayAccountName = self.selectedGrailPayAccountName
+//                                    vc.amount = self.amount
+//                                    vc.billingInfo = fieldSection.billing
+//                                    vc.additionalInfo = fieldSection.additional
+//                                    vc.visibility = fieldSection.visibility
+//                                    vc.easyPayDelegate = self.easyPayDelegate
+//                                    vc.userEmail = self.txtFieldEmailGrailPayView.text
+//                                    self.navigationController?.pushViewController(vc, animated: true)
+//                                }
+                                
+                                
+                                let showBilling = fieldSection.visibility.billing
+                                let showAdditional = fieldSection.visibility.additional
+
+                                if !showBilling && !showAdditional {
+                                    self.grailPayAccountChargeApi()
+                                }
+                                else if showBilling {
+                                    // Push to BillingInfoVC
                                     let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
                                     vc.billingInfoData = billingInfoData
                                     vc.request = self.request
@@ -2676,9 +2970,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                     vc.additionalInfo = fieldSection.additional
                                     vc.visibility = fieldSection.visibility
                                     vc.easyPayDelegate = self.easyPayDelegate
+                                    vc.userEmail = self.txtFieldEmailGrailPayView.text
                                     self.navigationController?.pushViewController(vc, animated: true)
                                 }
                                 else {
+                                    // Push to AdditionalInfoVC
                                     let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
                                     vc.billingInfoData = billingInfoData
                                     vc.request = self.request
@@ -2694,6 +2990,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                     vc.additionalInfo = fieldSection.additional
                                     vc.visibility = fieldSection.visibility
                                     vc.easyPayDelegate = self.easyPayDelegate
+                                    vc.userEmail = self.txtFieldEmailGrailPayView.text
                                     self.navigationController?.pushViewController(vc, animated: true)
                                 }
                             }
@@ -2751,7 +3048,52 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                 print("Billing Info Data: \(jsonDict)")
                                 
                                 // Redirect based on billing visibility
-                                if fieldSection.visibility.billing {
+//                                if fieldSection.visibility.billing {
+//                                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
+//                                    vc.billingInfoData = billingInfoData
+//                                    vc.request = self.request
+//                                    vc.chosenPlan = self.txtFieldChosePlanNewGrailPayBankView.text
+//                                    vc.startDate = self.txtFieldSelectDateNewGrailPayBankView.text
+//                                    vc.selectedPaymentMethod = "NewGrailPayAccount"
+//                                    vc.isSavedForFuture = self.isSavedForFuture
+//                                    vc.grailPayAccountID = self.newGrailPayAccountID
+//                                    vc.selectedGrailPayAccountType = self.selectedNewGrailPayAccountType
+//                                    vc.selectedGrailPayAccountName = self.selectedNewGrailPayAccountName
+//                                    vc.amount = self.amount
+//                                    vc.billingInfo = fieldSection.billing
+//                                    vc.additionalInfo = fieldSection.additional
+//                                    vc.visibility = fieldSection.visibility
+//                                    vc.easyPayDelegate = self.easyPayDelegate
+//                                    self.navigationController?.pushViewController(vc, animated: true)
+//                                }
+//                                else {
+//                                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
+//                                    vc.billingInfoData = billingInfoData
+//                                    vc.request = self.request
+//                                    vc.chosenPlan = self.txtFieldChosePlanNewGrailPayBankView.text
+//                                    vc.startDate = self.txtFieldSelectDateNewGrailPayBankView.text
+//                                    vc.selectedPaymentMethod = "NewGrailPayAccount"
+//                                    vc.isSavedForFuture = self.isSavedForFuture
+//                                    vc.grailPayAccountID = self.newGrailPayAccountID
+//                                    vc.selectedGrailPayAccountType = self.selectedNewGrailPayAccountType
+//                                    vc.selectedGrailPayAccountName = self.selectedNewGrailPayAccountName
+//                                    vc.amount = self.amount
+//                                    vc.billingInfo = fieldSection.billing
+//                                    vc.additionalInfo = fieldSection.additional
+//                                    vc.visibility = fieldSection.visibility
+//                                    vc.easyPayDelegate = self.easyPayDelegate
+//                                    self.navigationController?.pushViewController(vc, animated: true)
+//                                }
+                                
+                                
+                                let showBilling = fieldSection.visibility.billing
+                                let showAdditional = fieldSection.visibility.additional
+
+                                if !showBilling && !showAdditional {
+                                    self.grailPayNewAccountChargeApi()
+                                }
+                                else if showBilling {
+                                    // Push to BillingInfoVC
                                     let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
                                     vc.billingInfoData = billingInfoData
                                     vc.request = self.request
@@ -2770,6 +3112,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                     self.navigationController?.pushViewController(vc, animated: true)
                                 }
                                 else {
+                                    // Push to AdditionalInfoVC
                                     let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
                                     vc.billingInfoData = billingInfoData
                                     vc.request = self.request
@@ -2787,6 +3130,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                     vc.easyPayDelegate = self.easyPayDelegate
                                     self.navigationController?.pushViewController(vc, animated: true)
                                 }
+                                
                             }
                         }
                     }
@@ -2809,7 +3153,51 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                 print("Billing Info Data: \(jsonDict)")
                                 
                                 // Redirect based on billing visibility
-                                if fieldSection.visibility.billing {
+//                                if fieldSection.visibility.billing {
+//                                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
+//                                    vc.billingInfoData = billingInfoData
+//                                    vc.request = self.request
+//                                    vc.chosenPlan = self.txtFieldChosePlanNewGrailPayBankView.text
+//                                    vc.startDate = self.txtFieldSelectDateNewGrailPayBankView.text
+//                                    vc.selectedPaymentMethod = "NewGrailPayAccount"
+//                                    vc.isSavedForFuture = self.isSavedForFuture
+//                                    vc.grailPayAccountID = self.newGrailPayAccountID
+//                                    vc.selectedGrailPayAccountType = self.selectedNewGrailPayAccountType
+//                                    vc.selectedGrailPayAccountName = self.selectedNewGrailPayAccountName
+//                                    vc.amount = self.amount
+//                                    vc.billingInfo = fieldSection.billing
+//                                    vc.additionalInfo = fieldSection.additional
+//                                    vc.visibility = fieldSection.visibility
+//                                    vc.easyPayDelegate = self.easyPayDelegate
+//                                    self.navigationController?.pushViewController(vc, animated: true)
+//                                }
+//                                else {
+//                                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
+//                                    vc.billingInfoData = billingInfoData
+//                                    vc.request = self.request
+//                                    vc.chosenPlan = self.txtFieldChosePlanNewGrailPayBankView.text
+//                                    vc.startDate = self.txtFieldSelectDateNewGrailPayBankView.text
+//                                    vc.selectedPaymentMethod = "NewGrailPayAccount"
+//                                    vc.isSavedForFuture = self.isSavedForFuture
+//                                    vc.grailPayAccountID = self.newGrailPayAccountID
+//                                    vc.selectedGrailPayAccountType = self.selectedNewGrailPayAccountType
+//                                    vc.selectedGrailPayAccountName = self.selectedNewGrailPayAccountName
+//                                    vc.amount = self.amount
+//                                    vc.billingInfo = fieldSection.billing
+//                                    vc.additionalInfo = fieldSection.additional
+//                                    vc.visibility = fieldSection.visibility
+//                                    vc.easyPayDelegate = self.easyPayDelegate
+//                                    self.navigationController?.pushViewController(vc, animated: true)
+//                                }
+                                
+                                let showBilling = fieldSection.visibility.billing
+                                let showAdditional = fieldSection.visibility.additional
+
+                                if !showBilling && !showAdditional {
+                                    self.grailPayNewAccountChargeApi()
+                                }
+                                else if showBilling {
+                                    // Push to BillingInfoVC
                                     let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
                                     vc.billingInfoData = billingInfoData
                                     vc.request = self.request
@@ -2828,6 +3216,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                     self.navigationController?.pushViewController(vc, animated: true)
                                 }
                                 else {
+                                    // Push to AdditionalInfoVC
                                     let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
                                     vc.billingInfoData = billingInfoData
                                     vc.request = self.request
@@ -2845,6 +3234,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                     vc.easyPayDelegate = self.easyPayDelegate
                                     self.navigationController?.pushViewController(vc, animated: true)
                                 }
+                                
                             }
                         }
                     }
@@ -2982,6 +3372,120 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "email": UserStoreSingleton.shared.merchantEmail ?? ""
         ]
         
+//        if let billingInfoData = request.billingInfoData {
+//            do {
+//                let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
+//
+//                // Process Billing Info if available and contains any non-empty value
+//                let billing = fieldSection.billing.filter { !($0.value.trimmingCharacters(in: .whitespaces).isEmpty) }
+//                if !billing.isEmpty {
+//                    var billingDict: [String: Any] = [:]
+//                    billing.forEach { billingDict[$0.name] = $0.value }
+//
+//                    if let address = billingDict["address"] as? String { params["address"] = address }
+//                    if let country = billingDict["country"] as? String { params["country"] = country }
+//                    if let state = billingDict["state"] as? String { params["state"] = state }
+//                    if let city = billingDict["city"] as? String { params["city"] = city }
+//                    if let postalCode = billingDict["postal_code"] as? String { params["zip"] = postalCode }
+//                }
+//
+//                // Process Additional Info if available and contains any non-empty value
+//                let additional = fieldSection.additional.filter { !($0.value.trimmingCharacters(in: .whitespaces).isEmpty) }
+//                if !additional.isEmpty {
+//                    var additionalDict: [String: Any] = [:]
+//                    additional.forEach { additionalDict[$0.name] = $0.value }
+//
+//                    if let desc = additionalDict["description"] as? String {
+//                        params["description"] = desc
+//                    }
+//
+//                    if let phone = additionalDict["phone_number"] as? String {
+//                        params["phone_number"] = phone
+//                    }
+//                    if let email = additionalDict["email"] as? String {
+//                        params["email"] = email
+//                    }
+//                    if let name = additionalDict["name"] as? String {
+//                        params["name"] = name
+//                    }
+//                }
+//
+//                // Set default description only if not already set
+//                if params["description"] == nil {
+//                    params["description"] = "Hosted payment checkout"
+//                }
+//
+//            } catch {
+//                print("Failed to decode FieldSection: \(error)")
+//                params["description"] = "Hosted payment checkout"
+//            }
+//        } else {
+//            params["description"] = "Hosted payment checkout"
+//        }
+
+        
+        if let billingInfoData = request.billingInfoData {
+            do {
+                let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
+
+                // Billing Info
+                let billing = fieldSection.billing
+                if !billing.isEmpty {
+                    var billingDict: [String: Any] = [:]
+                    billing.forEach { billingDict[$0.name] = $0.value }
+
+                    if let address = billingDict["address"] as? String, !address.isEmpty {
+                        params["address"] = address
+                    }
+                    if let country = billingDict["country"] as? String, !country.isEmpty {
+                        params["country"] = country
+                    }
+                    if let state = billingDict["state"] as? String, !state.isEmpty {
+                        params["state"] = state
+                    }
+                    if let city = billingDict["city"] as? String, !city.isEmpty {
+                        params["city"] = city
+                    }
+                    if let postalCode = billingDict["postal_code"] as? String, !postalCode.isEmpty {
+                        params["zip"] = postalCode
+                    }
+                }
+
+                // Additional Info
+                let additional = fieldSection.additional
+                if !additional.isEmpty {
+                    var additionalDict: [String: Any] = [:]
+                    additional.forEach { additionalDict[$0.name] = $0.value }
+
+                    if let desc = additionalDict["description"] as? String, !desc.isEmpty {
+                        params["description"] = desc
+                    } else {
+                        params["description"] = "Hosted payment checkout"
+                    }
+
+                    if let phone = additionalDict["phone_number"] as? String, !phone.isEmpty {
+                        params["phone_number"] = phone
+                    }
+                    if let email = additionalDict["email"] as? String, !email.isEmpty {
+                        params["email"] = email
+                    }
+                    if let name = additionalDict["name"] as? String, !name.isEmpty {
+                        params["name"] = name
+                    }
+                } else {
+                    // If no description in additional info, set default
+                    params["description"] = "Hosted payment checkout"
+                }
+
+            } catch {
+                print("Failed to decode FieldSection: \(error)")
+                params["description"] = "Hosted payment checkout"
+            }
+        } else {
+            // Fallback if billingInfoData is missing
+            params["description"] = "Hosted payment checkout"
+        }
+        
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
             if let recurringType = req.recurringStartDateType, recurringType == .custom {
@@ -3053,30 +3557,19 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         // Pass the selected payment method
                                         paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
-                                        // Pass billingInfo and additionalInfo
-                                        if let billingData = self.request.billingInfoData,
-                                           let billingInfoDict = try? JSONSerialization.jsonObject(with: billingData, options: []) as? [String: Any] {
+                                        // Pass billing info and additional info if available
+                                        if let billingInfoData = self.request.billingInfoData,
+                                           let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
                                             
-                                            // Extract main billing fields
-                                            let cleanBillingInfo: [String: Any] = [
-                                                "postal_code": billingInfoDict["postal_code"] ?? "",
-                                                "country": billingInfoDict["country"] ?? "",
-                                                "city": billingInfoDict["city"] ?? "",
-                                                "address": billingInfoDict["address"] ?? "",
-                                                "state": billingInfoDict["state"] ?? ""
-                                            ]
-                                            paymentDoneVC.billingInfo = cleanBillingInfo
+                                            paymentDoneVC.billingInfoData = fieldSection.billing
+                                            var billingDict: [String: Any] = [:]
+                                            fieldSection.billing.forEach { billingDict[$0.name] = $0.value }
+                                            paymentDoneVC.billingInfo = billingDict
                                             
-                                            // Extract additional_info
-                                            if let additional = billingInfoDict["additional_info"] as? [String: Any] {
-                                                let cleanAdditionalInfo: [String: Any] = [
-                                                    "email": additional["email"] ?? "",
-                                                    "phone_number": additional["phone_number"] ?? "",
-                                                    "name": additional["name"] ?? "",
-                                                    "country_code": additional["country_code"] ?? ""
-                                                ]
-                                                paymentDoneVC.additionalInfo = cleanAdditionalInfo
-                                            }
+                                            paymentDoneVC.additionalInfoData = fieldSection.additional
+                                            var additionalDict: [String: Any] = [:]
+                                            fieldSection.additional.forEach { additionalDict[$0.name] = $0.value }
+                                            paymentDoneVC.additionalInfo = additionalDict
                                         }
                                         self.navigationController?.pushViewController(paymentDoneVC, animated: true)
                                     }
@@ -3135,9 +3628,77 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "account_type": self.selectedNewGrailPayAccountType ?? "",
             "name": self.selectedNewGrailPayAccountName ?? "",
             "description": "payment checkout",
-            "customer_id": self.grailPayNewAccountCustomerID ?? ""
+            "customer_id": self.grailPayNewAccountCustomerID ?? "",
+            "save_account": isSavedForFuture ? 1 : 0
         ]
         
+        // Add is_default parameter if save_card is 1
+        if isSavedForFuture {
+            params["is_default"] = 1
+        }
+        
+        if let billingInfoData = request.billingInfoData {
+            do {
+                let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
+
+                // Billing Info
+                let billing = fieldSection.billing
+                if !billing.isEmpty {
+                    var billingDict: [String: Any] = [:]
+                    billing.forEach { billingDict[$0.name] = $0.value }
+
+                    if let address = billingDict["address"] as? String, !address.isEmpty {
+                        params["address"] = address
+                    }
+                    if let country = billingDict["country"] as? String, !country.isEmpty {
+                        params["country"] = country
+                    }
+                    if let state = billingDict["state"] as? String, !state.isEmpty {
+                        params["state"] = state
+                    }
+                    if let city = billingDict["city"] as? String, !city.isEmpty {
+                        params["city"] = city
+                    }
+                    if let postalCode = billingDict["postal_code"] as? String, !postalCode.isEmpty {
+                        params["zip"] = postalCode
+                    }
+                }
+
+                // Additional Info
+                let additional = fieldSection.additional
+                if !additional.isEmpty {
+                    var additionalDict: [String: Any] = [:]
+                    additional.forEach { additionalDict[$0.name] = $0.value }
+
+                    if let desc = additionalDict["description"] as? String, !desc.isEmpty {
+                        params["description"] = desc
+                    } else {
+                        params["description"] = "Hosted payment checkout"
+                    }
+
+                    if let phone = additionalDict["phone_number"] as? String, !phone.isEmpty {
+                        params["phone_number"] = phone
+                    }
+                    if let email = additionalDict["email"] as? String, !email.isEmpty {
+                        params["email"] = email
+                    }
+                    if let name = additionalDict["name"] as? String, !name.isEmpty {
+                        params["name"] = name
+                    }
+                } else {
+                    // If no description in additional info, set default
+                    params["description"] = "Hosted payment checkout"
+                }
+
+            } catch {
+                print("Failed to decode FieldSection: \(error)")
+                params["description"] = "Hosted payment checkout"
+            }
+        } else {
+            // Fallback if billingInfoData is missing
+            params["description"] = "Hosted payment checkout"
+        }
+        
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
             if let recurringType = req.recurringStartDateType, recurringType == .custom {
@@ -3209,30 +3770,45 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         // Pass the selected payment method
                                         paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
-                                        // Pass billingInfo and additionalInfo
-                                        if let billingData = self.request.billingInfoData,
-                                           let billingInfoDict = try? JSONSerialization.jsonObject(with: billingData, options: []) as? [String: Any] {
+//                                        // Pass billingInfo and additionalInfo
+//                                        if let billingData = self.request.billingInfoData,
+//                                           let billingInfoDict = try? JSONSerialization.jsonObject(with: billingData, options: []) as? [String: Any] {
+//                                            
+//                                            // Extract main billing fields
+//                                            let cleanBillingInfo: [String: Any] = [
+//                                                "postal_code": billingInfoDict["postal_code"] ?? "",
+//                                                "country": billingInfoDict["country"] ?? "",
+//                                                "city": billingInfoDict["city"] ?? "",
+//                                                "address": billingInfoDict["address"] ?? "",
+//                                                "state": billingInfoDict["state"] ?? ""
+//                                            ]
+//                                            paymentDoneVC.billingInfo = cleanBillingInfo
+//                                            
+//                                            // Extract additional_info
+//                                            if let additional = billingInfoDict["additional_info"] as? [String: Any] {
+//                                                let cleanAdditionalInfo: [String: Any] = [
+//                                                    "email": additional["email"] ?? "",
+//                                                    "phone_number": additional["phone_number"] ?? "",
+//                                                    "name": additional["name"] ?? "",
+//                                                    "country_code": additional["country_code"] ?? ""
+//                                                ]
+//                                                paymentDoneVC.additionalInfo = cleanAdditionalInfo
+//                                            }
+//                                        }
+                                        
+                                        // Pass billing info and additional info if available
+                                        if let billingInfoData = self.request.billingInfoData,
+                                           let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
                                             
-                                            // Extract main billing fields
-                                            let cleanBillingInfo: [String: Any] = [
-                                                "postal_code": billingInfoDict["postal_code"] ?? "",
-                                                "country": billingInfoDict["country"] ?? "",
-                                                "city": billingInfoDict["city"] ?? "",
-                                                "address": billingInfoDict["address"] ?? "",
-                                                "state": billingInfoDict["state"] ?? ""
-                                            ]
-                                            paymentDoneVC.billingInfo = cleanBillingInfo
+                                            paymentDoneVC.billingInfoData = fieldSection.billing
+                                            var billingDict: [String: Any] = [:]
+                                            fieldSection.billing.forEach { billingDict[$0.name] = $0.value }
+                                            paymentDoneVC.billingInfo = billingDict
                                             
-                                            // Extract additional_info
-                                            if let additional = billingInfoDict["additional_info"] as? [String: Any] {
-                                                let cleanAdditionalInfo: [String: Any] = [
-                                                    "email": additional["email"] ?? "",
-                                                    "phone_number": additional["phone_number"] ?? "",
-                                                    "name": additional["name"] ?? "",
-                                                    "country_code": additional["country_code"] ?? ""
-                                                ]
-                                                paymentDoneVC.additionalInfo = cleanAdditionalInfo
-                                            }
+                                            paymentDoneVC.additionalInfoData = fieldSection.additional
+                                            var additionalDict: [String: Any] = [:]
+                                            fieldSection.additional.forEach { additionalDict[$0.name] = $0.value }
+                                            paymentDoneVC.additionalInfo = additionalDict
                                         }
                                         self.navigationController?.pushViewController(paymentDoneVC, animated: true)
                                     }
@@ -3294,6 +3870,68 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "currency": "usd",
         ]
         
+        if let billingInfoData = request.billingInfoData {
+            do {
+                let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
+
+                // Billing Info
+                let billing = fieldSection.billing
+                if !billing.isEmpty {
+                    var billingDict: [String: Any] = [:]
+                    billing.forEach { billingDict[$0.name] = $0.value }
+
+                    if let address = billingDict["address"] as? String, !address.isEmpty {
+                        params["address"] = address
+                    }
+                    if let country = billingDict["country"] as? String, !country.isEmpty {
+                        params["country"] = country
+                    }
+                    if let state = billingDict["state"] as? String, !state.isEmpty {
+                        params["state"] = state
+                    }
+                    if let city = billingDict["city"] as? String, !city.isEmpty {
+                        params["city"] = city
+                    }
+                    if let postalCode = billingDict["postal_code"] as? String, !postalCode.isEmpty {
+                        params["zip"] = postalCode
+                    }
+                }
+
+                // Additional Info
+                let additional = fieldSection.additional
+                if !additional.isEmpty {
+                    var additionalDict: [String: Any] = [:]
+                    additional.forEach { additionalDict[$0.name] = $0.value }
+
+                    if let desc = additionalDict["description"] as? String, !desc.isEmpty {
+                        params["description"] = desc
+                    } else {
+                        params["description"] = "Hosted payment checkout"
+                    }
+
+                    if let phone = additionalDict["phone_number"] as? String, !phone.isEmpty {
+                        params["phone_number"] = phone
+                    }
+                    if let email = additionalDict["email"] as? String, !email.isEmpty {
+                        params["email"] = email
+                    }
+                    if let name = additionalDict["name"] as? String, !name.isEmpty {
+                        params["name"] = name
+                    }
+                } else {
+                    // If no description in additional info, set default
+                    params["description"] = "Hosted payment checkout"
+                }
+
+            } catch {
+                print("Failed to decode FieldSection: \(error)")
+                params["description"] = "Hosted payment checkout"
+            }
+        } else {
+            // Fallback if billingInfoData is missing
+            params["description"] = "Hosted payment checkout"
+        }
+        
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
             if let recurringType = req.recurringStartDateType, recurringType == .custom {
@@ -3365,6 +4003,21 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         // Pass the selected payment method
                                         paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate // Pass the delegate
+                                        
+                                        // Pass billing info and additional info if available
+                                        if let billingInfoData = self.request.billingInfoData,
+                                           let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
+                                            
+                                            paymentDoneVC.billingInfoData = fieldSection.billing
+                                            var billingDict: [String: Any] = [:]
+                                            fieldSection.billing.forEach { billingDict[$0.name] = $0.value }
+                                            paymentDoneVC.billingInfo = billingDict
+                                            
+                                            paymentDoneVC.additionalInfoData = fieldSection.additional
+                                            var additionalDict: [String: Any] = [:]
+                                            fieldSection.additional.forEach { additionalDict[$0.name] = $0.value }
+                                            paymentDoneVC.additionalInfo = additionalDict
+                                        }
                                         self.navigationController?.pushViewController(paymentDoneVC, animated: true)
                                     }
                                 }
@@ -3475,10 +4128,61 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             }
                         }
                         
-                        // Redirect based on billing visibility
-                        if fieldSection.visibility.billing {
+//                        // Redirect based on billing visibility
+//                        if fieldSection.visibility.billing {
+//                            let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
+//                            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
+//                            vc.userEmail = self.txtFieldEmailCardView.text
+//                            vc.amount = self.amount
+//                            vc.billingInfoData = billingInfoData
+//                            vc.billingInfo = fieldSection.billing
+//                            vc.additionalInfo = fieldSection.additional
+//                            vc.visibility = fieldSection.visibility
+//                            vc.easyPayDelegate = self.easyPayDelegate
+//                            self.navigationController?.pushViewController(vc, animated: true)
+//                        } else {
+//                            let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
+//                            vc.billingInfoData = billingInfoData
+//                            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
+//                            vc.userEmail = self.txtFieldEmailCardView.text
+//                            vc.billingInfo = fieldSection.billing
+//                            vc.additionalInfo = fieldSection.additional
+//                            vc.amount = self.amount
+//                            vc.visibility = fieldSection.visibility
+//                            vc.easyPayDelegate = self.easyPayDelegate
+//                            self.navigationController?.pushViewController(vc, animated: true)
+//                        }
+                        
+                        
+                        let showBilling = fieldSection.visibility.billing
+                        let showAdditional = fieldSection.visibility.additional
+
+                        if !showBilling && !showAdditional {
+                            if self.isSavedForFuture {
+                                self.navigateCardDataToEmailVerificationVC()
+                            } else {
+                                self.threeDSecurePaymentApi()
+                            }
+                        }
+                        else if showBilling {
+                            // Push to BillingInfoVC
                             let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
-                            vc.billingInfoData = billingInfoData
                             vc.cardNumber = cardNumber
                             vc.expiryDate = expiryDate
                             vc.cvv = cvv
@@ -3490,12 +4194,15 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             vc.startDate = self.txtFieldStartDateCard.text
                             vc.userEmail = self.txtFieldEmailCardView.text
                             vc.amount = self.amount
+                            vc.billingInfoData = billingInfoData
                             vc.billingInfo = fieldSection.billing
                             vc.additionalInfo = fieldSection.additional
                             vc.visibility = fieldSection.visibility
                             vc.easyPayDelegate = self.easyPayDelegate
                             self.navigationController?.pushViewController(vc, animated: true)
-                        } else {
+                        }
+                        else {
+                            // Push to AdditionalInfoVC
                             let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
                             vc.billingInfoData = billingInfoData
                             vc.cardNumber = cardNumber
@@ -3802,33 +4509,65 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     
     // Function to navigate to EmailVerificationVC
     func navigateCardDataToEmailVerificationVC() {
-        if let emailVerificationVC = storyboard?.instantiateViewController(withIdentifier: "EmailVerificationVC") as? EmailVerificationVC {
-            emailVerificationVC.cardNumber = self.cardNumberTextField.text
-            emailVerificationVC.expiryDate = self.cardExpiryTextField.text
-            emailVerificationVC.cvv = self.cardCvvTextField.text
-            emailVerificationVC.nameOnCard = self.cardNameTextField.text
-            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
+//        if let emailVerificationVC = storyboard?.instantiateViewController(withIdentifier: "EmailVerificationVC") as? EmailVerificationVC {
+        if let emailVerificationVC = storyboard?.instantiateViewController(withIdentifier: "OTPVerificationVC") as? OTPVerificationVC {
+            if let billingInfoData = request.billingInfoData {
+                do {
+                    let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
+                    emailVerificationVC.billingInfoData = billingInfoData
+                    emailVerificationVC.billingInfo = fieldSection.billing
+                    emailVerificationVC.additionalInfo = fieldSection.additional
+                    emailVerificationVC.visibility = fieldSection.visibility
+                    
+                    emailVerificationVC.cardNumber = self.cardNumberTextField.text
+                    emailVerificationVC.expiryDate = self.cardExpiryTextField.text
+                    emailVerificationVC.cvv = self.cardCvvTextField.text
+                    emailVerificationVC.nameOnCard = self.cardNameTextField.text
+                    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
+                    emailVerificationVC.userEmail = self.txtFieldEmailCardView.text
+                    emailVerificationVC.email = self.txtFieldEmailCardView.text
+                    emailVerificationVC.amount = self.amount
+                }
+                catch {
+                    print("Failed to decode billingInfoData: \(error.localizedDescription)")
+                }
+            }
+            
             self.navigationController?.pushViewController(emailVerificationVC, animated: true)
         }
     }
-    
+        
     func navigateBankDataToEmailVerificationVC() {
         if let emailVerificationVC = storyboard?.instantiateViewController(withIdentifier: "EmailVerificationVC") as? EmailVerificationVC {
-            emailVerificationVC.accountName = txtFieldAccountName.text
-            emailVerificationVC.routingNumber = txtFieldRoutingNumber.text
-            emailVerificationVC.accountType = txtFieldAccountType.text
-            emailVerificationVC.accountNumber = txtFieldAccountNumber.text
-            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
+            if let billingInfoData = request.billingInfoData {
+                do {
+                    let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
+                    emailVerificationVC.billingInfoData = billingInfoData
+                    emailVerificationVC.billingInfo = fieldSection.billing
+                    emailVerificationVC.additionalInfo = fieldSection.additional
+                    emailVerificationVC.visibility = fieldSection.visibility
+                    
+                    emailVerificationVC.accountName = txtFieldAccountName.text
+                    emailVerificationVC.routingNumber = txtFieldRoutingNumber.text
+                    emailVerificationVC.accountType = txtFieldAccountType.text
+                    emailVerificationVC.accountNumber = txtFieldAccountNumber.text
+                    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
+                    emailVerificationVC.userEmail = self.txtFieldEmailAccountView.text
+                }
+                catch {
+                    print("Failed to decode billingInfoData: \(error.localizedDescription)")
+                }
+            }
             self.navigationController?.pushViewController(emailVerificationVC, animated: true)
         }
     }
@@ -4076,11 +4815,54 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                 return
                             }
                             
-                            // Redirect based on billing visibility
-                            if fieldSection.visibility.billing {
-                                // Proceed with the Pay Now action
+//                            // Redirect based on billing visibility
+//                            if fieldSection.visibility.billing {
+//                                // Proceed with the Pay Now action
+//                                let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
+//                                // Pass the customer_id and account_id to BillingInfoVC
+//                                vc.customerID = self.selectedbankAccounts?.customer_id
+//                                vc.accountID = self.selectedbankAccounts?.account_id
+//                                vc.billingInfoData = billingInfoData
+//                                vc.isFrom = "SavedBank"
+//                                vc.selectedPaymentMethod = "Bank"
+//                                vc.chosenPlan = self.txtFieldSelectPlanSingleSavedBankView.text
+//                                vc.startDate = self.txtFieldSelectDateSingleSavedBankView.text
+//                                vc.request = self.request
+//                                vc.amount = self.amount
+//                                vc.billingInfo = fieldSection.billing
+//                                vc.additionalInfo = fieldSection.additional
+//                                vc.visibility = fieldSection.visibility
+//                                vc.easyPayDelegate = self.easyPayDelegate
+//                                self.navigationController?.pushViewController(vc, animated: true)
+//                            }
+//                            else {
+//                                let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
+//                                vc.customerID = self.selectedbankAccounts?.customer_id
+//                                vc.accountID = self.selectedbankAccounts?.account_id
+//                                vc.billingInfoData = billingInfoData
+//                                vc.isFrom = "SavedBank"
+//                                vc.selectedPaymentMethod = "Bank"
+//                                vc.chosenPlan = self.txtFieldSelectPlanSingleSavedBankView.text
+//                                vc.startDate = self.txtFieldSelectDateSingleSavedBankView.text
+//                                vc.request = self.request
+//                                vc.amount = self.amount
+//                                vc.billingInfo = fieldSection.billing
+//                                vc.additionalInfo = fieldSection.additional
+//                                vc.visibility = fieldSection.visibility
+//                                vc.easyPayDelegate = self.easyPayDelegate
+//                                self.navigationController?.pushViewController(vc, animated: true)
+//                            }
+                            
+                            
+                            let showBilling = fieldSection.visibility.billing
+                            let showAdditional = fieldSection.visibility.additional
+
+                            if !showBilling && !showAdditional {
+                                self.grailPayAaccountChargeSingleSavedAccountApi()
+                            }
+                            else if showBilling {
+                                // Push to BillingInfoVC
                                 let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
-                                // Pass the customer_id and account_id to BillingInfoVC
                                 vc.customerID = self.selectedbankAccounts?.customer_id
                                 vc.accountID = self.selectedbankAccounts?.account_id
                                 vc.billingInfoData = billingInfoData
@@ -4097,6 +4879,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                 self.navigationController?.pushViewController(vc, animated: true)
                             }
                             else {
+                                // Push to AdditionalInfoVC
                                 let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
                                 vc.customerID = self.selectedbankAccounts?.customer_id
                                 vc.accountID = self.selectedbankAccounts?.account_id
@@ -4113,6 +4896,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                 vc.easyPayDelegate = self.easyPayDelegate
                                 self.navigationController?.pushViewController(vc, animated: true)
                             }
+                            
                         }
                     }
                 }
@@ -4452,13 +5236,44 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     
     //MARK: - Card Scan Button Action
     @IBAction func actionButtonScanCard(_ sender: UIButton) {
-       
-    }
-    
-    private func showLicenseErrorAlert(message: String) {
-        let alert = UIAlertController(title: "License Error", message: message, preferredStyle: .alert)
-        alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))
-        self.present(alert, animated: true, completion: nil)
+//        // Validate BlinkCard License
+//        let licenseErrorMessage = BlinkCardHelper.setupLicense()
+//        if !licenseErrorMessage.isEmpty {
+//            // Show alert if the license is invalid or expired
+//            showLicenseErrorAlert(message: licenseErrorMessage)
+//            return
+//        }
+//        
+//        // Proceed with card scanning if the license is valid
+//        blinkCardRecognizer = MBCBlinkCardRecognizer()
+//        blinkCardRecognizer.returnFullDocumentImage = true
+//        
+//        let recognizerList = [blinkCardRecognizer!]
+//        let recognizerCollection = MBCRecognizerCollection(recognizers: recognizerList)
+//        
+//        let customOverlayViewController: CustomOverlay = CustomOverlay.initFromStoryboard()
+//        
+//        // Reconfigure recognizers with the overlay
+//        customOverlayViewController.reconfigureRecognizers(recognizerCollection)
+//        
+//        // Create the recognizer runner view controller with custom overlay
+//        guard let recognizerRunnerViewController =
+//                MBCViewControllerFactory.recognizerRunnerViewController(withOverlayViewController: customOverlayViewController) else {
+//            showLicenseErrorAlert(message: "Failed to initialize the recognizer view controller.")
+//            return
+//        }
+//        
+//        customOverlayViewController.delegate = self
+//        recognizerRunnerViewController.modalPresentationStyle = .fullScreen
+//        
+//        // Present the recognizer runner view controller
+//        self.present(recognizerRunnerViewController, animated: true, completion: nil)
+    }
+    
+    private func showLicenseErrorAlert(message: String) {
+        let alert = UIAlertController(title: "License Error", message: message, preferredStyle: .alert)
+        alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))
+        self.present(alert, animated: true, completion: nil)
     }
     
     //MARK: - Send OTP Email Verification Api
@@ -5170,6 +5985,210 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         task.resume()
     }
     
+    //MARK: - Credit Card Charge Api from Saved cards if Billing info exist but not go to billing and additonal page
+    func paymentIntentFromShowCardApi() {
+        showLoadingIndicator()
+        
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.charges.path()
+        
+        guard let serviceURL = URL(string: fullURL) else {
+            print("Invalid URL")
+            hideLoadingIndicator()
+            return
+        }
+        
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "POST"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        
+        let token = UserStoreSingleton.shared.clientToken
+        print("Setting clientToken header: \(token ?? "None")")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        
+        var params: [String: Any] = [
+            "currency": "usd",
+            "payment_method": "card",
+            "save_card": 0,
+            "customer" : selectedCard?.customerId ?? "",
+            "customer_id" : selectedCard?.customerId ?? "",
+            "card_id" : selectedCard?.cardId ?? "",
+            "cvc" : txtFieldCVVSingleSavedCard.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? "",
+        ]
+        
+        if let billingInfoData = request.billingInfoData {
+            do {
+                let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
+
+                // Billing Info
+                let billing = fieldSection.billing
+                if !billing.isEmpty {
+                    var billingDict: [String: Any] = [:]
+                    billing.forEach { billingDict[$0.name] = $0.value }
+
+                    if let address = billingDict["address"] as? String, !address.isEmpty {
+                        params["address"] = address
+                    }
+                    if let country = billingDict["country"] as? String, !country.isEmpty {
+                        params["country"] = country
+                    }
+                    if let state = billingDict["state"] as? String, !state.isEmpty {
+                        params["state"] = state
+                    }
+                    if let city = billingDict["city"] as? String, !city.isEmpty {
+                        params["city"] = city
+                    }
+                    if let postalCode = billingDict["postal_code"] as? String, !postalCode.isEmpty {
+                        params["zip"] = postalCode
+                    }
+                }
+
+                // Additional Info
+                let additional = fieldSection.additional
+                if !additional.isEmpty {
+                    var additionalDict: [String: Any] = [:]
+                    additional.forEach { additionalDict[$0.name] = $0.value }
+
+                    if let desc = additionalDict["description"] as? String, !desc.isEmpty {
+                        params["description"] = desc
+                    } else {
+                        params["description"] = "Hosted payment checkout"
+                    }
+
+                    if let phone = additionalDict["phone_number"] as? String, !phone.isEmpty {
+                        params["phone_number"] = phone
+                    }
+                    if let email = additionalDict["email"] as? String, !email.isEmpty {
+                        params["email"] = email
+                    }
+                    if let name = additionalDict["name"] as? String, !name.isEmpty {
+                        params["name"] = name
+                    }
+                } else {
+                    // If no description in additional info, set default
+                    params["description"] = "Hosted payment checkout"
+                }
+
+            } catch {
+                print("Failed to decode FieldSection: \(error)")
+                params["description"] = "Hosted payment checkout"
+            }
+        } else {
+            // Fallback if billingInfoData is missing
+            params["description"] = "Hosted payment checkout"
+        }
+        
+        // Add these if recurring is enabled
+        if let req = request, req.is_recurring == true {
+            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                // Only send start_date if type is .custom and field is not empty
+                if let startDateText = txtFieldSelectDateSingleSavedCard?.text, !startDateText.isEmpty {
+                    let inputFormatter = DateFormatter()
+                    inputFormatter.dateFormat = "dd/MM/yyyy"
+                    
+                    let outputFormatter = DateFormatter()
+                    outputFormatter.dateFormat = "MM/dd/yyyy"
+                    
+                    if let date = inputFormatter.date(from: startDateText) {
+                        let apiFormattedDate = outputFormatter.string(from: date)
+                        params["start_date"] = apiFormattedDate
+                    } else {
+                        print("Invalid date format in startDateText")
+                    }
+                }
+            }
+            
+            params["interval"] = txtFieldSelectPlanSingleSavedCard.text.lowercased()
+        }
+        
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+            uRLRequest.httpBody = jsonData
+            if let jsonString = String(data: jsonData, encoding: .utf8) {
+                print("JSON Payload: \(jsonString)")
+            }
+        } catch let error {
+            print("Error creating JSON data: \(error)")
+            hideLoadingIndicator()
+            return
+        }
+        
+        let session = URLSession.shared
+        let task = session.dataTask(with: uRLRequest) { (serviceData, serviceResponse, error) in
+            
+            DispatchQueue.main.async {
+                self.hideLoadingIndicator() // Stop loader when response is received
+            }
+            
+            if let error = error {
+                print("Error: \(error.localizedDescription)")
+                return
+            }
+            
+            guard let httpResponse = serviceResponse as? HTTPURLResponse else {
+                print("Invalid response")
+                return
+            }
+            
+            if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
+                if let data = serviceData {
+                    do {
+                        if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
+                            print("Response Data: \(responseObject)")
+                            
+                            // Check if status is 0 and handle the error
+                            if let status = responseObject["status"] as? Int, status == 0 {
+                                let errorMessage = responseObject["message"] as? String ?? "Unknown error"
+                                self.presentPaymentErrorVC(errorMessage: errorMessage)
+                            } else {
+                                DispatchQueue.main.async {
+                                    if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
+                                        paymentDoneVC.chargeData = responseObject
+                                        paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
+                                        paymentDoneVC.easyPayDelegate = self.easyPayDelegate
+                                        // Pass billing info and additional info if available
+                                        if let billingInfoData = self.request.billingInfoData,
+                                           let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
+                                            
+                                            // Filter billing info: only include non-empty values
+                                            let filteredBilling = fieldSection.billing.filter { !($0.value.trimmingCharacters(in: .whitespaces).isEmpty) }
+                                            paymentDoneVC.billingInfoData = filteredBilling
+                                            var billingDict: [String: Any] = [:]
+                                            filteredBilling.forEach { billingDict[$0.name] = $0.value }
+                                            paymentDoneVC.billingInfo = billingDict
+
+                                            // Filter additional info: only include non-empty values
+                                            let filteredAdditional = fieldSection.additional.filter { !($0.value.trimmingCharacters(in: .whitespaces).isEmpty) }
+                                            paymentDoneVC.additionalInfoData = filteredAdditional
+                                            var additionalDict: [String: Any] = [:]
+                                            filteredAdditional.forEach { additionalDict[$0.name] = $0.value }
+                                            paymentDoneVC.additionalInfo = additionalDict
+                                        }
+                                        self.navigationController?.pushViewController(paymentDoneVC, animated: true)
+                                    }
+                                }
+                            }
+                        } else {
+                            self.presentPaymentErrorVC(errorMessage: "Invalid JSON format")
+                        }
+                    } catch let jsonError {
+                        self.presentPaymentErrorVC(errorMessage: "Error parsing JSON: \(jsonError)")
+                    }
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "No data received")
+                }
+            } else {
+                if let data = serviceData,
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let message = responseObj["message"] as? String {
+                    self.presentPaymentErrorVC(errorMessage: message)
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                }
+            }
+        }
+        task.resume()
+    }
+    
     //MARK: - Credit Card Charge Api from Add new cards If Billing info is nil and Logged in.
     func paymentIntentFromAddNewCardApi(customerId: String?) {
         // Get the text fields from the selected cell and trim whitespace
@@ -6811,6 +7830,68 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "tokenize": request.tokenOnly ?? false,
         ]
         
+        if let billingInfoData = request.billingInfoData {
+            do {
+                let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
+
+                // Billing Info
+                let billing = fieldSection.billing
+                if !billing.isEmpty {
+                    var billingDict: [String: Any] = [:]
+                    billing.forEach { billingDict[$0.name] = $0.value }
+
+                    if let address = billingDict["address"] as? String, !address.isEmpty {
+                        params["address"] = address
+                    }
+                    if let country = billingDict["country"] as? String, !country.isEmpty {
+                        params["country"] = country
+                    }
+                    if let state = billingDict["state"] as? String, !state.isEmpty {
+                        params["state"] = state
+                    }
+                    if let city = billingDict["city"] as? String, !city.isEmpty {
+                        params["city"] = city
+                    }
+                    if let postalCode = billingDict["postal_code"] as? String, !postalCode.isEmpty {
+                        params["zip"] = postalCode
+                    }
+                }
+
+                // Additional Info
+                let additional = fieldSection.additional
+                if !additional.isEmpty {
+                    var additionalDict: [String: Any] = [:]
+                    additional.forEach { additionalDict[$0.name] = $0.value }
+
+                    if let desc = additionalDict["description"] as? String, !desc.isEmpty {
+                        params["description"] = desc
+                    } else {
+                        params["description"] = "Hosted payment checkout"
+                    }
+
+                    if let phone = additionalDict["phone_number"] as? String, !phone.isEmpty {
+                        params["phone_number"] = phone
+                    }
+                    if let email = additionalDict["email"] as? String, !email.isEmpty {
+                        params["email"] = email
+                    }
+                    if let name = additionalDict["name"] as? String, !name.isEmpty {
+                        params["name"] = name
+                    }
+                } else {
+                    // If no description in additional info, set default
+                    params["description"] = "Hosted payment checkout"
+                }
+
+            } catch {
+                print("Failed to decode FieldSection: \(error)")
+                params["description"] = "Hosted payment checkout"
+            }
+        } else {
+            // Fallback if billingInfoData is missing
+            params["description"] = "Hosted payment checkout"
+        }
+        
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
             if let recurringType = req.recurringStartDateType, recurringType == .custom {
@@ -6884,30 +7965,23 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         paymentDoneVC.chargeData = responseObject
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
                                         paymentDoneVC.amount = self.amount
-                                        // Pass billingInfo and additionalInfo
-                                        if let billingData = self.request.billingInfoData,
-                                           let billingInfoDict = try? JSONSerialization.jsonObject(with: billingData, options: []) as? [String: Any] {
+                                        // Pass billing info and additional info if available
+                                        if let billingInfoData = self.request.billingInfoData,
+                                           let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
                                             
-                                            // Extract main billing fields
-                                            let cleanBillingInfo: [String: Any] = [
-                                                "postal_code": billingInfoDict["postal_code"] ?? "",
-                                                "country": billingInfoDict["country"] ?? "",
-                                                "city": billingInfoDict["city"] ?? "",
-                                                "address": billingInfoDict["address"] ?? "",
-                                                "state": billingInfoDict["state"] ?? ""
-                                            ]
-                                            paymentDoneVC.billingInfo = cleanBillingInfo
-                                            
-                                            // Extract additional_info
-                                            if let additional = billingInfoDict["additional_info"] as? [String: Any] {
-                                                let cleanAdditionalInfo: [String: Any] = [
-                                                    "email": additional["email"] ?? "",
-                                                    "phone_number": additional["phone_number"] ?? "",
-                                                    "name": additional["name"] ?? "",
-                                                    "country_code": additional["country_code"] ?? ""
-                                                ]
-                                                paymentDoneVC.additionalInfo = cleanAdditionalInfo
-                                            }
+                                            // Filter billing info: only include non-empty values
+                                            let filteredBilling = fieldSection.billing.filter { !($0.value.trimmingCharacters(in: .whitespaces).isEmpty) }
+                                            paymentDoneVC.billingInfoData = filteredBilling
+                                            var billingDict: [String: Any] = [:]
+                                            filteredBilling.forEach { billingDict[$0.name] = $0.value }
+                                            paymentDoneVC.billingInfo = billingDict
+
+                                            // Filter additional info: only include non-empty values
+                                            let filteredAdditional = fieldSection.additional.filter { !($0.value.trimmingCharacters(in: .whitespaces).isEmpty) }
+                                            paymentDoneVC.additionalInfoData = filteredAdditional
+                                            var additionalDict: [String: Any] = [:]
+                                            filteredAdditional.forEach { additionalDict[$0.name] = $0.value }
+                                            paymentDoneVC.additionalInfo = additionalDict
                                         }
                                         self.navigationController?.pushViewController(paymentDoneVC, animated: true)
                                     }
@@ -7048,6 +8122,68 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             params["is_default"] = "1"
         }
         
+        if let billingInfoData = request.billingInfoData {
+            do {
+                let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
+
+                // Billing Info
+                let billing = fieldSection.billing
+                if !billing.isEmpty {
+                    var billingDict: [String: Any] = [:]
+                    billing.forEach { billingDict[$0.name] = $0.value }
+
+                    if let address = billingDict["address"] as? String, !address.isEmpty {
+                        params["address"] = address
+                    }
+                    if let country = billingDict["country"] as? String, !country.isEmpty {
+                        params["country"] = country
+                    }
+                    if let state = billingDict["state"] as? String, !state.isEmpty {
+                        params["state"] = state
+                    }
+                    if let city = billingDict["city"] as? String, !city.isEmpty {
+                        params["city"] = city
+                    }
+                    if let postalCode = billingDict["postal_code"] as? String, !postalCode.isEmpty {
+                        params["zip"] = postalCode
+                    }
+                }
+
+                // Additional Info
+                let additional = fieldSection.additional
+                if !additional.isEmpty {
+                    var additionalDict: [String: Any] = [:]
+                    additional.forEach { additionalDict[$0.name] = $0.value }
+
+                    if let desc = additionalDict["description"] as? String, !desc.isEmpty {
+                        params["description"] = desc
+                    } else {
+                        params["description"] = "Hosted payment checkout"
+                    }
+
+                    if let phone = additionalDict["phone_number"] as? String, !phone.isEmpty {
+                        params["phone_number"] = phone
+                    }
+                    if let email = additionalDict["email"] as? String, !email.isEmpty {
+                        params["email"] = email
+                    }
+                    if let name = additionalDict["name"] as? String, !name.isEmpty {
+                        params["name"] = name
+                    }
+                } else {
+                    // If no description in additional info, set default
+                    params["description"] = "Hosted payment checkout"
+                }
+
+            } catch {
+                print("Failed to decode FieldSection: \(error)")
+                params["description"] = "Hosted payment checkout"
+            }
+        } else {
+            // Fallback if billingInfoData is missing
+            params["description"] = "Hosted payment checkout"
+        }
+        
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
             if let recurringType = req.recurringStartDateType, recurringType == .custom {
@@ -7119,30 +8255,23 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         paymentDoneVC.chargeData = responseObject
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
                                         paymentDoneVC.amount = self.amount
-                                        // Pass billingInfo and additionalInfo
-                                        if let billingData = self.request.billingInfoData,
-                                           let billingInfoDict = try? JSONSerialization.jsonObject(with: billingData, options: []) as? [String: Any] {
+                                        // Pass billing info and additional info if available
+                                        if let billingInfoData = self.request.billingInfoData,
+                                           let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
                                             
-                                            // Extract main billing fields
-                                            let cleanBillingInfo: [String: Any] = [
-                                                "postal_code": billingInfoDict["postal_code"] ?? "",
-                                                "country": billingInfoDict["country"] ?? "",
-                                                "city": billingInfoDict["city"] ?? "",
-                                                "address": billingInfoDict["address"] ?? "",
-                                                "state": billingInfoDict["state"] ?? ""
-                                            ]
-                                            paymentDoneVC.billingInfo = cleanBillingInfo
-                                            
-                                            // Extract additional_info
-                                            if let additional = billingInfoDict["additional_info"] as? [String: Any] {
-                                                let cleanAdditionalInfo: [String: Any] = [
-                                                    "email": additional["email"] ?? "",
-                                                    "phone_number": additional["phone_number"] ?? "",
-                                                    "name": additional["name"] ?? "",
-                                                    "country_code": additional["country_code"] ?? ""
-                                                ]
-                                                paymentDoneVC.additionalInfo = cleanAdditionalInfo
-                                            }
+                                            // Filter billing info: only include non-empty values
+                                            let filteredBilling = fieldSection.billing.filter { !($0.value.trimmingCharacters(in: .whitespaces).isEmpty) }
+                                            paymentDoneVC.billingInfoData = filteredBilling
+                                            var billingDict: [String: Any] = [:]
+                                            filteredBilling.forEach { billingDict[$0.name] = $0.value }
+                                            paymentDoneVC.billingInfo = billingDict
+
+                                            // Filter additional info: only include non-empty values
+                                            let filteredAdditional = fieldSection.additional.filter { !($0.value.trimmingCharacters(in: .whitespaces).isEmpty) }
+                                            paymentDoneVC.additionalInfoData = filteredAdditional
+                                            var additionalDict: [String: Any] = [:]
+                                            filteredAdditional.forEach { additionalDict[$0.name] = $0.value }
+                                            paymentDoneVC.additionalInfo = additionalDict
                                         }
                                         self.navigationController?.pushViewController(paymentDoneVC, animated: true)
                                     }
@@ -8354,6 +9483,15 @@ extension PaymentInfoVC: UITextFieldDelegate {
                 viewTxtFieldConfirmNewAccountView.layer.borderColor = UIColor._1757D9.withAlphaComponent(1).cgColor
             }
         }
+        else if textField == txtFieldEmailGrailPayView.textField {
+            if let primaryBtnFontColor = UserStoreSingleton.shared.primary_btn_bg_col,
+               let uiColor = UIColor(hex: primaryBtnFontColor) {
+                viewTxtFieldEmailGrailPayView.layer.borderColor = uiColor.cgColor
+            } else {
+                viewTxtFieldEmailGrailPayView.layer.borderColor = UIColor._1757D9.withAlphaComponent(1).cgColor
+            }
+        }
+        
     }
     
     func textFieldDidEndEditing(_ textField: UITextField) {
@@ -8561,6 +9699,14 @@ extension PaymentInfoVC: UITextFieldDelegate {
                 viewTxtFieldConfirmNewAccountView.layer.borderColor = UIColor.systemGray.cgColor
             }
         }
+        else if textField == txtFieldEmailGrailPayView.textField {
+            if let bodyBackgroundColor = UserStoreSingleton.shared.secondary_font_col,
+               let borderColor = UIColor(hex: bodyBackgroundColor) {
+                viewTxtFieldEmailGrailPayView.layer.borderColor = borderColor.cgColor
+            } else {
+                viewTxtFieldEmailGrailPayView.layer.borderColor = UIColor.systemGray.cgColor
+            }
+        }
     }
     
 }