@jimrising/easymerchantsdk-react-native 1.4.4 → 1.4.5

package/README.md

@@ -7,7 +7,7 @@ To add the path of sdk in your project. Open your `package.json` file and inside
 
 ```json
 "dependencies": {
-  "@jimrising/easymerchantsdk-react-native": "^1.4.4"
+  "@jimrising/easymerchantsdk-react-native": "^1.4.5"
 },
 ```
 

package/ios/Pods/ViewControllers/PaymentInformation/PaymentInfoVC.swift

@@ -2251,7 +2251,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         let showAdditional = fieldSection.visibility.additional
                         
                         if !showBilling && !showAdditional {
-                            self.threeDSecurePaymentNewCardApi(customerId: UserStoreSingleton.shared.customerId ?? "")
+                            if self.request.secureAuthentication == true {
+                                self.threeDSecurePaymentNewCardApi(customerId: UserStoreSingleton.shared.customerId ?? "")
+                            } else {
+                                self.paymentIntentAddNewCardApi(customerId: UserStoreSingleton.shared.customerId)
+                            }
                         }
                         else if showBilling {
                             // Push to BillingInfoVC
@@ -4177,7 +4181,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             if self.isSavedForFuture {
                                 self.navigateCardDataToEmailVerificationVC()
                             } else {
-                                self.threeDSecurePaymentApi()
+                                if self.request.secureAuthentication == true {
+                                    self.threeDSecurePaymentApi()
+                                } else {
+                                    self.paymentIntentCardApi()
+                                }
                             }
                         }
                         else if showBilling {
@@ -5825,6 +5833,214 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         task.resume()
     }
     
+    // MARK: - Credit Card Charge Api if billing info is available but visibility of billing and additinal is false
+    func paymentIntentCardApi() {
+        showLoadingIndicator()
+        
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.charges.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")
+        
+        var params: [String: Any] = [
+            "name": cardNameTextField.text,
+            "email": UserStoreSingleton.shared.merchantEmail ?? "",
+            "card_number": cardNumberTextField.text.replacingOccurrences(of: " ", with: ""),
+            "cardholder_name": cardNameTextField.text,
+            "exp_month": cardExpiryTextField.text.components(separatedBy: "/").first ?? "",
+            "exp_year": cardExpiryTextField.text.components(separatedBy: "/").last ?? "",
+            "cvc": cardCvvTextField.text,
+            "currency": "usd"
+        ]
+        
+        if let billingInfoData = request.billingInfoData {
+            do {
+                let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
+
+                // Billing Info
+                let billing = fieldSection.billing
+                if !billing.isEmpty {
+                    var billingDict: [String: Any] = [:]
+                    billing.forEach { billingDict[$0.name] = $0.value }
+
+                    if let address = billingDict["address"] as? String, !address.isEmpty {
+                        params["address"] = address
+                    }
+                    if let country = billingDict["country"] as? String, !country.isEmpty {
+                        params["country"] = country
+                    }
+                    if let state = billingDict["state"] as? String, !state.isEmpty {
+                        params["state"] = state
+                    }
+                    if let city = billingDict["city"] as? String, !city.isEmpty {
+                        params["city"] = city
+                    }
+                    if let postalCode = billingDict["postal_code"] as? String, !postalCode.isEmpty {
+                        params["zip"] = postalCode
+                    }
+                }
+
+                // Additional Info
+                let additional = fieldSection.additional
+                if !additional.isEmpty {
+                    var additionalDict: [String: Any] = [:]
+                    additional.forEach { additionalDict[$0.name] = $0.value }
+
+                    if let desc = additionalDict["description"] as? String, !desc.isEmpty {
+                        params["description"] = desc
+                    } else {
+                        params["description"] = "Hosted payment checkout"
+                    }
+
+                    if let phone = additionalDict["phone_number"] as? String, !phone.isEmpty {
+                        params["phone_number"] = phone
+                    }
+                    if let email = additionalDict["email"] as? String, !email.isEmpty {
+                        params["email"] = email
+                    }
+                    if let name = additionalDict["name"] as? String, !name.isEmpty {
+                        params["name"] = name
+                    }
+                } else {
+                    // If no description in additional info, set default
+                    params["description"] = "Hosted payment checkout"
+                }
+
+            } catch {
+                print("Failed to decode FieldSection: \(error)")
+                params["description"] = "Hosted payment checkout"
+            }
+        } else {
+            // Fallback if billingInfoData is missing
+            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 = txtFieldStartDateCard?.text, !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"] = txtFieldChosePlanCard.text.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()
+            }
+            
+            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
+            }
+            
+            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)")
+                            
+                            if let status = responseObject["status"] as? Int, status == 0 {
+                                let errorMessage = responseObject["message"] as? String ?? "Unknown error occurred."
+                                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 info and additional info if available
+                                        if let billingInfoData = self.request.billingInfoData,
+                                           let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
+                                            
+                                            // Filter billing info: only include non-empty values
+                                            let filteredBilling = fieldSection.billing.filter { !($0.value.trimmingCharacters(in: .whitespaces).isEmpty) }
+                                            paymentDoneVC.billingInfoData = filteredBilling
+                                            var billingDict: [String: Any] = [:]
+                                            filteredBilling.forEach { billingDict[$0.name] = $0.value }
+                                            paymentDoneVC.billingInfo = billingDict
+
+                                            // Filter additional info: only include non-empty values
+                                            let filteredAdditional = fieldSection.additional.filter { !($0.value.trimmingCharacters(in: .whitespaces).isEmpty) }
+                                            paymentDoneVC.additionalInfoData = filteredAdditional
+                                            var additionalDict: [String: Any] = [:]
+                                            filteredAdditional.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 response: \(jsonError.localizedDescription)")
+                    }
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "No data received from server.")
+                }
+            } 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: - Credit Card Charge API (Saved Cards, No Billing Info, Logged In)
     func paymentIntentFromShowSavedCardApi() {
         showLoadingIndicator()
@@ -6432,6 +6648,237 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         task.resume()
     }
     
