@jimrising/easymerchantsdk-react-native 1.3.3 → 1.3.4

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

@@ -7,7 +7,7 @@
 
 import UIKit
 
-// @available(iOS 16.0, *)
+@available(iOS 16.0, *)
 
 protocol BillingInfoVCDelegate: AnyObject {
     func didPassTextBack(_ text: String)
@@ -323,150 +323,6 @@ class BillingInfoVC: BaseVC {
         task.resume()
     }
     
-    ///** Normal Case
-    //    //MARK: Get State List
-    //    func getStateListApi(for country: String) {
-    //        let urlString = "https://countriesnow.space/api/v0.1/countries/states"
-    //        guard let serviceURL = URL(string: urlString) else {
-    //            print("Invalid URL")
-    //            hideLoadingIndicator()
-    //            return
-    //        }
-    //
-    //        var request = URLRequest(url: serviceURL)
-    //        request.httpMethod = "POST"
-    //        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
-    //
-    //        let params: [String: Any] = [
-    //            "country": country
-    //        ]
-    //
-    //        do {
-    //            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
-    //            request.httpBody = jsonData
-    //        } catch {
-    //            print("Error creating JSON data: \(error)")
-    //            return
-    //        }
-    //
-    //        let session = URLSession.shared
-    //        let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
-    //            if let error = error {
-    //                print("Error: \(error.localizedDescription)")
-    //                return
-    //            }
-    //
-    //            guard let httpResponse = serviceResponse as? HTTPURLResponse, httpResponse.statusCode == 200 else {
-    //                print("Invalid response or status code")
-    //                return
-    //            }
-    //
-    //            if let data = serviceData {
-    //                do {
-    //                    if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
-    //                       let dataObject = responseObject["data"] as? [String: Any],
-    //                       let statesArray = dataObject["states"] as? [[String: Any]] {
-    //
-    //                        DispatchQueue.main.async {
-    //                            self.stateList = statesArray
-    //                            self.tblViewStateList.reloadData()
-    //
-    //                            // Pick a random state and set it in txtFieldState
-    //                            if let randomState = statesArray.randomElement(),
-    //                               let stateName = randomState["name"] as? String {
-    //                                self.txtFieldState.text = stateName
-    //
-    //                                // Fetch cities for the randomly selected state and country
-    //                                if let country = self.txtFieldCountry.text {
-    //                                    self.getCityListListApi(for: country, state: stateName)
-    //                                }
-    //                            } else {
-    //                                self.txtFieldState.text = "" // No state available
-    //                            }
-    //                        }
-    //                    } else {
-    //                        print("Error: Invalid JSON structure")
-    //                    }
-    //                } catch {
-    //                    print("Error parsing JSON: \(error)")
-    //                }
-    //            } else {
-    //                print("No data received")
-    //            }
-    //        }
-    //        task.resume()
-    //    }
-    //
-    
-    ///** Normal Case
-    //    //MARK: Get City List
-    //    func getCityListListApi(for country: String, state: String) {
-    //        let urlString = "https://countriesnow.space/api/v0.1/countries/state/cities"
-    //        guard let serviceURL = URL(string: urlString) else {
-    //            print("Invalid URL")
-    //            hideLoadingIndicator()
-    //            return
-    //        }
-    //
-    //        var request = URLRequest(url: serviceURL)
-    //        request.httpMethod = "POST"
-    //        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
-    //
-    //        let params: [String: Any] = [
-    //            "country": country,
-    //            "state": state
-    //        ]
-    //
-    //        do {
-    //            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
-    //            request.httpBody = jsonData
-    //        } catch {
-    //            print("Error creating JSON data: \(error)")
-    //            return
-    //        }
-    //
-    //        let session = URLSession.shared
-    //        let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
-    //            if let error = error {
-    //                print("Error: \(error.localizedDescription)")
-    //                return
-    //            }
-    //
-    //            guard let httpResponse = serviceResponse as? HTTPURLResponse, httpResponse.statusCode == 200 else {
-    //                print("Invalid response or status code")
-    //                return
-    //            }
-    //
-    //            if let data = serviceData {
-    //                do {
-    //                    if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
-    //                       let citiesArray = responseObject["data"] as? [String] {  // Directly accessing city list array
-    //
-    //                        DispatchQueue.main.async {
-    //                            self.cityList = citiesArray.map { ["city_name": $0] }  // Converting to expected format
-    //                            self.tblViewCityList.reloadData()
-    //
-    //                            // Pick a random city and set it in txtFieldCity
-    //                            if let randomCity = citiesArray.randomElement() {
-    //                                self.txtFieldCity.text = randomCity
-    //                            } else {
-    //                                self.txtFieldCity.text = "" // No city available
-    //                            }
-    //                        }
-    //                    } else {
-    //                        print("Error: Invalid JSON structure")
-    //                    }
-    //                } catch {
-    //                    print("Error parsing JSON: \(error)")
-    //                }
-    //            } else {
-    //                print("No data received")
-    //            }
-    //        }
-    //        task.resume()
-    //    }
-    
-    
     ///**In case of state and city name not found
     func getStateListApi(for country: String) {
         let urlString = "https://countriesnow.space/api/v0.1/countries/states"
@@ -645,51 +501,68 @@ class BillingInfoVC: BaseVC {
     }
     
     @IBAction func actionBtnNext(_ sender: UIButton) {
-        let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
-        // Set properties on AdditionalInfoVC
-        vc.cardNumber = cardNumber
-        vc.expiryDate = expiryDate
-        vc.cvv = cvv
-        vc.nameOnCard = nameOnCard
-        updateBillingInfoData()
-        vc.billingInfoData = billingInfoData
-        // Pass the selected payment method
-        vc.selectedPaymentMethod = selectedPaymentMethod
-        vc.isSavedForFuture = isSavedForFuture
-        
-        //Banking Case
-        vc.accountName = accountName
-        vc.routingNumber = routingNumber
-        vc.accountType = accountType
-        vc.accountNumber = accountNumber
-        
-        vc.customerID = customerID
-        vc.accountID = accountID
-        vc.isFrom = isFrom
-        
-        vc.isSavedNewAccount = isSavedNewAccount
-        vc.amount = amount
-        
-        if isFrom == "SavedCards" {
-            vc.isFrom = "SavedCards"
-            vc.selectedCard = selectedCard // Passing the selected card data
-            vc.cvvText = cvvText // Passing the CVV text
-            vc.amount = amount
+        if self.txtFieldAddress.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
+            self.showAlert(title: "Missing Information", message: "Please enter your address.")
         }
-        
-        if isFrom == "AddNewCard" {
-            vc.isFrom = "AddNewCard"
+        else if self.txtFieldCountry.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
+            self.showAlert(title: "Missing Information", message: "Please select your country.")
+        }
+        else if self.txtFieldState.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
+            self.showAlert(title: "Missing Information", message: "Please select your state.")
+        }
+        else if self.txtFieldCity.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
+            self.showAlert(title: "Missing Information", message: "Please select your city.")
+        }
+        else if self.txtFieldPostalCode.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
+            self.showAlert(title: "Missing Information", message: "Please enter your postal code.")
+        }
+        else {
+            let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
+            // Set properties on AdditionalInfoVC
+            vc.cardNumber = cardNumber
+            vc.expiryDate = expiryDate
+            vc.cvv = cvv
+            vc.nameOnCard = nameOnCard
+            updateBillingInfoData()
+            vc.billingInfoData = billingInfoData
+            // Pass the selected payment method
+            vc.selectedPaymentMethod = selectedPaymentMethod
+            vc.isSavedForFuture = isSavedForFuture
+            
+            //Banking Case
+            vc.accountName = accountName
+            vc.routingNumber = routingNumber
+            vc.accountType = accountType
+            vc.accountNumber = accountNumber
+            
+            vc.customerID = customerID
+            vc.accountID = accountID
+            vc.isFrom = isFrom
+            
+            vc.isSavedNewAccount = isSavedNewAccount
             vc.amount = amount
-            vc.isSavedNewCard = isSavedNewCard
+            
+            if isFrom == "SavedCards" {
+                vc.isFrom = "SavedCards"
+                vc.selectedCard = selectedCard // Passing the selected card data
+                vc.cvvText = cvvText // Passing the CVV text
+                vc.amount = amount
+            }
+            
+            if isFrom == "AddNewCard" {
+                vc.isFrom = "AddNewCard"
+                vc.amount = amount
+                vc.isSavedNewCard = isSavedNewCard
+            }
+            
+            self.navigationController?.pushViewController(vc, animated: true)
         }
