@jimrising/easymerchantsdk-react-native 1.3.2 → 1.3.4

package/ios/Pods/ViewControllers/AdditionalInfoVC.swift

@@ -7,7 +7,7 @@
 
 import UIKit
 
-// @available(iOS 16.0, *)
+@available(iOS 16.0, *)
 class AdditionalInfoVC: BaseVC {
     
     @IBOutlet weak var viewAdditionalInfo: UIView!
@@ -196,66 +196,79 @@ class AdditionalInfoVC: BaseVC {
     }
     
     @IBAction func actionBtnPayNow(_ sender: UIButton) {
-        if isSavedNewCard {
-            if isFrom == "AddNewCard" {
-                self.paymentIntentAddNewCardApi(customerId: UserStoreSingleton.shared.customerId)
-            }
+        if self.txtFieldName.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
+            self.showAlert(title: "Missing Information", message: "Please enter your name.")
+        }
+        else if self.txtFieldEmail.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
+            self.showAlert(title: "Missing Information", message: "Please enter your email address.")
+        }
+        else if self.txtFieldPhoneNumber.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
+            self.showAlert(title: "Missing Information", message: "Please enter your phone number.")
+        }
+        else if self.txtFieldDescription.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
+            self.showAlert(title: "Missing Information", message: "Please enter description text.")
         }
         else {
-            if isSavedForFuture {
-                // Navigate to EmailVerificationVC based on the selected payment method
-                if selectedPaymentMethod == "Card" {
-                    if let emailVerificationVC = self.storyboard?.instantiateViewController(withIdentifier: "EmailVerificationVC") as? EmailVerificationVC {
-                        // Pass any necessary data to EmailVerificationVC
-                        emailVerificationVC.cardNumber = cardNumber
-                        emailVerificationVC.expiryDate = expiryDate
-                        emailVerificationVC.cvv = cvv
-                        emailVerificationVC.nameOnCard = nameOnCard
-                        emailVerificationVC.billingInfoData = billingInfoData
-                        emailVerificationVC.selectedPaymentMethod = selectedPaymentMethod
-                        emailVerificationVC.easyPayDelegate = self.easyPayDelegate
-                        self.navigationController?.pushViewController(emailVerificationVC, animated: true)
-                    }
-                } else if selectedPaymentMethod == "Bank" {
-                    if let emailVerificationVC = self.storyboard?.instantiateViewController(withIdentifier: "EmailVerificationVC") as? EmailVerificationVC {
-                        // Pass any necessary data to EmailVerificationVC
-                        emailVerificationVC.accountName = accountName
-                        emailVerificationVC.routingNumber = routingNumber
-                        emailVerificationVC.accountType = accountType
-                        emailVerificationVC.accountNumber = accountNumber
-                        emailVerificationVC.billingInfoData = billingInfoData
-                        emailVerificationVC.selectedPaymentMethod = selectedPaymentMethod
-                        emailVerificationVC.easyPayDelegate = self.easyPayDelegate
-                        self.navigationController?.pushViewController(emailVerificationVC, animated: true)
-                    }
+            if isSavedNewCard {
+                if isFrom == "AddNewCard" {
+                    self.paymentIntentAddNewCardApi(customerId: UserStoreSingleton.shared.customerId)
                 }
-            } else {
-                // Proceed with the normal flow
-                if selectedPaymentMethod == "Card" {
-                    if isFrom == "SavedCards" {
-                        paymentIntentFromShowCardApi()
-                    }
-                    else {
-                        paymentIntentApi()
-                    }
-                }
-                else if selectedPaymentMethod == "Bank" {
-                    if isFrom == "SavedBank" {
-                        accountChargeSavedBankAccountApi()
-                    }
-                    else if isFrom == "NormalBankPayWithoutSave" {
-                        accountChargeApi()
+            }
+            else {
+                if isSavedForFuture {
+                    // Navigate to EmailVerificationVC based on the selected payment method
+                    if selectedPaymentMethod == "Card" {
+                        if let emailVerificationVC = self.storyboard?.instantiateViewController(withIdentifier: "EmailVerificationVC") as? EmailVerificationVC {
+                            // Pass any necessary data to EmailVerificationVC
+                            emailVerificationVC.cardNumber = cardNumber
+                            emailVerificationVC.expiryDate = expiryDate
+                            emailVerificationVC.cvv = cvv
+                            emailVerificationVC.nameOnCard = nameOnCard
+                            emailVerificationVC.billingInfoData = billingInfoData
+                            emailVerificationVC.selectedPaymentMethod = selectedPaymentMethod
+                            emailVerificationVC.easyPayDelegate = self.easyPayDelegate
+                            self.navigationController?.pushViewController(emailVerificationVC, animated: true)
+                        }
+                    } else if selectedPaymentMethod == "Bank" {
+                        if let emailVerificationVC = self.storyboard?.instantiateViewController(withIdentifier: "EmailVerificationVC") as? EmailVerificationVC {
+                            // Pass any necessary data to EmailVerificationVC
+                            emailVerificationVC.accountName = accountName
+                            emailVerificationVC.routingNumber = routingNumber
+                            emailVerificationVC.accountType = accountType
+                            emailVerificationVC.accountNumber = accountNumber
+                            emailVerificationVC.billingInfoData = billingInfoData
+                            emailVerificationVC.selectedPaymentMethod = selectedPaymentMethod
+                            emailVerificationVC.easyPayDelegate = self.easyPayDelegate
+                            self.navigationController?.pushViewController(emailVerificationVC, animated: true)
+                        }
                     }
-                    else if isFrom == "AddNewAccountWithoutSave" {
-                        accountChargeApi()
+                } else {
+                    // Proceed with the normal flow
+                    if selectedPaymentMethod == "Card" {
+                        if isFrom == "SavedCards" {
+                            paymentIntentFromShowCardApi()
+                        }
+                        else {
+                            paymentIntentApi()
+                        }
                     }
-                    else if isFrom == "AddNewAccountWithSave" {
-                        accountChargeApi(customerId: UserStoreSingleton.shared.customerId)
+                    else if selectedPaymentMethod == "Bank" {
+                        if isFrom == "SavedBank" {
+                            accountChargeSavedBankAccountApi()
+                        }
+                        else if isFrom == "NormalBankPayWithoutSave" {
+                            accountChargeApi()
+                        }
+                        else if isFrom == "AddNewAccountWithoutSave" {
+                            accountChargeApi()
+                        }
+                        else if isFrom == "AddNewAccountWithSave" {
+                            accountChargeApi(customerId: UserStoreSingleton.shared.customerId)
+                        }
                     }
                 }
             }
         }
-        
     }
     
     func presentPaymentErrorVC(errorMessage: String) {
@@ -272,18 +285,6 @@ class AdditionalInfoVC: BaseVC {
     func paymentIntentApi() {
         showLoadingIndicator()
         
-        //        var components = URLComponents()
-        //        components.scheme = "https"
-        //        components.host = "stage-api.stage-easymerchant.io"
-        //        components.path = "/api/v1/charges"
-        //
-        //        guard let serviceURL = components.url else {
-        //            print("Invalid URL")
-        //            self.hideLoadingIndicator()
-        //            return
-        //        }
-        
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.charges.path()
         
         guard let serviceURL = URL(string: fullURL) else {
@@ -302,20 +303,17 @@ class AdditionalInfoVC: BaseVC {
         
         guard let billingInfoData = billingInfoData else {
             print("Billing info data is nil")
+            hideLoadingIndicator()
             return
         }
         
-        // Remove the flag and "+" sign from lblCountryCode.text
-        let countryCode = lblCountryCode.text ?? ""
-        let cleanedCountryCode = countryCode.replacingOccurrences(of: "[^0-9]", with: "", options: .regularExpression)
-        // Format phone number parameter by combining cleaned country code and phone number
-        let phoneNumber = "\(cleanedCountryCode)\(txtFieldPhoneNumber.text ?? "")"
+        // Extract only the digits from the phone number (local only, no country code)
+        let localPhone = txtFieldPhoneNumber.text?.components(separatedBy: CharacterSet.decimalDigits.inverted).joined() ?? ""
         
         let additionalInfo: [String: Any] = [
             "name": txtFieldName.text ?? "",
             "email": txtFieldEmail.text ?? "",
-            //            "phone_number": "\("1") \(txtFieldPhoneNumber.text ?? "")",
-            "phone_number": phoneNumber,
+            "phone_number": localPhone,
             "description": txtFieldDescription.text ?? ""
         ]
         
@@ -340,7 +338,7 @@ class AdditionalInfoVC: BaseVC {
             "billing_info": billingInfo,
             "additional_info": additionalInfo,
             "payment_method": "card",
-            "save_card": 0,
+            "save_card": 0
         ]
         
         do {
@@ -351,7 +349,7 @@ class AdditionalInfoVC: BaseVC {
             }
         } catch let error {
             print("Error creating JSON data: \(error)")
-            self.hideLoadingIndicator()
+            hideLoadingIndicator()
             return
         }
         
@@ -359,16 +357,18 @@ class AdditionalInfoVC: BaseVC {
         let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
             
             DispatchQueue.main.async {
-                self.hideLoadingIndicator() // Stop loader when response is received
+                self.hideLoadingIndicator()
             }
             
             if let error = error {
                 print("Error: \(error.localizedDescription)")
+                self.presentPaymentErrorVC(errorMessage: error.localizedDescription)
                 return
             }
             
             guard let httpResponse = serviceResponse as? HTTPURLResponse else {
                 print("Invalid response")
+                self.presentPaymentErrorVC(errorMessage: "Invalid response from server.")
                 return
             }
             
@@ -378,9 +378,8 @@ class AdditionalInfoVC: BaseVC {
                         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"
+                                let errorMessage = responseObject["message"] as? String ?? "Unknown error occurred."
                                 self.presentPaymentErrorVC(errorMessage: errorMessage)
                             } else {
                                 DispatchQueue.main.async {
@@ -396,33 +395,28 @@ class AdditionalInfoVC: BaseVC {
                             self.presentPaymentErrorVC(errorMessage: "Invalid JSON format")
                         }
                     } catch let jsonError {
-                        self.presentPaymentErrorVC(errorMessage: "Error parsing JSON: \(jsonError)")
+                        self.presentPaymentErrorVC(errorMessage: "Error parsing response: \(jsonError.localizedDescription)")
                     }
                 } else {
-                    self.presentPaymentErrorVC(errorMessage: "No data received")
+                    self.presentPaymentErrorVC(errorMessage: "No data received from server.")
                 }
             } 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()
     }
-    
+
     //MARK: - Credit Card Charge Api from Saved cards
     func paymentIntentFromShowCardApi() {
         showLoadingIndicator()
-        //        var components = URLComponents()
-        //        components.scheme = "https"
-        //        components.host = "stage-api.stage-easymerchant.io"
-        //        components.path = "/api/v1/charges"
-        //
-        //        guard let serviceURL = components.url else {
-        //            print("Invalid URL")
-        //            hideLoadingIndicator()
-        //            return
-        //        }
         
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.charges.path()
         
         guard let serviceURL = URL(string: fullURL) else {
@@ -444,17 +438,20 @@ class AdditionalInfoVC: BaseVC {
             return
         }
         
-        // Remove the flag and "+" sign from lblCountryCode.text
-        let countryCode = lblCountryCode.text ?? ""
-        let cleanedCountryCode = countryCode.replacingOccurrences(of: "[^0-9]", with: "", options: .regularExpression)
-        // Format phone number parameter by combining cleaned country code and phone number
-        let phoneNumber = "\(cleanedCountryCode)\(txtFieldPhoneNumber.text ?? "")"
+//        // Remove the flag and "+" sign from lblCountryCode.text
+//        let countryCode = lblCountryCode.text ?? ""
+//        let cleanedCountryCode = countryCode.replacingOccurrences(of: "[^0-9]", with: "", options: .regularExpression)
+//        // Format phone number parameter by combining cleaned country code and phone number
+//        let phoneNumber = "\(cleanedCountryCode)\(txtFieldPhoneNumber.text ?? "")"
+        
+        // Extract only the digits from the phone number (local only, no country code)
+        let localPhone = txtFieldPhoneNumber.text?.components(separatedBy: CharacterSet.decimalDigits.inverted).joined() ?? ""
         
         let additionalInfo: [String: Any] = [
             "name": txtFieldName.text ?? "",
             "email": txtFieldEmail.text ?? "",
-            //            "phone_number": "\("1") \(txtFieldPhoneNumber.text ?? "")",
-            "phone_number": phoneNumber,
+            "phone_number": localPhone,
+//            "phone_number": phoneNumber,
             "description": txtFieldDescription.text ?? ""
         ]
         
@@ -540,7 +537,13 @@ class AdditionalInfoVC: 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()
@@ -550,18 +553,6 @@ class AdditionalInfoVC: BaseVC {
     func paymentIntentAddNewCardApi(customerId: String?) {
         showLoadingIndicator()
         
-        //        var components = URLComponents()
-        //        components.scheme = "https"
-        //        components.host = "stage-api.stage-easymerchant.io"
-        //        components.path = "/api/v1/charges"
-        //
-        //        guard let serviceURL = components.url else {
-        //            print("Invalid URL")
-        //            hideLoadingIndicator()
-        //            return
-        //        }
-        
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.charges.path()
         
         guard let serviceURL = URL(string: fullURL) else {
@@ -691,7 +682,13 @@ class AdditionalInfoVC: 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()
@@ -701,18 +698,6 @@ class AdditionalInfoVC: BaseVC {
     func accountChargeApi() {
         showLoadingIndicator()
         
-        //        var components = URLComponents()
-        //        components.scheme = "https"
-        //        components.host = "stage-api.stage-easymerchant.io"
-        //        components.path = "/api/v1/ach/charge"
-        //
-        //        guard let serviceURL = components.url else {
-        //            print("Invalid URL")
-        //            hideLoadingIndicator()
-        //            return
-        //        }
-        
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()
         
         guard let serviceURL = URL(string: fullURL) else {
@@ -734,17 +719,20 @@ class AdditionalInfoVC: BaseVC {
             return
         }
         
-        // Remove the flag and "+" sign from lblCountryCode.text
-        let countryCode = lblCountryCode.text ?? ""
-        let cleanedCountryCode = countryCode.replacingOccurrences(of: "[^0-9]", with: "", options: .regularExpression)
-        // Format phone number parameter by combining cleaned country code and phone number
-        let phoneNumber = "\(cleanedCountryCode)\(txtFieldPhoneNumber.text ?? "")"
+//        // Remove the flag and "+" sign from lblCountryCode.text
+//        let countryCode = lblCountryCode.text ?? ""
+//        let cleanedCountryCode = countryCode.replacingOccurrences(of: "[^0-9]", with: "", options: .regularExpression)
+//        // Format phone number parameter by combining cleaned country code and phone number
+//        let phoneNumber = "\(cleanedCountryCode)\(txtFieldPhoneNumber.text ?? "")"
+        
+        // Extract only the digits from the phone number (local only, no country code)
+        let localPhone = txtFieldPhoneNumber.text?.components(separatedBy: CharacterSet.decimalDigits.inverted).joined() ?? ""
         
         let additionalInfo: [String: Any] = [
             "name": txtFieldName.text ?? "",
             "email": txtFieldEmail.text ?? "",
-            //            "phone_number": "\("1") \(txtFieldPhoneNumber.text ?? "")",
-            "phone_number": phoneNumber,
+            "phone_number": localPhone,
+           // "phone_number": phoneNumber,
             "description": txtFieldDescription.text ?? ""
         ]
         
@@ -833,7 +821,13 @@ class AdditionalInfoVC: 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()
@@ -843,18 +837,6 @@ class AdditionalInfoVC: BaseVC {
     func accountChargeSavedBankAccountApi() {
         showLoadingIndicator()
         
-        //        var components = URLComponents()
-        //        components.scheme = "https"
-        //        components.host = "stage-api.stage-easymerchant.io"
-        //        components.path = "/api/v1/ach/charge"
-        //
-        //        guard let serviceURL = components.url else {
-        //            print("Invalid URL")
-        //            hideLoadingIndicator()
-        //            return
-        //        }
-        
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()
         
         guard let serviceURL = URL(string: fullURL) else {
@@ -876,17 +858,20 @@ class AdditionalInfoVC: BaseVC {
             return
         }
         
-        // Remove the flag and "+" sign from lblCountryCode.text
-        let countryCode = lblCountryCode.text ?? ""
-        let cleanedCountryCode = countryCode.replacingOccurrences(of: "[^0-9]", with: "", options: .regularExpression)
-        // Format phone number parameter by combining cleaned country code and phone number
-        let phoneNumber = "\(cleanedCountryCode)\(txtFieldPhoneNumber.text ?? "")"
+//        // Remove the flag and "+" sign from lblCountryCode.text
+//        let countryCode = lblCountryCode.text ?? ""
+//        let cleanedCountryCode = countryCode.replacingOccurrences(of: "[^0-9]", with: "", options: .regularExpression)
+//        // Format phone number parameter by combining cleaned country code and phone number
+//        let phoneNumber = "\(cleanedCountryCode)\(txtFieldPhoneNumber.text ?? "")"
+        
+        // Extract only the digits from the phone number (local only, no country code)
+        let localPhone = txtFieldPhoneNumber.text?.components(separatedBy: CharacterSet.decimalDigits.inverted).joined() ?? ""
         
         let additionalInfo: [String: Any] = [
             "name": txtFieldName.text ?? "",
             "email": txtFieldEmail.text ?? "",
-            //            "phone_number": "\("1") \(txtFieldPhoneNumber.text ?? "")",
-            "phone_number": phoneNumber,
+            "phone_number": localPhone,
+           // "phone_number": phoneNumber,
             "description": txtFieldDescription.text ?? ""
         ]
         
@@ -972,7 +957,13 @@ class AdditionalInfoVC: 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()
@@ -982,18 +973,6 @@ class AdditionalInfoVC: BaseVC {
     func accountChargeApi(customerId: String?) {
         showLoadingIndicator()
         
-        //        var components = URLComponents()
-        //        components.scheme = "https"
-        //        components.host = "stage-api.stage-easymerchant.io"
-        //        components.path = "/api/v1/ach/charge"
-        //
-        //        guard let serviceURL = components.url else {
-        //            print("Invalid URL")
-        //            hideLoadingIndicator()
-        //            return
-        //        }
-        
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()
         
         guard let serviceURL = URL(string: fullURL) else {
@@ -1118,7 +1097,13 @@ class AdditionalInfoVC: 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()