@jimrising/easymerchantsdk-react-native 2.5.2 → 2.5.3

package/ios/Pods/ViewControllers/OTPVerificationVC.swift

@@ -79,6 +79,8 @@ class OTPVerificationVC: BaseVC {
     
     var isSavedNewAccount: Bool?
     var isFrom = String()
+    /// After OTP success for manual ACH: "direct" = charge here, "billing" = push BillingInfoVC, "additional" = push AdditionalInfoVC
+    var afterOTPFlow: String?
     
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -429,22 +431,37 @@ class OTPVerificationVC: BaseVC {
                                 }
                             }
                             else if self.selectedPaymentMethod == "Bank" {
-                                
-                                if let dataSection = responseObject["data"] as? [String: Any],
-                                   let innerData = dataSection["data"] as? [String: Any],
-                                   let customerId = innerData["customer_id"] as? String {
-                                    if self.billingInfoData == nil {
-                                        self.accountChargeWithSavedAccountApi(customerId: customerId)
+                                let flow = self.afterOTPFlow ?? "direct"
+                                let customerId = (responseObject["data"] as? [String: Any]).flatMap { $0["data"] as? [String: Any] }.flatMap { $0["customer_id"] as? String }
+                                if flow == "billing" {
+                                    if let id = customerId {
+                                        UserStoreSingleton.shared.customerId = id
                                     }
-                                    else {
-                                        self.accountChargeApi(customerId: customerId)
+                                    DispatchQueue.main.async {
+                                        self.pushBillingInfoVCAfterOTP()
                                     }
-                                } else {
-                                    if self.billingInfoData == nil {
-                                        self.accountChargeWithSavedAccountApi(customerId: nil)
+                                } else if flow == "additional" {
+                                    if let id = customerId {
+                                        UserStoreSingleton.shared.customerId = id
                                     }
-                                    else {
-                                        self.accountChargeApi(customerId: nil)
+                                    DispatchQueue.main.async {
+                                        self.pushAdditionalInfoVCAfterOTP()
+                                    }
+                                } else {
+                                    if let customerId = customerId {
+                                        if self.billingInfoData == nil {
+                                            self.accountChargeWithSavedAccountApi(customerId: customerId)
+                                        }
+                                        else {
+                                            self.accountChargeApi(customerId: customerId)
+                                        }
+                                    } else {
+                                        if self.billingInfoData == nil {
+                                            self.accountChargeWithSavedAccountApi(customerId: nil)
+                                        }
+                                        else {
+                                            self.accountChargeApi(customerId: nil)
+                                        }
                                     }
                                 }
                             }
@@ -939,6 +956,50 @@ class OTPVerificationVC: BaseVC {
         }
     }
     
+    /// Push BillingInfoVC after OTP success for manual ACH (save account) when billing is visible.
+    private func pushBillingInfoVCAfterOTP() {
+        guard let vc = storyboard?.instantiateViewController(withIdentifier: "BillingInfoVC") as? BillingInfoVC else { return }
+        vc.accountName = accountName
+        vc.routingNumber = routingNumber
+        vc.accountType = accountType
+        vc.accountNumber = accountNumber
+        vc.billingInfoData = billingInfoData
+        vc.selectedPaymentMethod = "Bank"
+        vc.isFrom = "AddNewAccountWithSave"
+        vc.isSavedNewAccount = true
+        vc.chosenPlan = chosenPlan
+        vc.startDate = startDate
+        vc.request = request
+        vc.amount = amount ?? 0
+        vc.billingInfo = billingInfo
+        vc.additionalInfo = additionalInfo
+        vc.visibility = visibility
+        vc.easyPayDelegate = easyPayDelegate
+        navigationController?.pushViewController(vc, animated: true)
+    }
+    
+    /// Push AdditionalInfoVC after OTP success for manual ACH (save account) when additional is visible.
+    private func pushAdditionalInfoVCAfterOTP() {
+        guard let vc = storyboard?.instantiateViewController(withIdentifier: "AdditionalInfoVC") as? AdditionalInfoVC else { return }
+        vc.accountName = accountName
+        vc.routingNumber = routingNumber
+        vc.accountType = accountType
+        vc.accountNumber = accountNumber
+        vc.billingInfoData = billingInfoData
+        vc.selectedPaymentMethod = "Bank"
+        vc.isFrom = "AddNewAccountWithSave"
+        vc.isSavedNewAccount = true
+        vc.chosenPlan = chosenPlan
+        vc.startDate = startDate
+        vc.request = request
+        vc.amount = amount ?? 0
+        vc.billingInfo = billingInfo
+        vc.additionalInfo = additionalInfo
+        vc.visibility = visibility
+        vc.easyPayDelegate = easyPayDelegate
+        navigationController?.pushViewController(vc, animated: true)
+    }
+    
     //MARK: - Account Charge Api
     func accountChargeApi(customerId: String?) {
         showLoadingIndicator()