-        
-        self.navigationController?.pushViewController(vc, animated: true)
     }
     
 }
 
 //MARK: - Table View
-// @available(iOS 16.0, *)
+@available(iOS 16.0, *)
 extension BillingInfoVC: UITableViewDelegate, UITableViewDataSource {
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         if tableView == tblViewCountryList {
@@ -766,7 +639,7 @@ extension BillingInfoVC: UITableViewDelegate, UITableViewDataSource {
     
 }
 
-// @available(iOS 16.0, *)
+@available(iOS 16.0, *)
 extension BillingInfoVC: UITextFieldDelegate {
     func textFieldShouldReturn(_ textField: UITextField) -> Bool {
         textField.resignFirstResponder() // Dismiss the keyboard

package/ios/Pods/ViewControllers/CountryListVC.swift

@@ -16,6 +16,7 @@ class CountryListVC: UIViewController {
     @IBOutlet var viewClass: UIView!
     @IBOutlet weak var searchBarCountry: UISearchBar!
     @IBOutlet weak var tblViewCountry: UITableView!
+    @IBOutlet weak var viewSearch: UIView!
     
     var list: [Country] = [Country]()
     var searchList: [Country] = [Country]()
@@ -25,6 +26,13 @@ class CountryListVC: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
+        // Remove top and bottom lines (background/shadow)
+        if let searchBar = self.searchBarCountry {
+            searchBar.backgroundImage = UIImage() // Removes background line
+            searchBar.layer.borderWidth = 0
+            searchBar.layer.borderColor = UIColor.clear.cgColor
+        }
+        
         if let containerBGcolor = UserStoreSingleton.shared.container_bg_col,
            let uiColor = UIColor(hex: containerBGcolor) {
             self.view.backgroundColor = uiColor
@@ -83,6 +91,10 @@ class CountryListVC: UIViewController {
         self.tblViewCountry.reloadData()
     }
     
+    @IBAction func actionBtnClose(_ sender: UIButton) {
+        self.navigationController?.popViewController(animated: true)
+    }
+    
 }
 
 extension String {

package/ios/Pods/ViewControllers/EmailVerificationVC.swift

@@ -118,6 +118,13 @@ class EmailVerificationVC: BaseVC {
         print("Setting clientToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
         let params: [String: Any] = [
             "card_search_value": txtFieldEmail.text ?? "",
             "card_search_key": "email"

package/ios/Pods/ViewControllers/OTPVerificationVC.swift

@@ -236,6 +236,13 @@ class OTPVerificationVC: BaseVC {
         print("Setting clientToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
         let params: [String: Any] = [
             "card_search_value": email ?? "",
             "card_search_key": "email",
@@ -362,6 +369,13 @@ class OTPVerificationVC: BaseVC {
         print("Setting clientToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
         let params: [String: Any] = [
             "card_search_value": email ?? "",
             "card_search_key": "email"
@@ -438,6 +452,13 @@ class OTPVerificationVC: BaseVC {
         print("Setting clientToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
         guard let billingInfoData = billingInfoData else {
             print("Billing info data is nil")
             return
@@ -547,7 +568,13 @@ class OTPVerificationVC: BaseVC {
                     self.presentPaymentErrorVC(errorMessage: "No data received")
                 }
             } else {
-                self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                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()
@@ -573,6 +600,13 @@ class OTPVerificationVC: BaseVC {
         print("Setting clientToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
         let emailPrefix = email?.components(separatedBy: "@").first ?? ""
         
         var params: [String: Any] = [
@@ -658,7 +692,13 @@ class OTPVerificationVC: BaseVC {
                     self.presentPaymentErrorVC(errorMessage: "No data received")
                 }
             } else {
-                self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                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()
@@ -694,6 +734,13 @@ class OTPVerificationVC: BaseVC {
         print("Setting clientToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
         guard let billingInfoData = billingInfoData else {
             print("Billing info data is nil")
             return
@@ -802,7 +849,13 @@ class OTPVerificationVC: BaseVC {
                     self.presentPaymentErrorVC(errorMessage: "No data received")
                 }
             } else {
-                self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                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()
@@ -828,6 +881,13 @@ class OTPVerificationVC: BaseVC {
         print("Setting clientToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
         let emailPrefix = email?.components(separatedBy: "@").first ?? ""
         
         var params: [String: Any] = [
@@ -912,7 +972,13 @@ class OTPVerificationVC: BaseVC {
                     self.presentPaymentErrorVC(errorMessage: "No data received")
                 }
             } else {
-                self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                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()
@@ -1016,7 +1082,13 @@ class OTPVerificationVC: BaseVC {
                     self.presentPaymentErrorVC(errorMessage: "No data received")
                 }
             } else {
-                self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                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()

package/ios/Pods/ViewControllers/PaymentDoneVC.swift

@@ -18,7 +18,10 @@ class PaymentDoneVC: UIViewController {
     @IBOutlet weak var lblHeadingDate: UILabel!
     @IBOutlet weak var lblHeadingTransactionID: UILabel!
     @IBOutlet weak var lbHeadingPaymentMethod: UILabel!
-    @IBOutlet weak var lblHeadingTotal: UILabel!    
+    @IBOutlet weak var lblHeadingTotal: UILabel!
+    
+    @IBOutlet weak var viewSubscriptionId: UIStackView!
+    @IBOutlet weak var lblSubscriptionId: UILabel!
     
     var chargeData: [String: Any]?
     var selectedPaymentMethod: String?