@jimrising/easymerchantsdk-react-native 1.8.4 → 1.8.5

package/ios/Models/Request.swift

@@ -284,13 +284,6 @@ public final class Request: NSObject {
         
         super.init()
         
-//        /// ✅ Clear old user data first
-//        DispatchQueue.main.async {
-//            if let topVC = UIApplication.topViewController() as? PaymentInfoVC {
-//                topVC.logOut()
-//            }
-//        }
-        
         // If tokenOnly is true, fetch only the clientToken and do not open the SDK
         if tokenOnly {
             self.paymentIntentApi { success in
@@ -322,239 +315,241 @@ public final class Request: NSObject {
     }
     
     //MARK: - Payment Intent Api
-//    func paymentIntentApi(completion: @escaping (Bool) -> Void) {
-//        guard let serviceURL = URL(string: EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.paymentIntent.path()) else {
-//            showErrorAndDismiss(message: "Invalid payment URL.")
-//            completion(false)
-//            return
-//        }
-//        
-//        var request = URLRequest(url: serviceURL)
-//        request.httpMethod = "POST"
-//        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
-//        request.addValue(EnvironmentConfig.apiKey ?? "", forHTTPHeaderField: "X-Api-Key")
-//        request.addValue(EnvironmentConfig.apiSecret ?? "", forHTTPHeaderField: "X-Api-Secret")
-//        
-//        // Recurring date validation
-//        if let startDateString = recurringStartDate,
-//           let startDate = DateFormatter.recurringDateFormatter.date(from: startDateString) {
-//            let today = Calendar.current.startOfDay(for: Date())
-//            let startDay = Calendar.current.startOfDay(for: startDate)
-//            
-//            if startDay < today {
-//                showErrorAndDismiss(message: "The recurring start date cannot be in the past. Please select today or a future date.")
-//                completion(false)
-//                return
-//            }
-//        }
-//        
-//        let params: [String: Any] = [
-//            "amount": amount ?? 0,
-//            // "allowed_cycles": String(recurringIntervals?.count ?? 0),
-//            "allowed_cycles": numOfCycle ?? 0,
-//            "intervals": recurringIntervals?.map { $0.rawValue } ?? [],
-//            "is_recurring": self.is_recurring ?? false,
-//            "recurring_start_date": recurringStartDate ?? "",
-//            "recurring_start_date_type": recurringStartDateType?.rawValue ?? ""
-//        ]
-//        
-//        do {
-//            request.httpBody = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
-//        } catch {
-//            showErrorAndDismiss(message: "Failed to encode payment data.")
-//            completion(false)
-//            return
-//        }
-//        
-//        let task = URLSession.shared.dataTask(with: request) { data, response, error in
-//            guard let httpResponse = response as? HTTPURLResponse, error == nil else {
-//                self.showErrorAndDismiss(message: error?.localizedDescription ?? "An unknown error occurred.")
-//                completion(false)
-//                return
-//            }
-//            
-//            if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
-//                if let data = data {
-//                    do {
-//                        if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
-//                            if let clientToken = responseObject["client_token"] as? String {
-//                                UserStoreSingleton.shared.clientToken = clientToken
-//                                print(clientToken)
-//                            }
-//                            if let paymentIntent = responseObject["payment_intent"] as? String {
-//                                UserStoreSingleton.shared.paymentIntent = paymentIntent
-//                            }
-//                            self.hostedCheckoutsApi { success in
-//                                completion(success)
-//                            }
-//                            return
-//                        } else {
-//                            self.showErrorAndDismiss(message: "Invalid response format.")
-//                        }
-//                    } catch {
-//                        self.showErrorAndDismiss(message: "Failed to parse response.")
-//                    }
-//                } else {
-//                    self.showErrorAndDismiss(message: "No response data received.")
-//                }
-//            } else {
-//                var message = "Payment request failed with status code: \(httpResponse.statusCode)"
-//                if let data = data,
-//                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
-//                   let msg = responseObj["message"] as? String {
-//                    message = msg
-//                }
-//                self.showErrorAndDismiss(message: message)
-//            }
-//            completion(false)
-//        }
-//        
-//        task.resume()
-//    }
-    
-    // MARK: - Payment Intent Api
     func paymentIntentApi(completion: @escaping (Bool) -> Void) {
-        // ✅ Show Loader
-        DispatchQueue.main.async {
-            UIApplication.topViewController()?.ep_showLoadingIndicator()
-        }
-
         guard let serviceURL = URL(string: EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.paymentIntent.path()) else {
-            DispatchQueue.main.async {
-                UIApplication.topViewController()?.ep_hideLoadingIndicator()
-                self.showErrorAndDismiss(message: "Invalid payment URL.")
-            }
+            showErrorAndDismiss(message: "Invalid payment URL.")
             completion(false)
             return
         }
-
+        
         var request = URLRequest(url: serviceURL)
         request.httpMethod = "POST"
         request.addValue("application/json", forHTTPHeaderField: "Content-Type")
         request.addValue(EnvironmentConfig.apiKey ?? "", forHTTPHeaderField: "X-Api-Key")
         request.addValue(EnvironmentConfig.apiSecret ?? "", forHTTPHeaderField: "X-Api-Secret")
-
-        // Validate recurring start date
+        
+        // Recurring date validation
         if let startDateString = recurringStartDate,
            let startDate = DateFormatter.recurringDateFormatter.date(from: startDateString) {
             let today = Calendar.current.startOfDay(for: Date())
             let startDay = Calendar.current.startOfDay(for: startDate)
-
+            
             if startDay < today {
-                DispatchQueue.main.async {
-                    UIApplication.topViewController()?.ep_hideLoadingIndicator()
-                    self.showErrorAndDismiss(message: "The recurring start date cannot be in the past. Please select today or a future date.")
-                }
+                showErrorAndDismiss(message: "The recurring start date cannot be in the past. Please select today or a future date.")
                 completion(false)
                 return
             }
         }
-
+        
         let params: [String: Any] = [
             "amount": amount ?? 0,
+            // "allowed_cycles": String(recurringIntervals?.count ?? 0),
             "allowed_cycles": numOfCycle ?? 0,
             "intervals": recurringIntervals?.map { $0.rawValue } ?? [],
             "is_recurring": self.is_recurring ?? false,
             "recurring_start_date": recurringStartDate ?? "",
             "recurring_start_date_type": recurringStartDateType?.rawValue ?? ""
         ]
-
+        
+        print(params)
+        
         do {
             request.httpBody = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
         } catch {
-            DispatchQueue.main.async {
-                UIApplication.topViewController()?.ep_hideLoadingIndicator()
-                self.showErrorAndDismiss(message: "Failed to encode payment data.")
-            }
+            showErrorAndDismiss(message: "Failed to encode payment data.")
             completion(false)
             return
         }
-
-        URLSession.shared.dataTask(with: request) { data, response, error in
-            defer {
-                DispatchQueue.main.async {
-                    UIApplication.topViewController()?.ep_hideLoadingIndicator()
-                }
-            }
-
-            if let error = error {
-                DispatchQueue.main.async {
-                    self.showErrorAndDismiss(message: error.localizedDescription)
-                }
-                completion(false)
-                return
-            }
-
-            guard let httpResponse = response as? HTTPURLResponse else {
-                DispatchQueue.main.async {
-                    self.showErrorAndDismiss(message: "Invalid response.")
-                }
+        
+        let task = URLSession.shared.dataTask(with: request) { data, response, error in
+            guard let httpResponse = response as? HTTPURLResponse, error == nil else {
+                self.showErrorAndDismiss(message: error?.localizedDescription ?? "An unknown error occurred.")
                 completion(false)
                 return
             }
-
+            
             if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
-                guard let data = data else {
-                    DispatchQueue.main.async {
-                        self.showErrorAndDismiss(message: "No response data received.")
-                    }
-                    completion(false)
-                    return
-                }
-
-                do {
-                    guard let responseObject = try JSONSerialization.jsonObject(with: data) as? [String: Any] else {
-                        DispatchQueue.main.async {
+                if let data = data {
+                    do {
+                        if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
+                            if let clientToken = responseObject["client_token"] as? String {
+                                UserStoreSingleton.shared.clientToken = clientToken
+                                print(clientToken)
+                            }
+                            if let paymentIntent = responseObject["payment_intent"] as? String {
+                                UserStoreSingleton.shared.paymentIntent = paymentIntent
+                            }
+                            self.hostedCheckoutsApi { success in
+                                completion(success)
+                            }
+                            return
+                        } else {
                             self.showErrorAndDismiss(message: "Invalid response format.")
                         }
-                        completion(false)
-                        return
-                    }
-
-                    // ✅ Save values into UserStoreSingleton
-                    if let clientToken = responseObject["client_token"] as? String {
-                        UserStoreSingleton.shared.clientToken = clientToken
-                        print("✅ Saved Client Token: \(clientToken)")
-                    }
-                    if let paymentIntent = responseObject["payment_intent"] as? String {
-                        UserStoreSingleton.shared.paymentIntent = paymentIntent
-                        print("✅ Saved Payment Intent: \(paymentIntent)")
-                    }
-
-                    // ✅ Proceed to next step only after saving
-                    self.hostedCheckoutsApi { success in
-                        DispatchQueue.main.async {
-                            UIApplication.topViewController()?.ep_hideLoadingIndicator()
-                        }
-                        completion(success)
-                    }
-                    return
-
-                } catch {
-                    DispatchQueue.main.async {
+                    } catch {
                         self.showErrorAndDismiss(message: "Failed to parse response.")
                     }
-                    completion(false)
-                    return
+                } else {
+                    self.showErrorAndDismiss(message: "No response data received.")
                 }
-
             } else {
                 var message = "Payment request failed with status code: \(httpResponse.statusCode)"
                 if let data = data,
-                   let responseObj = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
                    let msg = responseObj["message"] as? String {
                     message = msg
                 }
-                DispatchQueue.main.async {
-                    self.showErrorAndDismiss(message: message)
-                }
+                self.showErrorAndDismiss(message: message)
             }
-
             completion(false)
-
-        }.resume()
+        }
+        
+        task.resume()
     }
     
+    // MARK: - Payment Intent Api
+//    func paymentIntentApi(completion: @escaping (Bool) -> Void) {
+//        // ✅ Show Loader
+//        DispatchQueue.main.async {
+//            UIApplication.topViewController()?.ep_showLoadingIndicator()
+//        }
+//
+//        guard let serviceURL = URL(string: EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.paymentIntent.path()) else {
+//            DispatchQueue.main.async {
+//                UIApplication.topViewController()?.ep_hideLoadingIndicator()
+//                self.showErrorAndDismiss(message: "Invalid payment URL.")
+//            }
+//            completion(false)
+//            return
+//        }
+//
+//        var request = URLRequest(url: serviceURL)
+//        request.httpMethod = "POST"
+//        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+//        request.addValue(EnvironmentConfig.apiKey ?? "", forHTTPHeaderField: "X-Api-Key")
+//        request.addValue(EnvironmentConfig.apiSecret ?? "", forHTTPHeaderField: "X-Api-Secret")
+//
+//        // Validate recurring start date
+//        if let startDateString = recurringStartDate,
+//           let startDate = DateFormatter.recurringDateFormatter.date(from: startDateString) {
+//            let today = Calendar.current.startOfDay(for: Date())
+//            let startDay = Calendar.current.startOfDay(for: startDate)
+//
+//            if startDay < today {
+//                DispatchQueue.main.async {
+//                    UIApplication.topViewController()?.ep_hideLoadingIndicator()
+//                    self.showErrorAndDismiss(message: "The recurring start date cannot be in the past. Please select today or a future date.")
+//                }
+//                completion(false)
+//                return
+//            }
+//        }
+//
+//        let params: [String: Any] = [
+//            "amount": amount ?? 0,
+//            "allowed_cycles": numOfCycle ?? 0,
+//            "intervals": recurringIntervals?.map { $0.rawValue } ?? [],
+//            "is_recurring": self.is_recurring ?? false,
+//            "recurring_start_date": recurringStartDate ?? "",
+//            "recurring_start_date_type": recurringStartDateType?.rawValue ?? ""
+//        ]
+//
+//        do {
+//            request.httpBody = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+//        } catch {
+//            DispatchQueue.main.async {
+//                UIApplication.topViewController()?.ep_hideLoadingIndicator()
+//                self.showErrorAndDismiss(message: "Failed to encode payment data.")
+//            }
+//            completion(false)
+//            return
+//        }
+//
+//        URLSession.shared.dataTask(with: request) { data, response, error in
+//            defer {
+//                DispatchQueue.main.async {
+//                    UIApplication.topViewController()?.ep_hideLoadingIndicator()
+//                }
+//            }
+//
+//            if let error = error {
+//                DispatchQueue.main.async {
+//                    self.showErrorAndDismiss(message: error.localizedDescription)
+//                }
+//                completion(false)
+//                return
+//            }
+//
+//            guard let httpResponse = response as? HTTPURLResponse else {
+//                DispatchQueue.main.async {
+//                    self.showErrorAndDismiss(message: "Invalid response.")
+//                }
+//                completion(false)
+//                return
+//            }
+//
+//            if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
+//                guard let data = data else {
+//                    DispatchQueue.main.async {
+//                        self.showErrorAndDismiss(message: "No response data received.")
+//                    }
+//                    completion(false)
+//                    return
+//                }
+//
+//                do {
+//                    guard let responseObject = try JSONSerialization.jsonObject(with: data) as? [String: Any] else {
+//                        DispatchQueue.main.async {
+//                            self.showErrorAndDismiss(message: "Invalid response format.")
+//                        }
+//                        completion(false)
+//                        return
+//                    }
+//
+//                    // ✅ Save values into UserStoreSingleton
+//                    if let clientToken = responseObject["client_token"] as? String {
+//                        UserStoreSingleton.shared.clientToken = clientToken
+//                        print("✅ Saved Client Token: \(clientToken)")
+//                    }
+//                    if let paymentIntent = responseObject["payment_intent"] as? String {
+//                        UserStoreSingleton.shared.paymentIntent = paymentIntent
+//                        print("✅ Saved Payment Intent: \(paymentIntent)")
+//                    }
+//
+//                    // ✅ Proceed to next step only after saving
+//                    self.hostedCheckoutsApi { success in
+//                        DispatchQueue.main.async {
+//                            UIApplication.topViewController()?.ep_hideLoadingIndicator()
+//                        }
+//                        completion(success)
+//                    }
+//                    return
+//
+//                } catch {
+//                    DispatchQueue.main.async {
+//                        self.showErrorAndDismiss(message: "Failed to parse response.")
+//                    }
+//                    completion(false)
+//                    return
+//                }
+//
+//            } else {
+//                var message = "Payment request failed with status code: \(httpResponse.statusCode)"
+//                if let data = data,
+//                   let responseObj = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
+//                   let msg = responseObj["message"] as? String {
+//                    message = msg
+//                }
+//                DispatchQueue.main.async {
+//                    self.showErrorAndDismiss(message: message)
+//                }
+//            }
+//
+//            completion(false)
+//
+//        }.resume()
+//    }
+    
     private func showErrorAndDismiss(message: String) {
         DispatchQueue.main.async {
             if let topVC = UIApplication.topViewController() {
@@ -594,6 +589,8 @@ public final class Request: NSObject {
             "amount": amount ?? 0,
         ]
         
+        print(params)
+        
         do {
             request.httpBody = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
         } catch {
@@ -815,34 +812,34 @@ extension UIApplication {
 }
 
 
-extension UIViewController {
-    
-    func ep_showLoadingIndicator() {
-        let tag = 99999 // A unique tag so we can identify and remove the loader later
-        if self.view.viewWithTag(tag) == nil {
-            let loader = UIActivityIndicatorView(style: .large)
-            loader.center = self.view.center
-            loader.tag = tag
-            loader.startAnimating()
-            loader.color = .gray
-            loader.hidesWhenStopped = true
-            loader.translatesAutoresizingMaskIntoConstraints = false
-            self.view.addSubview(loader)
-            
-            // Optional: center constraints
-            NSLayoutConstraint.activate([
-                loader.centerXAnchor.constraint(equalTo: self.view.centerXAnchor),
-                loader.centerYAnchor.constraint(equalTo: self.view.centerYAnchor)
-            ])
-        }
-    }
-    
-    func ep_hideLoadingIndicator() {
-        let tag = 99999
-        if let loader = self.view.viewWithTag(tag) as? UIActivityIndicatorView {
-            loader.stopAnimating()
-            loader.removeFromSuperview()
-        }
-    }
-}
+//extension UIViewController {
+//    
+//    func ep_showLoadingIndicator() {
+//        let tag = 99999 // A unique tag so we can identify and remove the loader later
+//        if self.view.viewWithTag(tag) == nil {
+//            let loader = UIActivityIndicatorView(style: .large)
+//            loader.center = self.view.center
+//            loader.tag = tag
+//            loader.startAnimating()
+//            loader.color = .gray
+//            loader.hidesWhenStopped = true
+//            loader.translatesAutoresizingMaskIntoConstraints = false
+//            self.view.addSubview(loader)
+//            
+//            // Optional: center constraints
+//            NSLayoutConstraint.activate([
+//                loader.centerXAnchor.constraint(equalTo: self.view.centerXAnchor),
+//                loader.centerYAnchor.constraint(equalTo: self.view.centerYAnchor)
+//            ])
+//        }
+//    }
+//    
+//    func ep_hideLoadingIndicator() {
+//        let tag = 99999
+//        if let loader = self.view.viewWithTag(tag) as? UIActivityIndicatorView {
+//            loader.stopAnimating()
+//            loader.removeFromSuperview()
+//        }
+//    }
+//}
 

package/ios/Pods/ViewControllers/AdditionalInfoVC.swift

@@ -49,7 +49,8 @@ class AdditionalInfoVC: BaseVC {
     var isSavedForFuture: Bool = false
     
     var selectedCard: CardModel?
-    var amount: Int?
+//    var amount: Int?
+    var amount: Double?
     var cvvText: String?
     var isFrom = String()
     var isFromm = String()

package/ios/Pods/ViewControllers/BillingInfoVC/BillingInfoVC.swift

@@ -75,7 +75,8 @@ class BillingInfoVC: BaseVC {
     
     var request: Request!
     var selectedCard: CardModel?
-    var amount: Int?
+//    var amount: Int?
+    var amount: Double?
     var cvvText: String?
     
     var isFrom = String()
@@ -666,7 +667,7 @@ class BillingInfoVC: BaseVC {
                 vc.visibility = updatedFieldSection.visibility
                 vc.selectedPaymentMethod = selectedPaymentMethod
                 vc.isSavedForFuture = isSavedForFuture
-                vc.amount = Int(request.amount ?? 0)
+                vc.amount = Double(self.request.amount ?? 0)
                 vc.request = request
                 vc.chosenPlan = chosenPlan
                 vc.startDate = startDate
@@ -745,7 +746,7 @@ class BillingInfoVC: BaseVC {
                 vc.accountID = accountID
                 vc.isFrom = isFrom
                 vc.isSavedNewAccount = isSavedNewAccount
-                vc.amount = Int(request.amount ?? 0)
+                vc.amount = Double(self.request.amount ?? 0)
                 vc.request = request
                 vc.chosenPlan = chosenPlan
                 vc.startDate = startDate
@@ -807,7 +808,7 @@ class BillingInfoVC: BaseVC {
                 vc.isSavedForFuture = isSavedForFuture
                 vc.isFrom = isFrom
                 vc.isSavedNewAccount = isSavedNewAccount
-                vc.amount = Int(request.amount ?? 0)
+                vc.amount = Double(self.request.amount ?? 0)
                 vc.request = request
                 vc.chosenPlan = chosenPlan
                 vc.startDate = startDate
@@ -829,7 +830,7 @@ class BillingInfoVC: BaseVC {
                 vc.isSavedForFuture = isSavedForFuture
                 vc.isFrom = isFrom
                 vc.isSavedNewAccount = isSavedNewAccount
-                vc.amount = Int(request.amount ?? 0)
+                vc.amount = Double(self.request.amount ?? 0)
                 vc.request = request
                 vc.chosenPlan = chosenPlan
                 vc.startDate = startDate
@@ -861,7 +862,7 @@ class BillingInfoVC: BaseVC {
                 vc.isSavedForFuture = isSavedForFuture
                 vc.isFrom = isFrom
                 vc.isSavedNewAccount = isSavedNewAccount
-                vc.amount = Int(request.amount ?? 0)
+                vc.amount = Double(self.request.amount ?? 0)
                 vc.request = request
                 vc.chosenPlan = chosenPlan
                 vc.startDate = startDate

package/ios/Pods/ViewControllers/OTPVerificationVC.swift

@@ -72,7 +72,8 @@ class OTPVerificationVC: BaseVC {
     var billingInfo: [FieldItem]?
     var visibility: FieldsVisibility?
     
-    var amount: Int?
+//    var amount: Int?
+    var amount: Double?
     
     var isSavedNewCard: Bool = false