@jimrising/easymerchantsdk-react-native 1.4.3 → 1.4.4

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.3"
+  "@jimrising/easymerchantsdk-react-native": "^1.4.4"
 },
 ```
 
@@ -165,7 +165,7 @@ const App = () => {
 
   const handleBilling = async () => {
     const billingInfo = {
-      visibility: { billing: true, additional: true },
+      visibility: { billing: false, additional: false },
       billing: {
         address: 'Mohali, Punjab',
         country: 'India',
@@ -211,6 +211,16 @@ const App = () => {
       fontFamily: '"Inter", sans-serif',
     };
 
+const authConfig = {
+      accessToken: '251|uTijpDGfrS88UR2V1cZNMQ8S4hUJA0sVzsnsoUZF',
+      vendorId: '251',
+      role: 'business',
+      timeout: 10,
+      isSandbox: true,
+      brandingName: 'Lyfecycle Payments',
+      finderSubtitle: 'Search for your bank',
+      searchPlaceholder: 'Enter bank name',
+    };
     try {
       if (Platform.OS === 'android') {
         const result = await RNEasymerchantsdk.billing('72', null);
@@ -225,10 +235,11 @@ const App = () => {
           false, // tokenOnly
           true, // saveCard
           true, // saveAccount
-          false, // authenticatedACH
-          null, // grailPayParams
+          true, // authenticatedACH
+          authConfig, // grailPayParams
           'Submit',
           false, // isRecurring
+          2,   // if  isRecurring == true then numOfCycle required
           ['weekly', 'monthly'],
           'custom',
           '07/07/2025',

package/ios/Classes/EasyMerchantSdk.m

@@ -2,8 +2,8 @@
 #import <React/RCTLog.h>
 #import <React/RCTBridgeModule.h>
 
-#import <easymerchantsdk-Swift.h>
-//#import <easymerchantsdk/easymerchantsdk-Swift.h>
+//#import <easymerchantsdk-Swift.h>
+#import <easymerchantsdk/easymerchantsdk-Swift.h>
 
 @interface EasyMerchantSdk ()
 @property (nonatomic, strong) EasyMerchantSdkPlugin *sdkPluginInstance;
@@ -40,6 +40,7 @@ RCT_EXPORT_METHOD(
     grailPayParams:(NSDictionary *)grailPayParams
     submitButtonText:(NSString *)submitButtonText
     isRecurring:(BOOL)isRecurring
+    numOfCycle:(int)numOfCycle
     recurringIntervals:(NSArray *)recurringIntervals
     recurringStartDateType:(NSString *)recurringStartDateType
     recurringStartDate:(NSString *)recurringStartDate
@@ -67,6 +68,7 @@ RCT_EXPORT_METHOD(
                          grailPayParams:grailPayParams
                        submitButtonText:submitButtonText
                             isRecurring:isRecurring
+                             numOfCycle:numOfCycle
                      recurringIntervals:recurringIntervals
                  recurringStartDateType:recurringStartDateType
                      recurringStartDate:recurringStartDate

package/ios/Classes/EasyMerchantSdk.swift

@@ -69,6 +69,7 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
         grailPayParams: [String: Any]?,
         submitButtonText: String?,
         isRecurring: Bool,
+        numOfCycle: Int,
         recurringIntervals: [String]?,
         recurringStartDateType: String?,
         recurringStartDate: String?,
@@ -215,6 +216,7 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
             authenticatedACH: authenticatedACH,
             grailPayParams: grailParams,
             is_recurring: isRecurring,
+            numOfCycle: numOfCycle,
             recurringIntervals: intervals,
             recurringStartDateType: startType,
             recurringStartDate: recurringStartDate,

package/ios/Models/Request.swift

@@ -106,14 +106,14 @@ public struct FieldItem: Codable {
     public let name: String
     public let required: Bool
     public var value: String
-
+    
     // Overloaded initializer for BillingFieldName
     public init(name: BillingFieldName, required: Bool, value: String) {
         self.name = name.rawValue
         self.required = required
         self.value = value
     }
-
+    
     // Overloaded initializer for AdditionalFieldName
     public init(name: AdditionalFieldName, required: Bool, value: String) {
         self.name = name.rawValue
@@ -125,7 +125,7 @@ public struct FieldItem: Codable {
 public struct FieldsVisibility: Codable {
     public let billing: Bool
     public let additional: Bool
-
+    
     public init(billing: Bool, additional: Bool) {
         self.billing = billing
         self.additional = additional
@@ -136,7 +136,7 @@ public struct FieldSection: Codable {
     public let visibility: FieldsVisibility
     public var billing: [FieldItem]
     public var additional: [FieldItem]
-
+    
     public init(visibility: FieldsVisibility, billing: [FieldItem], additional: [FieldItem]) {
         self.visibility = visibility
         self.billing = billing
@@ -158,6 +158,7 @@ public final class Request: NSObject {
     public let authenticatedACH: Bool?
     public let grailPayParams: GrailPayRequest?
     public var is_recurring: Bool?
+    public var numOfCycle: Int?
     public var recurringIntervals: [RecurringIntervals]?
     public var recurringStartDateType: RecurringStartDateType?
     public var recurringStartDate: String?
@@ -167,7 +168,7 @@ public final class Request: NSObject {
     public let showSubmitButton: Bool?
     public let referenceID: Bool?
     public let referenceToken: String?
-        
+    
     public init(
         amount: Double? = nil,
         currency: String? = nil,
@@ -181,6 +182,7 @@ public final class Request: NSObject {
         authenticatedACH: Bool = false,
         grailPayParams: GrailPayRequest? = nil,
         is_recurring: Bool = false,
+        numOfCycle: Int? = nil,
         recurringIntervals: [RecurringIntervals]? = nil,
         recurringStartDateType: RecurringStartDateType? = nil,
         recurringStartDate: String? = nil,
@@ -191,7 +193,6 @@ public final class Request: NSObject {
         referenceID: Bool = false,
         referenceToken: String? = nil
     ) {
-        
         // Validate if amount is provided, must be ≥ 0.50
         if let amt = amount, amt < 0.50 {
             DispatchQueue.main.async {
@@ -223,6 +224,7 @@ public final class Request: NSObject {
         self.authenticatedACH = authenticatedACH
         self.grailPayParams = authenticatedACH ? grailPayParams : nil
         self.is_recurring = is_recurring
+        self.numOfCycle = numOfCycle
         self.recurringIntervals = recurringIntervals
         self.recurringStartDateType = recurringStartDateType
         self.recurringStartDate = recurringStartDate
@@ -236,11 +238,13 @@ public final class Request: NSObject {
         // Conditionally assign recurring fields only if is_recurring == true
         if is_recurring {
             self.is_recurring = true
+            self.numOfCycle = numOfCycle
             self.recurringIntervals = recurringIntervals
             self.recurringStartDateType = recurringStartDateType
             self.recurringStartDate = recurringStartDate
         } else {
             self.is_recurring = false
+            self.numOfCycle = nil
             self.recurringIntervals = nil
             self.recurringStartDateType = nil
             self.recurringStartDate = nil
@@ -304,7 +308,7 @@ public final class Request: NSObject {
     //MARK: - Payment Intent Api
     func paymentIntentApi(completion: @escaping (Bool) -> Void) {
         guard let serviceURL = URL(string: EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.paymentIntent.path()) else {
-            print("Invalid URL")
+            showErrorAndDismiss(message: "Invalid payment URL.")
             completion(false)
             return
         }
@@ -315,31 +319,14 @@ public final class Request: NSObject {
         request.addValue(EnvironmentConfig.apiKey ?? "", forHTTPHeaderField: "X-Api-Key")
         request.addValue(EnvironmentConfig.apiSecret ?? "", forHTTPHeaderField: "X-Api-Secret")
         
-        // Check if recurringStartDate is not in the past
+        // Recurring date validation
         if let startDateString = recurringStartDate,
            let startDate = DateFormatter.recurringDateFormatter.date(from: startDateString) {
-            
             let today = Calendar.current.startOfDay(for: Date())
             let startDay = Calendar.current.startOfDay(for: startDate)
             
             if startDay < today {
-                DispatchQueue.main.async {
-                    if let topVC = UIApplication.topViewController() {
-                        let alert = UIAlertController(title: "Invalid Date",
-                                                      message: "The recurring start date cannot be in the past. Please select today or a future date.",
-                                                      preferredStyle: .alert)
-                        alert.addAction(UIAlertAction(title: "OK", style: .default, handler: { _ in
-                            if let easyPayVC = UIApplication.findEasyPayViewController(from: topVC) {
-                                easyPayVC.dismiss(animated: true)
-                            } else {
-                                // fallback: dismiss topVC itself if it's presented modally
-                                topVC.dismiss(animated: true)
-                            }
-                        }))
-                        topVC.present(alert, animated: true)
-                    }
-                }
-                
+                showErrorAndDismiss(message: "The recurring start date cannot be in the past. Please select today or a future date.")
                 completion(false)
                 return
             }
@@ -347,7 +334,8 @@ public final class Request: NSObject {
         
         let params: [String: Any] = [
             "amount": amount ?? 0,
-            "allowed_cycles": String(recurringIntervals?.count ?? 0),
+//            "allowed_cycles": String(recurringIntervals?.count ?? 0),
+            "allowed_cycles": numOfCycle ?? 0,
             "intervals": recurringIntervals?.map { $0.rawValue } ?? [],
             "is_recurring": self.is_recurring ?? false,
             "recurring_start_date": recurringStartDate ?? "",
@@ -355,21 +343,16 @@ public final class Request: NSObject {
         ]
         
         do {
-            
             request.httpBody = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
         } catch {
-            print("Error creating JSON data: \(error)")
+            showErrorAndDismiss(message: "Failed to encode payment data.")
             completion(false)
             return
         }
         
         let task = URLSession.shared.dataTask(with: request) { data, response, error in
-            DispatchQueue.main.async {
-                // Stop loader when response is received
-            }
-            
             guard let httpResponse = response as? HTTPURLResponse, error == nil else {
-                print("Error: \(error?.localizedDescription ?? "Unknown error")")
+                self.showErrorAndDismiss(message: error?.localizedDescription ?? "An unknown error occurred.")
                 completion(false)
                 return
             }
@@ -378,51 +361,60 @@ public final class Request: NSObject {
                 if let data = data {
                     do {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
-                            print("Response Data: \(responseObject)")
-                            
-                            // Save tokens
                             if let clientToken = responseObject["client_token"] as? String {
                                 UserStoreSingleton.shared.clientToken = clientToken
-                                print("Client Token successfully saved: \(UserStoreSingleton.shared.clientToken ?? "None")")
                             }
-                            
                             if let paymentIntent = responseObject["payment_intent"] as? String {
                                 UserStoreSingleton.shared.paymentIntent = paymentIntent
                             }
-                            
                             self.hostedCheckoutsApi { success in
                                 completion(success)
                             }
+                            return
                         } else {
-                            print("Invalid JSON format")
-                            completion(false)
+                            self.showErrorAndDismiss(message: "Invalid response format.")
                         }
                     } catch {
-                        print("Error parsing JSON: \(error)")
-                        completion(false)
+                        self.showErrorAndDismiss(message: "Failed to parse response.")
                     }
                 } else {
-                    print("No data received")
-                    completion(false)
+                    self.showErrorAndDismiss(message: "No response data received.")
                 }
             } else {
+                var message = "Payment request failed with status code: \(httpResponse.statusCode)"
                 if let data = data,
                    let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
-                   let message = responseObj["message"] as? String {
-                    print(message)
-                } else {
-                    print("HTTP Status Code: \(httpResponse.statusCode)")
+                   let msg = responseObj["message"] as? String {
+                    message = msg
                 }
-                
-                completion(false)
+                self.showErrorAndDismiss(message: message)
             }
+            completion(false)
         }
+        
         task.resume()
     }
     
+    private func showErrorAndDismiss(message: String) {
+        DispatchQueue.main.async {
+            if let topVC = UIApplication.topViewController() {
+                let alert = UIAlertController(title: "Payment Error",
+                                              message: message,
+                                              preferredStyle: .alert)
+                alert.addAction(UIAlertAction(title: "OK", style: .default, handler: { _ in
+                    if let easyPayVC = UIApplication.findEasyPayViewController(from: topVC) {
+                        easyPayVC.dismiss(animated: true)
+                    } else {
+                        topVC.dismiss(animated: true)
+                    }
+                }))
+                topVC.present(alert, animated: true)
+            }
+        }
+    }
+    
     // MARK: - Hosted Checkout API
     func hostedCheckoutsApi(completion: @escaping (Bool) -> Void) {
-        
         // Build the URL using EnvironmentConfig
         guard let baseURL = URL(string: EnvironmentConfig.baseURL) else {
             print("Invalid base URL")
@@ -645,4 +637,3 @@ extension UIApplication {
     }
 }
 
-

package/ios/Models/Result.swift

@@ -47,3 +47,4 @@ public final class Result: NSObject {
         super.init()
     }
 }
+

package/ios/Pods/ViewControllers/AdditionalInfoVC.swift

@@ -319,44 +319,51 @@ class AdditionalInfoVC: BaseVC {
         
         // MARK: - Flow Based on Conditions
         if isSavedForFuture {
-            if let emailVerificationVC = self.storyboard?.instantiateViewController(withIdentifier: "EmailVerificationVC") as? EmailVerificationVC {
-                // Pass data to EmailVerificationVC
-                emailVerificationVC.billingInfoData = billingInfoData
-                emailVerificationVC.selectedPaymentMethod = selectedPaymentMethod
-                emailVerificationVC.easyPayDelegate = easyPayDelegate
-                emailVerificationVC.request = request
-                emailVerificationVC.chosenPlan = chosenPlan
-                emailVerificationVC.startDate = startDate
-                emailVerificationVC.userEmail = userEmail
-                emailVerificationVC.billingInfo = fieldSection?.billing
-                emailVerificationVC.additionalInfo = fieldSection?.additional
-                emailVerificationVC.visibility = fieldSection?.visibility
-                emailVerificationVC.amount = amount
-                
-                // Extra fields per payment method
-                if selectedPaymentMethod == "Card" {
-                    emailVerificationVC.cardNumber = cardNumber
-                    emailVerificationVC.expiryDate = expiryDate
-                    emailVerificationVC.cvv = cvv
-                    emailVerificationVC.nameOnCard = nameOnCard
-                } else if selectedPaymentMethod == "Bank" {
-                    emailVerificationVC.accountName = accountName
-                    emailVerificationVC.routingNumber = routingNumber
-                    emailVerificationVC.accountType = accountType
-                    emailVerificationVC.accountNumber = accountNumber
-                } else if selectedPaymentMethod == "GrailPay" {
-                    emailVerificationVC.grailPayAccountID = grailPayAccountID
-                    emailVerificationVC.selectedGrailPayAccountType = selectedGrailPayAccountType
-                    emailVerificationVC.selectedGrailPayAccountName = selectedGrailPayAccountName
-                    emailVerificationVC.isSavedForFuture = true
-                } else if selectedPaymentMethod == "NewGrailPayAccount" {
-                    emailVerificationVC.grailPayAccountID = grailPayAccountID
-                    emailVerificationVC.selectedGrailPayAccountType = selectedGrailPayAccountType
-                    emailVerificationVC.selectedGrailPayAccountName = selectedGrailPayAccountName
-                    emailVerificationVC.isSavedForFuture = true
+            if selectedPaymentMethod == "NewGrailPayAccount" {
+                // Only call API, do NOT navigate
+                grailPayAccountChargeApi(customerId: UserStoreSingleton.shared.customerId)
+            } else {
+                // Navigate to EmailVerificationVC for all other payment methods
+                if let emailVerificationVC = self.storyboard?.instantiateViewController(withIdentifier: "EmailVerificationVC") as? EmailVerificationVC {
+                    
+                    emailVerificationVC.billingInfoData = billingInfoData
+                    emailVerificationVC.selectedPaymentMethod = selectedPaymentMethod
+                    emailVerificationVC.easyPayDelegate = easyPayDelegate
+                    emailVerificationVC.request = request
+                    emailVerificationVC.chosenPlan = chosenPlan
+                    emailVerificationVC.startDate = startDate
+                    emailVerificationVC.userEmail = userEmail
+                    emailVerificationVC.billingInfo = fieldSection?.billing
+                    emailVerificationVC.additionalInfo = fieldSection?.additional
+                    emailVerificationVC.visibility = fieldSection?.visibility
+                    emailVerificationVC.amount = amount
+                    
+                    // Payment method-specific data
+                    switch selectedPaymentMethod {
+                    case "Card":
+                        emailVerificationVC.cardNumber = cardNumber
+                        emailVerificationVC.expiryDate = expiryDate
+                        emailVerificationVC.cvv = cvv
+                        emailVerificationVC.nameOnCard = nameOnCard
+                        
+                    case "Bank":
+                        emailVerificationVC.accountName = accountName
+                        emailVerificationVC.routingNumber = routingNumber
+                        emailVerificationVC.accountType = accountType
+                        emailVerificationVC.accountNumber = accountNumber
+                        
+                    case "GrailPay":
+                        emailVerificationVC.grailPayAccountID = grailPayAccountID
+                        emailVerificationVC.selectedGrailPayAccountType = selectedGrailPayAccountType
+                        emailVerificationVC.selectedGrailPayAccountName = selectedGrailPayAccountName
+                        emailVerificationVC.isSavedForFuture = true
+                        
+                    default:
+                        break
+                    }
+                    
+                    navigationController?.pushViewController(emailVerificationVC, animated: true)
                 }
-                
-                navigationController?.pushViewController(emailVerificationVC, animated: true)
             }
         }
         else {
@@ -2134,6 +2141,224 @@ class AdditionalInfoVC: 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()
+    }
+    
 }
 
 extension AdditionalInfoVC: UITextFieldDelegate {