@jimrising/easymerchantsdk-react-native 2.0.7 → 2.0.9

package/ios/Models/Request.swift

@@ -148,8 +148,8 @@ public struct FieldSection: Codable {
 public final class Request: NSObject {
     public let amount: Double?
     public let currency: String?
-    public let billingInfoData: Data?
-    public let themeConfiguration: ThemeConfiguration?
+    public let fields: Data?
+    public let appearanceSettings: ThemeConfiguration?
     public let selectedPaymentMethods: [PaymentMethod]
     public let tokenOnly: Bool?
     public let saveCard: Bool?
@@ -177,9 +177,9 @@ public final class Request: NSObject {
     public init(
         amount: Double? = nil,
         currency: String? = nil,
-        billingInfoData: Data? = nil,
+        fields: Data? = nil,
         paymentMethods: [PaymentMethod]? = nil,
-        themeConfiguration: ThemeConfiguration? = nil,
+        appearanceSettings: ThemeConfiguration? = nil,
         tokenOnly: Bool = false,
         saveCard: Bool = false,
         saveAccount: Bool = false,
@@ -225,8 +225,8 @@ public final class Request: NSObject {
         
         self.amount = amount
         self.currency = currency
-        self.billingInfoData = billingInfoData
-        self.themeConfiguration = themeConfiguration
+        self.fields = fields
+        self.appearanceSettings = appearanceSettings
         self.tokenOnly = tokenOnly
         self.saveCard = saveCard
         self.saveAccount = saveAccount
@@ -273,7 +273,7 @@ public final class Request: NSObject {
             self.selectedPaymentMethods = savedMethods.compactMap { PaymentMethod(rawValue: $0) }
         }
         // ✅ Save theme configuration in UserStoreSingleton only if themeConfiguration is not nil or empty
-        if let themeConfig = themeConfiguration {
+        if let themeConfig = appearanceSettings {
             UserStoreSingleton.shared.body_bg_col = themeConfig.bodyBackgroundColor
             UserStoreSingleton.shared.container_bg_col = themeConfig.containerBackgroundColor
             UserStoreSingleton.shared.primary_font_col = themeConfig.primaryFontColor
@@ -624,7 +624,7 @@ public final class Request: NSObject {
                                 print("Saved payment methods: \(paymentMethodNames)")
                             }
                             
-                            if self.themeConfiguration == nil, let appearanceSettings = dataObject["apperance_settings"] as? [String: Any] {
+                            if self.appearanceSettings == nil, let appearanceSettings = dataObject["apperance_settings"] as? [String: Any] {
                                 UserStoreSingleton.shared.body_bg_col = appearanceSettings["body_bg_col"] as? String
                                 UserStoreSingleton.shared.border_radious = appearanceSettings["border_radious"] as? String
                                 UserStoreSingleton.shared.container_bg_col = appearanceSettings["container_bg_col"] as? String

package/ios/Pods/ViewControllers/AdditionalInfoVC.swift

@@ -318,80 +318,130 @@ class AdditionalInfoVC: BaseVC {
             return
         }
         
+        // MARK: - Flow Based on Conditions
+//        if isSavedForFuture {
+//            if selectedPaymentMethod == "NewGrailPayAccount" {
+//                // Only call API, do NOT navigate
+//                grailPayAccountChargeApi(customerId: UserStoreSingleton.shared.customerId)
+//            } else {
+//                // Navigate to EmailVerificationVC for all other payment methods
+//                if let emailVerificationVC = self.storyboard?.instantiateViewController(withIdentifier: "OTPVerificationVC") as? OTPVerificationVC {
+//                    
+//                    emailVerificationVC.billingInfoData = billingInfoData
+//                    emailVerificationVC.selectedPaymentMethod = selectedPaymentMethod
+//                    emailVerificationVC.easyPayDelegate = easyPayDelegate
+//                    emailVerificationVC.request = request
+//                    emailVerificationVC.chosenPlan = chosenPlan
+//                    emailVerificationVC.startDate = startDate
+//                    emailVerificationVC.userEmail = userEmail
+//                    emailVerificationVC.billingInfo = fieldSection?.billing
+//                    emailVerificationVC.additionalInfo = fieldSection?.additional
+//                    emailVerificationVC.visibility = fieldSection?.visibility
+//                    emailVerificationVC.amount = amount
+//                    emailVerificationVC.email = userEmail
+//                    
+//                    // Payment method-specific data
+//                    switch selectedPaymentMethod {
+//                    case "Card":
+//                        emailVerificationVC.cardNumber = cardNumber
+//                        emailVerificationVC.expiryDate = expiryDate
+//                        emailVerificationVC.cvv = cvv
+//                        emailVerificationVC.nameOnCard = nameOnCard
+//                        
+//                    case "Bank":
+//                        emailVerificationVC.accountName = accountName
+//                        emailVerificationVC.routingNumber = routingNumber
+//                        emailVerificationVC.accountType = accountType
+//                        emailVerificationVC.accountNumber = accountNumber
+//                        
+//                    case "GrailPay":
+//                        emailVerificationVC.grailPayAccountID = grailPayAccountID
+//                        emailVerificationVC.selectedGrailPayAccountType = selectedGrailPayAccountType
+//                        emailVerificationVC.selectedGrailPayAccountName = selectedGrailPayAccountName
+//                        emailVerificationVC.isSavedForFuture = true
+//                        
+//                    default:
+//                        break
+//                    }
+//                    
+//                    navigationController?.pushViewController(emailVerificationVC, animated: true)
+//                }
+//            }
+//        }
+        
         // MARK: - Flow Based on Conditions
         if isSavedForFuture {
-            if selectedPaymentMethod == "NewGrailPayAccount" {
-                // Only call API, do NOT navigate
-                grailPayAccountChargeApi(customerId: UserStoreSingleton.shared.customerId)
-            } else {
-                // Navigate to EmailVerificationVC for all other payment methods
-                // if let emailVerificationVC = self.storyboard?.instantiateViewController(withIdentifier: "EmailVerificationVC") as? EmailVerificationVC {
-                if let emailVerificationVC = self.storyboard?.instantiateViewController(withIdentifier: "OTPVerificationVC") as? OTPVerificationVC {
+            // ✅ If logged in → Call API directly, no navigation
+            if UserStoreSingleton.shared.isLoggedIn == true {
+                switch selectedPaymentMethod {
+                case "Card":
+                    if request.secureAuthentication == true {
+                        threeDSecurePaymentApi()
+                    } else {
+                        paymentIntentApi()
+                    }
                     
-                    emailVerificationVC.billingInfoData = billingInfoData
-                    emailVerificationVC.selectedPaymentMethod = selectedPaymentMethod
-                    emailVerificationVC.easyPayDelegate = easyPayDelegate
-                    emailVerificationVC.request = request
-                    emailVerificationVC.chosenPlan = chosenPlan
-                    emailVerificationVC.startDate = startDate
-                    emailVerificationVC.userEmail = userEmail
-                    emailVerificationVC.billingInfo = fieldSection?.billing
-                    emailVerificationVC.additionalInfo = fieldSection?.additional
-                    emailVerificationVC.visibility = fieldSection?.visibility
-                    emailVerificationVC.amount = amount
-                    emailVerificationVC.email = userEmail
+                case "Bank":
+                    accountChargeApi()
                     
-                    // Payment method-specific data
-                    switch selectedPaymentMethod {
-                    case "Card":
-                        emailVerificationVC.cardNumber = cardNumber
-                        emailVerificationVC.expiryDate = expiryDate
-                        emailVerificationVC.cvv = cvv
-                        emailVerificationVC.nameOnCard = nameOnCard
-                        
-                    case "Bank":
-                        emailVerificationVC.accountName = accountName
-                        emailVerificationVC.routingNumber = routingNumber
-                        emailVerificationVC.accountType = accountType
-                        emailVerificationVC.accountNumber = accountNumber
-                        
-                    case "GrailPay":
-                        emailVerificationVC.grailPayAccountID = grailPayAccountID
-                        emailVerificationVC.selectedGrailPayAccountType = selectedGrailPayAccountType
-                        emailVerificationVC.selectedGrailPayAccountName = selectedGrailPayAccountName
-                        emailVerificationVC.isSavedForFuture = true
-                        
-                    default:
-                        break
-                    }
+                case "GrailPay":
+                    grailPayAccountChargeApi()
+                    
+                case "NewGrailPayAccount":
+                    grailPayAccountChargeApi(customerId: UserStoreSingleton.shared.customerId)
+                    
+                default:
+                    print("Unknown payment method for logged-in user")
+                }
+                return
+            }
+            
+            // ❌ Not logged in → Always navigate to OTPVerificationVC
+            if let emailVerificationVC = self.storyboard?.instantiateViewController(withIdentifier: "OTPVerificationVC") as? OTPVerificationVC {
+                
+                emailVerificationVC.billingInfoData = billingInfoData
+                emailVerificationVC.selectedPaymentMethod = selectedPaymentMethod
+                emailVerificationVC.easyPayDelegate = easyPayDelegate
+                emailVerificationVC.request = request
+                emailVerificationVC.chosenPlan = chosenPlan
+                emailVerificationVC.startDate = startDate
+                emailVerificationVC.userEmail = userEmail
+                emailVerificationVC.billingInfo = fieldSection?.billing
+                emailVerificationVC.additionalInfo = fieldSection?.additional
+                emailVerificationVC.visibility = fieldSection?.visibility
+                emailVerificationVC.amount = amount
+                emailVerificationVC.email = userEmail
+                
+                // Payment method-specific data
+                switch selectedPaymentMethod {
+                case "Card":
+                    emailVerificationVC.cardNumber = cardNumber
+                    emailVerificationVC.expiryDate = expiryDate
+                    emailVerificationVC.cvv = cvv
+                    emailVerificationVC.nameOnCard = nameOnCard
+                    
+                case "Bank":
+                    emailVerificationVC.accountName = accountName
+                    emailVerificationVC.routingNumber = routingNumber
+                    emailVerificationVC.accountType = accountType
+                    emailVerificationVC.accountNumber = accountNumber
+                    
+                case "GrailPay":
+                    emailVerificationVC.grailPayAccountID = grailPayAccountID
+                    emailVerificationVC.selectedGrailPayAccountType = selectedGrailPayAccountType
+                    emailVerificationVC.selectedGrailPayAccountName = selectedGrailPayAccountName
+                    emailVerificationVC.isSavedForFuture = true
                     
-                    navigationController?.pushViewController(emailVerificationVC, animated: true)
+                default:
+                    break
                 }
+                
+                navigationController?.pushViewController(emailVerificationVC, animated: true)
             }
         }
+
         else {
             // Direct Payment Flow
-//            if selectedPaymentMethod == "Card" {
-//                if isFrom == "SavedCards" {
-//                    paymentIntentFromShowCardApi()
-//                }
-//                if isSavedNewCard {
-//                    if isFrom == "AddNewCard" {
-//                        if request.secureAuthentication == true {
-//                            threeDSecurePaymentAddNewCardApi(customerId: UserStoreSingleton.shared.customerId)
-//                        } else {
-//                            paymentIntentAddNewCardApi(customerId: UserStoreSingleton.shared.customerId)
-//                        }
-//                    }
-//                }
-//                else {
-//                    if request.secureAuthentication == true {
-//                        threeDSecurePaymentApi()
-//                    } else {
-//                        paymentIntentApi()
-//                    }
-//                }
-//            }
             if selectedPaymentMethod == "Card" {
                 if isFrom == "SavedCards" {
                     paymentIntentFromShowCardApi()
@@ -480,6 +530,28 @@ class AdditionalInfoVC: BaseVC {
             "currency": "usd"
         ]
         
+        // ✅ Only for logged-in users
+        if UserStoreSingleton.shared.isLoggedIn == true {
+            let emailText = userEmail
+            let emailPrefix = emailText?.components(separatedBy: "@").first ?? ""
+            
+            params["save_card"] = 1
+            params["is_default"] = "1"
+            params["tokenize"] = request.tokenOnly ?? ""
+            params["username"] = emailPrefix
+            
+            if let customerId = UserStoreSingleton.shared.customerId {
+                params["customer"] = customerId
+                params["customer_id"] = customerId
+            } else {
+                params["create_customer"] = "1"
+            }
+            
+            if UserStoreSingleton.shared.customerId == nil {
+                params["create_customer"] = "1"
+            }
+        }
+        
         // Conditionally add billing info
         if let visibility = visibility, visibility.billing == true,
            let billing = billingInfo, !billing.isEmpty {
@@ -526,17 +598,10 @@ class AdditionalInfoVC: BaseVC {
             params["interval"] = chosenPlan?.lowercased()
         }
         
-        //        // ✅ Include metadata only if it has at least 1 key-value pair
-        //        if let metadata = request?.metadata, !metadata.isEmpty {
-        //            requestBody["metadata"] = metadata
-        //        }
-                
-                // ✅ Flatten metadata into requestBody
-                if let metadata = request?.metadata, !metadata.isEmpty {
-                    for (key, value) in metadata {
-                        params[key] = value
-                    }
-                }
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
         
         print(params)
         
@@ -753,17 +818,10 @@ class AdditionalInfoVC: BaseVC {
             params["interval"] = chosenPlan?.lowercased()
         }
         
-        //        // ✅ Include metadata only if it has at least 1 key-value pair
-        //        if let metadata = request?.metadata, !metadata.isEmpty {
-        //            requestBody["metadata"] = metadata
-        //        }
-                
-                // ✅ Flatten metadata into requestBody
-                if let metadata = request?.metadata, !metadata.isEmpty {
-                    for (key, value) in metadata {
-                        params[key] = value
-                    }
-                }
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
         
         print(params)
         
@@ -962,17 +1020,10 @@ class AdditionalInfoVC: BaseVC {
             params["email"] = UserStoreSingleton.shared.verificationEmail
         }
         
-        //        // ✅ Include metadata only if it has at least 1 key-value pair
-        //        if let metadata = request?.metadata, !metadata.isEmpty {
-        //            requestBody["metadata"] = metadata
-        //        }
-                
-                // ✅ Flatten metadata into requestBody
-                if let metadata = request?.metadata, !metadata.isEmpty {
-                    for (key, value) in metadata {
-                        params[key] = value
-                    }
-                }
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
         
         print(params)
         
@@ -1115,6 +1166,24 @@ class AdditionalInfoVC: BaseVC {
             "levelIndicator": 1,
         ]
         
+        // ✅ Only for logged-in users
+        if UserStoreSingleton.shared.isLoggedIn == true {
+            let emailText = userEmail
+            let emailPrefix = emailText?.components(separatedBy: "@").first ?? ""
+            
+            params["save_account"] = 1
+            
+            if let customerId = UserStoreSingleton.shared.customerId, !customerId.isEmpty {
+                params["customer"] = customerId
+            } else {
+                params["username"] = emailPrefix
+            }
+            
+            if UserStoreSingleton.shared.customerId == nil {
+                params["create_customer"] = "1"
+            }
+        }
+        
         // Conditionally add billing info
         if let visibility = visibility, visibility.billing == true,
            let billing = billingInfo, !billing.isEmpty {
@@ -1161,6 +1230,11 @@ class AdditionalInfoVC: BaseVC {
             params["interval"] = chosenPlan?.lowercased()
         }
         
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
+        
         print(params)
         
         do {
@@ -1342,6 +1416,11 @@ class AdditionalInfoVC: BaseVC {
             params["interval"] = chosenPlan?.lowercased()
         }
         
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
+        
         print(params)
         
         do {
@@ -1542,6 +1621,11 @@ class AdditionalInfoVC: BaseVC {
             params["interval"] = chosenPlan?.lowercased()
         }
         
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
+        
         print(params)
         
         do {
@@ -1687,6 +1771,28 @@ class AdditionalInfoVC: BaseVC {
             "tokenize": request.tokenOnly ?? false
         ]
         
+        // ✅ Only for logged-in users
+        if UserStoreSingleton.shared.isLoggedIn == true {
+            let emailText = userEmail
+            let emailPrefix = emailText?.components(separatedBy: "@").first ?? ""
+            
+            params["save_card"] = 1
+            params["is_default"] = "1"
+            params["tokenize"] = request.tokenOnly ?? ""
+            params["username"] = emailPrefix
+            
+            if let customerId = UserStoreSingleton.shared.customerId {
+                params["customer"] = customerId
+                params["customer_id"] = customerId
+            } else {
+                params["create_customer"] = "1"
+            }
+            
+            if UserStoreSingleton.shared.customerId == nil {
+                params["create_customer"] = "1"
+            }
+        }
+        
         // Conditionally add billing info
         if let visibility = visibility, visibility.billing == true,
            let billing = billingInfo, !billing.isEmpty {
@@ -2074,6 +2180,26 @@ class AdditionalInfoVC: BaseVC {
             "email": userEmail ?? ""
         ]
         
+        // ✅ Only add these params for logged-in users
+        if UserStoreSingleton.shared.isLoggedIn == true {
+            let emailText = userEmail
+            let emailPrefix = emailText?.components(separatedBy: "@").first ?? ""
+            
+            params["save_account"] = 1
+            params["is_default"] = 1
+            params["customer_id"] = UserStoreSingleton.shared.customerId ?? ""
+            
+            if let customerId = UserStoreSingleton.shared.customerId, !customerId.isEmpty {
+                params["customer"] = customerId
+            } else {
+                params["username"] = emailPrefix
+            }
+            
+            if UserStoreSingleton.shared.customerId == nil {
+                params["create_customer"] = "1"
+            }
+        }
+        
         // Conditionally add billing info
         if let visibility = visibility, visibility.billing == true,
            let billing = billingInfo, !billing.isEmpty {
@@ -2131,6 +2257,11 @@ class AdditionalInfoVC: BaseVC {
             params["interval"] = chosenPlan?.lowercased()
         }
         
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
+        
         print(params)
         
         do {
@@ -2360,6 +2491,11 @@ class AdditionalInfoVC: BaseVC {
             params["interval"] = chosenPlan?.lowercased()
         }
         
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
+        
         print(params)
         
         do {