@jimrising/easymerchantsdk-react-native 1.4.3 → 1.4.4

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

@@ -862,24 +862,7 @@ class BillingInfoVC: BaseVC {
                 navigationController?.pushViewController(vc, animated: true)
             }
             else if !isAdditionalVisible && isSavedForFuture {
-                let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
-                vc.billingInfoData = updatedBillingData
-                vc.fieldSection = updatedFieldSection
-                vc.billingInfo = updatedFieldSection.billing
-                vc.additionalInfo = updatedFieldSection.additional
-                vc.visibility = updatedFieldSection.visibility
-                vc.selectedPaymentMethod = selectedPaymentMethod
-                vc.isSavedForFuture = isSavedForFuture
-                vc.isFrom = isFrom
-                vc.isSavedNewAccount = isSavedNewAccount
-                vc.amount = Int(request.amount ?? 0)
-                vc.request = request
-                vc.chosenPlan = chosenPlan
-                vc.startDate = startDate
-                vc.grailPayAccountID = grailPayAccountID
-                vc.selectedGrailPayAccountType = selectedGrailPayAccountType
-                vc.selectedGrailPayAccountName = selectedGrailPayAccountName
-                navigationController?.pushViewController(vc, animated: true)
+                grailPayAccountChargeApi(customerId: UserStoreSingleton.shared.customerId)
             }
             else {
                 grailPayAccountChargeApi()
@@ -2448,6 +2431,224 @@ class BillingInfoVC: BaseVC {
         task.resume()
     }
     
+    //MARK: - GrailPay Account Charge Api if user saved account
+    func grailPayAccountChargeApi(customerId: String?) {
+        showLoadingIndicator()
+        
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()
+        
+        guard let serviceURL = URL(string: fullURL) else {
+            print("Invalid URL")
+            hideLoadingIndicator()
+            return
+        }
+        
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "POST"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        
+        let token = UserStoreSingleton.shared.clientToken
+        print("Setting clientToken header: \(token ?? "None")")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        
+        if let apiKey = EnvironmentConfig.apiKey {
+            uRLRequest.addValue(apiKey, forHTTPHeaderField: "X-Api-Key")
+        }
+        if let apiSecret = EnvironmentConfig.apiSecret {
+            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "X-Api-Secret")
+        }
+        
+        let emailPrefix = userEmail?.components(separatedBy: "@").first ?? ""
+        
+        var params: [String: Any] = [
+            "account_id": self.grailPayAccountID ?? "",
+            "account_type": self.selectedGrailPayAccountType ?? "",
+            "name": self.selectedGrailPayAccountName ?? "",
+            "save_account": 1,
+            "is_default": 1,
+            "customer_id": customerId ?? "",
+            "email": userEmail ?? "",
+            "create_customer": "1",
+        ]
+        
+        if let customerId = customerId {
+            params["customer"] = customerId
+        } else {
+            params["username"] = emailPrefix
+        }
+        
+//        // Billing Info
+//        if let visibility = visibility, visibility.billing == true,
+//           let billing = billingInfo, !billing.isEmpty {
+//            var billingDict: [String: Any] = [:]
+//            billing.forEach { billingDict[$0.name] = $0.value }
+//
+//            params["address"] = billingDict["address"] as? String ?? ""
+//            params["country"] = billingDict["country"] as? String ?? ""
+//            params["state"] = billingDict["state"] as? String ?? ""
+//            params["city"] = billingDict["city"] as? String ?? ""
+//            params["zip"] = billingDict["postal_code"] as? String ?? ""
+//        }
+        
+        // Always include Billing Info if available
+        if let billing = billingInfo, !billing.isEmpty {
+            var billingDict: [String: Any] = [:]
+            billing.forEach { billingDict[$0.name] = $0.value }
+
+            params["address"] = billingDict["address"] as? String ?? ""
+            params["country"] = billingDict["country"] as? String ?? ""
+            params["state"] = billingDict["state"] as? String ?? ""
+            params["city"] = billingDict["city"] as? String ?? ""
+            params["zip"] = billingDict["postal_code"] as? String ?? ""
+        }
+        
+//        // Additional Info or default description
+//        var descriptionValue: String = "Hosted payment checkout" // default
+//        if let visibility = visibility, visibility.additional == true,
+//           let additional = additionalInfo, !additional.isEmpty {
+//
+//            var additionalDict: [String: Any] = [:]
+//            additional.forEach { additionalDict[$0.name] = $0.value }
+//
+//            if let desc = additionalDict["description"] as? String, !desc.isEmpty {
+//                descriptionValue = desc
+//            }
+//
+//            if let phone = additionalDict["phone_number"] as? String, !phone.isEmpty {
+//                params["phone_number"] = phone
+//            }
+//        }
+//        params["description"] = descriptionValue
+        
+        // Always include Additional Info if available
+        var descriptionValue: String = "Hosted payment checkout"
+        if let additional = additionalInfo, !additional.isEmpty {
+            var additionalDict: [String: Any] = [:]
+            additional.forEach { additionalDict[$0.name] = $0.value }
+
+            if let desc = additionalDict["description"] as? String, !desc.isEmpty {
+                descriptionValue = desc
+            }
+
+            if let phone = additionalDict["phone_number"] as? String, !phone.isEmpty {
+                params["phone_number"] = phone
+            }
+        }
+        params["description"] = descriptionValue
+        
+        // Add these if recurring is enabled
+        if let req = request, req.is_recurring == true {
+            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                // Only send start_date if type is .custom and field is not empty
+                if let startDateText = startDate, !startDateText.isEmpty {
+                    let inputFormatter = DateFormatter()
+                    inputFormatter.dateFormat = "dd/MM/yyyy"
+                    
+                    let outputFormatter = DateFormatter()
+                    outputFormatter.dateFormat = "MM/dd/yyyy"
+                    
+                    if let date = inputFormatter.date(from: startDateText) {
+                        let apiFormattedDate = outputFormatter.string(from: date)
+                        params["start_date"] = apiFormattedDate
+                    } else {
+                        print("Invalid date format in startDateText")
+                    }
+                }
+            }
+            
+            params["interval"] = chosenPlan?.lowercased()
+        }
+        
+        print(params)
+        
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+            uRLRequest.httpBody = jsonData
+            if let jsonString = String(data: jsonData, encoding: .utf8) {
+                print("JSON Payload: \(jsonString)")
+            }
+        } catch let error {
+            print("Error creating JSON data: \(error)")
+            hideLoadingIndicator()
+            return
+        }
+        
+        let session = URLSession.shared
+        let task = session.dataTask(with: uRLRequest) { (serviceData, serviceResponse, error) in
+            
+            DispatchQueue.main.async {
+                self.hideLoadingIndicator() // Stop loader when response is received
+            }
+            
+            if let error = error {
+                self.presentPaymentErrorVC(errorMessage: error.localizedDescription)
+                return
+            }
+            
+            guard let httpResponse = serviceResponse as? HTTPURLResponse else {
+                self.presentPaymentErrorVC(errorMessage: "Invalid response")
+                return
+            }
+            
+            if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
+                if let data = serviceData {
+                    do {
+                        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"
+                                self.presentPaymentErrorVC(errorMessage: errorMessage)
+                            } else {
+                                DispatchQueue.main.async {
+                                    if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
+                                        paymentDoneVC.chargeData = responseObject
+                                        paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
+                                        paymentDoneVC.easyPayDelegate = self.easyPayDelegate
+                                        // Pass billing and additional info
+                                        // Conditionally pass raw FieldItem array
+                                        paymentDoneVC.visibility = self.visibility
+                                        
+                                      //  if self.visibility?.billing == true {
+                                            paymentDoneVC.billingInfoData = self.billingInfo
+                                            var billingDict: [String: Any] = [:]
+                                            self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
+                                            paymentDoneVC.billingInfo = billingDict
+                                      //  }
+                                        
+                                      //  if self.visibility?.additional == true {
+                                            paymentDoneVC.additionalInfoData = self.additionalInfo
+                                            var additionalDict: [String: Any] = [:]
+                                            self.additionalInfo?.forEach { additionalDict[$0.name] = $0.value }
+                                            paymentDoneVC.additionalInfo = additionalDict
+                                      //  }
+                                        self.navigationController?.pushViewController(paymentDoneVC, animated: true)
+                                    }
+                                }
+                            }
+                        } else {
+                            self.presentPaymentErrorVC(errorMessage: "Invalid JSON format")
+                        }
+                    } catch let jsonError {
+                        self.presentPaymentErrorVC(errorMessage: "Error parsing JSON: \(jsonError)")
+                    }
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "No data received")
+                }
+            } else {
+                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: - Table View

package/ios/Pods/ViewControllers/EmailVerificationVC.swift

@@ -53,6 +53,8 @@ class EmailVerificationVC: BaseVC {
     var isSavedNewAccount: Bool?
     var isFrom = String()
     
+    var isSavedNewCard: Bool = false
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         
@@ -139,35 +141,35 @@ class EmailVerificationVC: BaseVC {
     // MARK: - Send OTP Email Verification Api
     func emailVerificationApi() {
         showLoadingIndicator()
-        
+
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.emailVerification.path()
-        
+
         guard let serviceURL = URL(string: fullURL) else {
             print("Invalid URL")
             hideLoadingIndicator()
             return
         }
-        
+
         var request = URLRequest(url: serviceURL)
         request.httpMethod = "POST"
         request.addValue("application/json", forHTTPHeaderField: "Content-Type")
-        
+
         let token = UserStoreSingleton.shared.clientToken
         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"
         ]
-        
+
         do {
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
             request.httpBody = jsonData
@@ -179,115 +181,68 @@ class EmailVerificationVC: BaseVC {
             hideLoadingIndicator()
             return
         }
-        
+
         let session = URLSession.shared
         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)")
                 return
             }
-            
+
             guard let httpResponse = serviceResponse as? HTTPURLResponse else {
                 print("Invalid response")
                 return
             }
-            
+
             if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
                 if let data = serviceData {
                     do {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
                             print("Response Data: \(responseObject)")
-                            
-                            // Navigate to PaymentDoneVC and pass the response data
+
                             DispatchQueue.main.async {
-                                if self.selectedPaymentMethod == "Card" {
-                                    if let vc = self.storyboard?.instantiateViewController(withIdentifier: "OTPVerificationVC") as? OTPVerificationVC {
-                                        // Pass any necessary data to OTP VerfificationVC
+                                if let vc = self.storyboard?.instantiateViewController(withIdentifier: "OTPVerificationVC") as? OTPVerificationVC {
+                                    vc.selectedPaymentMethod = self.selectedPaymentMethod
+                                    vc.easyPayDelegate = self.easyPayDelegate
+                                    vc.email = self.txtFieldEmail.text
+                                    vc.chosenPlan = self.chosenPlan
+                                    vc.startDate = self.startDate
+                                    vc.request = self.request
+                                    vc.billingInfoData = self.billingInfoData
+                                    vc.userEmail = self.userEmail
+                                    vc.billingInfo = self.fieldSection?.billing
+                                    vc.additionalInfo = self.fieldSection?.additional
+                                    vc.visibility = self.fieldSection?.visibility
+                                    vc.isSavedForFuture = self.isSavedForFuture
+
+                                    switch self.selectedPaymentMethod {
+                                    case "Card":
                                         vc.cardNumber = self.cardNumber
                                         vc.expiryDate = self.expiryDate
                                         vc.cvv = self.cvv
                                         vc.nameOnCard = self.nameOnCard
-                                        vc.billingInfoData = self.billingInfoData
-                                        vc.billingInfo = self.billingInfo
-                                        vc.selectedPaymentMethod = self.selectedPaymentMethod
-                                        vc.easyPayDelegate = self.easyPayDelegate
-                                        vc.email = self.txtFieldEmail.text
-                                        vc.isSavedForFuture = self.isSavedForFuture
-                                        vc.request = self.request
-                                        vc.chosenPlan = self.chosenPlan
-                                        vc.startDate = self.startDate
-                                        vc.userEmail = self.userEmail
-                                        vc.billingInfo = self.billingInfo
-                                        vc.additionalInfo = self.additionalInfo
-                                        vc.visibility = self.visibility
-                                        self.navigationController?.pushViewController(vc, animated: true)
-                                    }
-                                }
-                                else if self.selectedPaymentMethod == "Bank" {
-                                    if let vc = self.storyboard?.instantiateViewController(withIdentifier: "OTPVerificationVC") as? OTPVerificationVC {
+
+                                    case "Bank":
                                         vc.accountName = self.accountName
                                         vc.routingNumber = self.routingNumber
                                         vc.accountType = self.accountType
                                         vc.accountNumber = self.accountNumber
-                                        vc.billingInfoData = self.billingInfoData
-                                        vc.billingInfo = self.billingInfo
-                                        vc.selectedPaymentMethod = self.selectedPaymentMethod
-                                        vc.easyPayDelegate = self.easyPayDelegate
-                                        vc.email = self.txtFieldEmail.text
-                                        vc.chosenPlan = self.chosenPlan
-                                        vc.startDate = self.startDate
-                                        vc.request = self.request
-                                        vc.userEmail = self.userEmail
-                                        vc.billingInfo = self.fieldSection?.billing
-                                        vc.additionalInfo = self.fieldSection?.additional
-                                        vc.visibility = self.fieldSection?.visibility
-                                        self.navigationController?.pushViewController(vc, animated: true)
-                                    }
-                                }
-                                else if self.selectedPaymentMethod == "GrailPay" {
-                                    if let vc = self.storyboard?.instantiateViewController(withIdentifier: "OTPVerificationVC") as? OTPVerificationVC {
-                                        vc.selectedPaymentMethod = self.selectedPaymentMethod
-                                        vc.easyPayDelegate = self.easyPayDelegate
-                                        vc.grailPayAccountID = self.grailPayAccountID
-                                        vc.selectedGrailPayAccountType = self.selectedGrailPayAccountType
-                                        vc.selectedGrailPayAccountName = self.selectedGrailPayAccountName
-                                        vc.email = self.txtFieldEmail.text
-                                        vc.chosenPlan = self.chosenPlan
-                                        vc.startDate = self.startDate
-                                        vc.request = self.request
-                                        vc.billingInfoData = self.billingInfoData
-                                        vc.billingInfo = self.billingInfo
-                                        vc.userEmail = self.userEmail
-                                        vc.billingInfo = self.fieldSection?.billing
-                                        vc.additionalInfo = self.fieldSection?.additional
-                                        vc.visibility = self.fieldSection?.visibility
-                                        self.navigationController?.pushViewController(vc, animated: true)
-                                    }
-                                }
-                                else if self.selectedPaymentMethod == "NewGrailPayAccount" {
-                                    if let vc = self.storyboard?.instantiateViewController(withIdentifier: "OTPVerificationVC") as? OTPVerificationVC {
-                                        vc.selectedPaymentMethod = self.selectedPaymentMethod
-                                        vc.easyPayDelegate = self.easyPayDelegate
+
+                                    case "GrailPay":
                                         vc.grailPayAccountID = self.grailPayAccountID
                                         vc.selectedGrailPayAccountType = self.selectedGrailPayAccountType
                                         vc.selectedGrailPayAccountName = self.selectedGrailPayAccountName
-                                        vc.email = self.txtFieldEmail.text
-                                        vc.chosenPlan = self.chosenPlan
-                                        vc.startDate = self.startDate
-                                        vc.request = self.request
-                                        vc.billingInfoData = self.billingInfoData
-                                        vc.billingInfo = self.billingInfo
-                                        vc.userEmail = self.userEmail
-                                        vc.billingInfo = self.fieldSection?.billing
-                                        vc.additionalInfo = self.fieldSection?.additional
-                                        vc.visibility = self.fieldSection?.visibility
-                                        self.navigationController?.pushViewController(vc, animated: true)
+
+                                    default:
+                                        break
                                     }
+
+                                    self.navigationController?.pushViewController(vc, animated: true)
                                 }
                             }
                         } else {