+    //MARK: - Credit Card Charge Api from Add new card from saved cards if billing info is available but their visibility is off
+    func paymentIntentAddNewCardApi(customerId: String?) {
+        showLoadingIndicator()
+        
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.charges.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 ?? ""
+        
+        // Get the text fields from the selected cell and trim whitespace
+        let nameText = txtFieldNameOnCardNewCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+        let cvvText = txtFieldCVVNewCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+        let cardNumberText = (txtFieldCardNumberNewCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? "").replacingOccurrences(of: " ", with: "")
+        let expiryText = txtFieldExpiryDateNewCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+        
+        var params: [String: Any] = [
+            "name": nameText,
+            "card_number": cardNumberText,
+            "cardholder_name": nameText,
+            "exp_month": expiryText.components(separatedBy: "/").first ?? "",
+            "exp_year": expiryText.components(separatedBy: "/").last ?? "",
+            "cvc": cvvText,
+            "description": "TestDescription",
+            "currency": "usd",
+            "payment_method": "card",
+            "save_card": isSavedNewCardForFuture ? 1 : 0,
+            "email" : UserStoreSingleton.shared.verificationEmail ?? ""
+        ]
+        
+        // Add is_default parameter if save_card is 1
+        if isSavedNewCard {
+            params["is_default"] = "1"
+        }
+        
+        if let billingInfoData = request.billingInfoData {
+            do {
+                let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
+
+                // Billing Info
+                let billing = fieldSection.billing
+                if !billing.isEmpty {
+                    var billingDict: [String: Any] = [:]
+                    billing.forEach { billingDict[$0.name] = $0.value }
+
+                    if let address = billingDict["address"] as? String, !address.isEmpty {
+                        params["address"] = address
+                    }
+                    if let country = billingDict["country"] as? String, !country.isEmpty {
+                        params["country"] = country
+                    }
+                    if let state = billingDict["state"] as? String, !state.isEmpty {
+                        params["state"] = state
+                    }
+                    if let city = billingDict["city"] as? String, !city.isEmpty {
+                        params["city"] = city
+                    }
+                    if let postalCode = billingDict["postal_code"] as? String, !postalCode.isEmpty {
+                        params["zip"] = postalCode
+                    }
+                }
+
+                // Additional Info
+                let additional = fieldSection.additional
+                if !additional.isEmpty {
+                    var additionalDict: [String: Any] = [:]
+                    additional.forEach { additionalDict[$0.name] = $0.value }
+
+                    if let desc = additionalDict["description"] as? String, !desc.isEmpty {
+                        params["description"] = desc
+                    } else {
+                        params["description"] = "Hosted payment checkout"
+                    }
+
+                    if let phone = additionalDict["phone_number"] as? String, !phone.isEmpty {
+                        params["phone_number"] = phone
+                    }
+                    if let email = additionalDict["email"] as? String, !email.isEmpty {
+                        params["email"] = email
+                    }
+                    if let name = additionalDict["name"] as? String, !name.isEmpty {
+                        params["name"] = name
+                    }
+                } else {
+                    // If no description in additional info, set default
+                    params["description"] = "Hosted payment checkout"
+                }
+
+            } catch {
+                print("Failed to decode FieldSection: \(error)")
+                params["description"] = "Hosted payment checkout"
+            }
+        } else {
+            // Fallback if billingInfoData is missing
+            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 = txtFieldSelectDateNewCardView?.text, !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"] = txtFieldSelectPlanNewCardView.text.lowercased()
+        }
+        
+        if let customerId = customerId {
+            params["customer"] = customerId
+            params["customer_id"] = customerId
+        } else {
+            params["username"] = emailPrefix
+            params["email"] = UserStoreSingleton.shared.verificationEmail
+        }
+        
+        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 info and additional info if available
+                                        if let billingInfoData = self.request.billingInfoData,
+                                           let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
+                                            
+                                            // Filter billing info: only include non-empty values
+                                            let filteredBilling = fieldSection.billing.filter { !($0.value.trimmingCharacters(in: .whitespaces).isEmpty) }
+                                            paymentDoneVC.billingInfoData = filteredBilling
+                                            var billingDict: [String: Any] = [:]
+                                            filteredBilling.forEach { billingDict[$0.name] = $0.value }
+                                            paymentDoneVC.billingInfo = billingDict
+
+                                            // Filter additional info: only include non-empty values
+                                            let filteredAdditional = fieldSection.additional.filter { !($0.value.trimmingCharacters(in: .whitespaces).isEmpty) }
+                                            paymentDoneVC.additionalInfoData = filteredAdditional
+                                            var additionalDict: [String: Any] = [:]
+                                            filteredAdditional.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: - Update Cards Api.
     func updateCardApi(cardID: String) {
         showLoadingIndicator()

package/ios/easymerchantsdk.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'easymerchantsdk'
-  s.version          = '1.4.4'
+  s.version          = '1.4.5'
   s.summary          = 'A React Native SDK for Easy Merchant.'
   s.description      = <<-DESC
     A React Native SDK to enable Easy Merchant functionality in mobile applications.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jimrising/easymerchantsdk-react-native",
-  "version": "1.4.4",
+  "version": "1.4.5",
   "description": "",
   "main": "index.js",
   "scripts": {