@jimrising/easymerchantsdk-react-native 2.0.7 → 2.0.9

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

@@ -228,7 +228,7 @@ class BillingInfoVC: BaseVC {
     private func updateNextButtonTitle() {
         guard let request = request else { return }
         
-        if let billingInfoData = request.billingInfoData,
+        if let billingInfoData = request.fields,
            let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
             
             let isAdditionalVisible = fieldSection.visibility.additional
@@ -777,26 +777,34 @@ class BillingInfoVC: BaseVC {
                 
             }
             else if !isAdditionalVisible && isSavedForFuture {
-                // let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
-                let vc = easymerchantsdk.instantiateViewController(withIdentifier: "OTPVerificationVC") as! OTPVerificationVC
-                vc.cardNumber = cardNumber
-                vc.expiryDate = expiryDate
-                vc.cvv = cvv
-                vc.nameOnCard = nameOnCard
-                vc.userEmail = userEmail
-                vc.billingInfoData = updatedBillingData
-                vc.fieldSection = updatedFieldSection
-                vc.selectedPaymentMethod = selectedPaymentMethod
-                vc.easyPayDelegate = easyPayDelegate
-                vc.request = request
-                vc.chosenPlan = chosenPlan
-                vc.startDate = startDate
-                vc.billingInfo = updatedFieldSection.billing
-                vc.additionalInfo = updatedFieldSection.additional
-                vc.visibility = updatedFieldSection.visibility
-                vc.isSavedForFuture = true
-                vc.amount = amount
-                navigationController?.pushViewController(vc, animated: true)
+                if UserStoreSingleton.shared.isLoggedIn == true {
+                    if request.secureAuthentication == true {
+                        threeDSecurePaymentApi()
+                    } else {
+                        paymentIntentApi()
+                    }
+                } else {
+                    // let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
+                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "OTPVerificationVC") as! OTPVerificationVC
+                    vc.cardNumber = cardNumber
+                    vc.expiryDate = expiryDate
+                    vc.cvv = cvv
+                    vc.nameOnCard = nameOnCard
+                    vc.userEmail = userEmail
+                    vc.billingInfoData = updatedBillingData
+                    vc.fieldSection = updatedFieldSection
+                    vc.selectedPaymentMethod = selectedPaymentMethod
+                    vc.easyPayDelegate = easyPayDelegate
+                    vc.request = request
+                    vc.chosenPlan = chosenPlan
+                    vc.startDate = startDate
+                    vc.billingInfo = updatedFieldSection.billing
+                    vc.additionalInfo = updatedFieldSection.additional
+                    vc.visibility = updatedFieldSection.visibility
+                    vc.isSavedForFuture = true
+                    vc.amount = amount
+                    navigationController?.pushViewController(vc, animated: true)
+                }
             }
             else if !isAdditionalVisible && isFrom == "SavedCards" {
                 paymentIntentFromShowCardApi()
@@ -850,31 +858,35 @@ class BillingInfoVC: BaseVC {
                 navigationController?.pushViewController(vc, animated: true)
             }
             else if !isAdditionalVisible && isSavedForFuture {
-                // let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
-                let vc = easymerchantsdk.instantiateViewController(withIdentifier: "OTPVerificationVC") as! OTPVerificationVC
-                vc.accountName = accountName
-                vc.routingNumber = routingNumber
-                vc.accountType = accountType
-                vc.accountNumber = accountNumber
-                vc.userEmail = userEmail
-                vc.billingInfoData = updatedBillingData
-                vc.fieldSection = updatedFieldSection
-                vc.selectedPaymentMethod = selectedPaymentMethod
-                vc.easyPayDelegate = easyPayDelegate
-                vc.request = self.request
-                vc.chosenPlan = chosenPlan
-                vc.startDate = startDate
-                vc.billingInfo = updatedFieldSection.billing
-                vc.additionalInfo = updatedFieldSection.additional
-                vc.visibility = updatedFieldSection.visibility
-                vc.isSavedForFuture = isSavedForFuture
-                vc.isSavedNewAccount = isSavedNewAccount
-                vc.amount = amount
-                vc.grailPayAccountID = grailPayAccountID
-                vc.selectedGrailPayAccountType = selectedGrailPayAccountType
-                vc.selectedGrailPayAccountName = selectedGrailPayAccountName
-                vc.email = userEmail
-                navigationController?.pushViewController(vc, animated: true)
+                if UserStoreSingleton.shared.isLoggedIn == true {
+                    accountChargeWithSaveApi(customerId: UserStoreSingleton.shared.customerId)
+                } else {
+                    // let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
+                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "OTPVerificationVC") as! OTPVerificationVC
+                    vc.accountName = accountName
+                    vc.routingNumber = routingNumber
+                    vc.accountType = accountType
+                    vc.accountNumber = accountNumber
+                    vc.userEmail = userEmail
+                    vc.billingInfoData = updatedBillingData
+                    vc.fieldSection = updatedFieldSection
+                    vc.selectedPaymentMethod = selectedPaymentMethod
+                    vc.easyPayDelegate = easyPayDelegate
+                    vc.request = self.request
+                    vc.chosenPlan = chosenPlan
+                    vc.startDate = startDate
+                    vc.billingInfo = updatedFieldSection.billing
+                    vc.additionalInfo = updatedFieldSection.additional
+                    vc.visibility = updatedFieldSection.visibility
+                    vc.isSavedForFuture = isSavedForFuture
+                    vc.isSavedNewAccount = isSavedNewAccount
+                    vc.amount = amount
+                    vc.grailPayAccountID = grailPayAccountID
+                    vc.selectedGrailPayAccountType = selectedGrailPayAccountType
+                    vc.selectedGrailPayAccountName = selectedGrailPayAccountName
+                    vc.email = userEmail
+                    navigationController?.pushViewController(vc, animated: true)
+                }
             }
             else if isFrom == "SavedBank" {
                 accountChargeSavedBankAccountApi()
@@ -913,31 +925,35 @@ class BillingInfoVC: BaseVC {
                 navigationController?.pushViewController(vc, animated: true)
             }
             else if !isAdditionalVisible && isSavedForFuture {
-                // let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
-                let vc = easymerchantsdk.instantiateViewController(withIdentifier: "OTPVerificationVC") as! OTPVerificationVC
-                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 = Double(self.request.amount ?? 0)
-                vc.request = request
-                vc.chosenPlan = chosenPlan
-                vc.startDate = startDate
-                vc.grailPayAccountID = grailPayAccountID
-                vc.selectedGrailPayAccountType = selectedGrailPayAccountType
-                vc.selectedGrailPayAccountName = selectedGrailPayAccountName
-                vc.userEmail = userEmail
-                vc.email = userEmail
-                
-                vc.grailPayAccountID = self.grailPayAccountID
-                vc.selectedGrailPayAccountType = self.selectedGrailPayAccountType
-                vc.selectedGrailPayAccountName = self.selectedGrailPayAccountName
-                navigationController?.pushViewController(vc, animated: true)
+                if UserStoreSingleton.shared.isLoggedIn == true {
+                    grailPayAccountChargeApi()
+                } else {
+                    // let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
+                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "OTPVerificationVC") as! OTPVerificationVC
+                    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 = Double(self.request.amount ?? 0)
+                    vc.request = request
+                    vc.chosenPlan = chosenPlan
+                    vc.startDate = startDate
+                    vc.grailPayAccountID = grailPayAccountID
+                    vc.selectedGrailPayAccountType = selectedGrailPayAccountType
+                    vc.selectedGrailPayAccountName = selectedGrailPayAccountName
+                    vc.userEmail = userEmail
+                    vc.email = userEmail
+                    
+                    vc.grailPayAccountID = self.grailPayAccountID
+                    vc.selectedGrailPayAccountType = self.selectedGrailPayAccountType
+                    vc.selectedGrailPayAccountName = self.selectedGrailPayAccountName
+                    navigationController?.pushViewController(vc, animated: true)
+                }
             }
             else {
                 grailPayAccountChargeApi()
@@ -1045,17 +1061,32 @@ class BillingInfoVC: BaseVC {
             params["interval"] = chosenPlan?.lowercased()
         }
         
-        //        // ✅ Include metadata only if it has at least 1 key-value pair
-        //        if let metadata = request?.metadata, !metadata.isEmpty {
-        //            requestBody["metadata"] = metadata
-        //        }
-                
-                // ✅ Flatten metadata into requestBody
-                if let metadata = request?.metadata, !metadata.isEmpty {
-                    for (key, value) in metadata {
-                        params[key] = value
-                    }
-                }
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
+        
+        // ✅ Only for logged-in users
+        if UserStoreSingleton.shared.isLoggedIn == true {
+            let emailText = userEmail
+            let emailPrefix = emailText?.components(separatedBy: "@").first ?? ""
+            
+            params["save_card"] = 1
+            params["is_default"] = "1"
+            params["tokenize"] = request.tokenOnly ?? ""
+            params["username"] = emailPrefix
+            
+            if let customerId = UserStoreSingleton.shared.customerId {
+                params["customer"] = customerId
+                params["customer_id"] = customerId
+            } else {
+                params["create_customer"] = "1"
+            }
+            
+            if UserStoreSingleton.shared.customerId == nil {
+                params["create_customer"] = "1"
+            }
+        }
         
         print(params)
         
@@ -1199,6 +1230,28 @@ class BillingInfoVC: BaseVC {
             "tokenize": request.tokenOnly ?? false
         ]
         
+        // ✅ Only for logged-in users
+        if UserStoreSingleton.shared.isLoggedIn == true {
+            let emailText = userEmail
+            let emailPrefix = emailText?.components(separatedBy: "@").first ?? ""
+            
+            params["save_card"] = 1
+            params["is_default"] = "1"
+            params["tokenize"] = request.tokenOnly ?? ""
+            params["username"] = emailPrefix
+            
+            if let customerId = UserStoreSingleton.shared.customerId {
+                params["customer"] = customerId
+                params["customer_id"] = customerId
+            } else {
+                params["create_customer"] = "1"
+            }
+            
+            if UserStoreSingleton.shared.customerId == nil {
+                params["create_customer"] = "1"
+            }
+        }
+        
         // Conditionally add billing info
         if let visibility = visibility, visibility.billing == true,
            let billing = billingInfo, !billing.isEmpty {
@@ -1609,17 +1662,10 @@ class BillingInfoVC: BaseVC {
             params["email"] = UserStoreSingleton.shared.verificationEmail
         }
         
-        //        // ✅ Include metadata only if it has at least 1 key-value pair
-        //        if let metadata = request?.metadata, !metadata.isEmpty {
-        //            requestBody["metadata"] = metadata
-        //        }
-                
-                // ✅ Flatten metadata into requestBody
-                if let metadata = request?.metadata, !metadata.isEmpty {
-                    for (key, value) in metadata {
-                        params[key] = value
-                    }
-                }
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
         
         print(params)
         
@@ -1805,17 +1851,10 @@ class BillingInfoVC: BaseVC {
             params["interval"] = chosenPlan?.lowercased()
         }
         
-        //        // ✅ Include metadata only if it has at least 1 key-value pair
-        //        if let metadata = request?.metadata, !metadata.isEmpty {
-        //            requestBody["metadata"] = metadata
-        //        }
-                
-                // ✅ Flatten metadata into requestBody
-                if let metadata = request?.metadata, !metadata.isEmpty {
-                    for (key, value) in metadata {
-                        params[key] = value
-                    }
-                }
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
         
         print(params)
         
@@ -1982,6 +2021,11 @@ class BillingInfoVC: BaseVC {
             params["interval"] = chosenPlan?.lowercased()
         }
         
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
+        
         print(params)
         
         do {
@@ -2152,6 +2196,11 @@ class BillingInfoVC: BaseVC {
             params["interval"] = chosenPlan?.lowercased()
         }
         
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
+        
         print(params)
         
         do {
@@ -2332,6 +2381,199 @@ class BillingInfoVC: BaseVC {
             params["interval"] = chosenPlan?.lowercased()
         }
         
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
+        
+        print(params)
+        
+        do {
+            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
+                                        paymentDoneVC.bankPaymentParams = params
+                                        // Pass billing and additional info
+                                        // Conditionally pass raw FieldItem array
+                                        paymentDoneVC.visibility = self.visibility
+                                        paymentDoneVC.request = self.request
+                                        
+                                        //  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: - Account Charge Api if user logged in and saved the account.
+    func accountChargeWithSaveApi(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")
+        
+        let emailPrefix = UserStoreSingleton.shared.verificationEmail?.components(separatedBy: "@").first ?? ""
+        
+        var params: [String: Any] = [
+           // "name": accountName ?? "",
+            "name": !(request.name?.isEmpty ?? true) ? request.name! : (accountName ?? ""),
+            "email": userEmail ?? "",
+            "currency": "usd",
+            "account_type": accountType?.lowercased() ?? "",
+            "routing_number": routingNumber ?? "",
+            "account_number": accountNumber ?? "",
+            "payment_mode": "auth_and_capture",
+            "payment_intent": UserStoreSingleton.shared.paymentIntent ?? "",
+            "levelIndicator": 1,
+            "save_account": 1,
+            "payment_method": "ach"
+        ]
+        
+        if let customerId = customerId {
+            params["customer"] = customerId
+        } else {
+            params["username"] = emailPrefix
+        }
+        
+        if customerId == nil {
+            params["create_customer"] = "1"
+        }
+        
+        // Conditionally add billing info
+        if let visibility = visibility, visibility.billing == true,
+           let billing = billingInfo, !billing.isEmpty {
+            
+            var billingInfoDict: [String: Any] = [:]
+            for item in billing {
+                billingInfoDict[item.name] = item.value
+            }
+            
+            params["address"] = billingInfoDict["address"] as? String ?? ""
+            params["country"] = billingInfoDict["country"] as? String ?? ""
+            params["state"] = billingInfoDict["state"] as? String ?? ""
+            params["city"] = billingInfoDict["city"] as? String ?? ""
+            params["zip"] = billingInfoDict["postal_code"] as? String ?? ""
+        }
+        
+        // Set default description if additional info is not visible
+        if let visibility = visibility, visibility.additional == false {
+            params["description"] = "Hosted payment checkout"
+        }
+        
+        // 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()
+        }
+        
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
+        
         print(params)
         
         do {
@@ -2459,6 +2701,26 @@ class BillingInfoVC: BaseVC {
             "email": userEmail ?? ""
         ]
         
+        // ✅ Only add these params for logged-in users
+        if UserStoreSingleton.shared.isLoggedIn == true {
+            let emailText = userEmail
+            let emailPrefix = emailText?.components(separatedBy: "@").first ?? ""
+            
+            params["save_account"] = 1
+            params["is_default"] = 1
+            params["customer_id"] = UserStoreSingleton.shared.customerId ?? ""
+            
+            if let customerId = UserStoreSingleton.shared.customerId, !customerId.isEmpty {
+                params["customer"] = customerId
+            } else {
+                params["username"] = emailPrefix
+            }
+            
+            if UserStoreSingleton.shared.customerId == nil {
+                params["create_customer"] = "1"
+            }
+        }
+        
         // Conditionally add billing info
         if let visibility = visibility, visibility.billing == true,
            let billing = billingInfo, !billing.isEmpty {
@@ -2503,6 +2765,11 @@ class BillingInfoVC: BaseVC {
             params["interval"] = chosenPlan?.lowercased()
         }
         
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
+        
         print(params)
         
         do {
@@ -2723,6 +2990,11 @@ class BillingInfoVC: BaseVC {
             params["interval"] = chosenPlan?.lowercased()
         }
         
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
+        
         print(params)
         
         do {