@jimrising/easymerchantsdk-react-native 2.3.8 → 2.4.0

package/ios/Pods/UserDefaults/UserStoreSingleton.swift

@@ -148,6 +148,24 @@ class UserStoreSingleton: NSObject {
         }
     }
     
+    var customerEmail: String? {
+        get {
+            return UserDefaults.standard.string(forKey: "customer_email")
+        }
+        set {
+            UserDefaults.standard.set(newValue, forKey: "customer_email")
+        }
+    }
+    
+    var customerName: String? {
+        get {
+            return UserDefaults.standard.string(forKey: "customer_name")
+        }
+        set {
+            UserDefaults.standard.set(newValue, forKey: "customer_name")
+        }
+    }
+    
     var verificationEmail: String? {
         get {
             return UserDefaults.standard.string(forKey: "verificationEmail")

package/ios/Pods/ViewControllers/AdditionalInfoVC.swift

@@ -319,57 +319,6 @@ class AdditionalInfoVC: BaseVC {
             return
         }
         
-        // MARK: - Flow Based on Conditions
-//        if isSavedForFuture {
-//            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: "OTPVerificationVC") as? OTPVerificationVC {
-//                    
-//                    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
-//                    emailVerificationVC.email = userEmail
-//                    
-//                    // 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)
-//                }
-//            }
-//        }
-        
         // MARK: - Flow Based on Conditions
         if isSavedForFuture {
             // ✅ If logged in → Call API directly, no navigation
@@ -536,8 +485,10 @@ class AdditionalInfoVC: BaseVC {
             let emailText = userEmail
             let emailPrefix = emailText?.components(separatedBy: "@").first ?? ""
             
-            params["save_card"] = 1
-            params["is_default"] = "1"
+            params["save_card"] = isSavedNewCard ? 1 : 0
+            if isSavedNewCard {
+                params["is_default"] = "1"
+            }
             params["tokenize"] = request.tokenOnly ?? ""
             params["username"] = emailPrefix
             
@@ -664,10 +615,28 @@ class AdditionalInfoVC: BaseVC {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
                             print("Response Data: \(responseObject)")
                             
+                            // ✅ Handle duplicate transaction case
+                            if let status = responseObject["status"] as? Bool, status == false,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            if let status = responseObject["status"] as? Int, status == 0,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            // ✅ Handle generic "status == 0" error case
                             if let status = responseObject["status"] as? Int, status == 0 {
-                                let errorMessage = responseObject["message"] as? String ?? "Unknown error occurred."
+                                let errorMessage = responseObject["message"] as? String ?? "Unknown error"
                                 self.presentPaymentErrorVC(errorMessage: errorMessage)
-                            } else {
+                                return
+                            }
+                            else {
                                 DispatchQueue.main.async {
                                     if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
                                         paymentDoneVC.chargeData = responseObject
@@ -753,8 +722,22 @@ class AdditionalInfoVC: BaseVC {
         // Extract only the digits from the phone number (local only, no country code)
         let localPhone = txtFieldPhoneNumber.text?.components(separatedBy: CharacterSet.decimalDigits.inverted).joined() ?? ""
         
-        let emailText = UserStoreSingleton.shared.verificationEmail ?? ""
-        let emailPrefix = emailText.components(separatedBy: "@").first ?? ""
+//        let emailText = UserStoreSingleton.shared.verificationEmail ?? ""
+//        let emailPrefix = emailText.components(separatedBy: "@").first ?? ""
+        
+        let finalEmail: String
+        if let verificationEmail = UserStoreSingleton.shared.verificationEmail, !verificationEmail.isEmpty {
+            finalEmail = verificationEmail
+        } else {
+            finalEmail = request.email ?? ""
+        }
+
+        let emailPrefix: String
+        if !finalEmail.isEmpty {
+            emailPrefix = finalEmail.components(separatedBy: "@").first ?? ""
+        } else {
+            emailPrefix = ""
+        }
         
         // Determine name: use request.name if available, otherwise fallback to email prefix
         let nameParam: String
@@ -774,7 +757,7 @@ class AdditionalInfoVC: BaseVC {
             "card_id" : selectedCard?.cardId ?? "",
             "cvc" : cvvText ?? "",
             "name": nameParam,
-            "email": UserStoreSingleton.shared.verificationEmail ?? "",
+            "email": finalEmail
         ]
         
         // Conditionally add billing info
@@ -901,11 +884,28 @@ class AdditionalInfoVC: BaseVC {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
                             print("Response Data: \(responseObject)")
                             
-                            // Check if status is 0 and handle the error
+                            // ✅ Handle duplicate transaction case
+                            if let status = responseObject["status"] as? Bool, status == false,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            if let status = responseObject["status"] as? Int, status == 0,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            // ✅ Handle generic "status == 0" error case
                             if let status = responseObject["status"] as? Int, status == 0 {
                                 let errorMessage = responseObject["message"] as? String ?? "Unknown error"
                                 self.presentPaymentErrorVC(errorMessage: errorMessage)
-                            } else {
+                                return
+                            }
+                            else {
                                 DispatchQueue.main.async {
                                     if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
                                         paymentDoneVC.chargeData = responseObject
@@ -987,11 +987,25 @@ class AdditionalInfoVC: BaseVC {
         // Extract only the digits from the phone number (local only, no country code)
         let localPhone = txtFieldPhoneNumber.text?.components(separatedBy: CharacterSet.decimalDigits.inverted).joined() ?? ""
         
-        let emailPrefix = UserStoreSingleton.shared.verificationEmail?.components(separatedBy: "@").first ?? ""
+       // let emailPrefix = UserStoreSingleton.shared.verificationEmail?.components(separatedBy: "@").first ?? ""
+        
+        let finalEmail: String
+        if let verificationEmail = UserStoreSingleton.shared.verificationEmail, !verificationEmail.isEmpty {
+            finalEmail = verificationEmail
+        } else {
+            finalEmail = request.email ?? ""
+        }
+
+        let emailPrefix: String
+        if !finalEmail.isEmpty {
+            emailPrefix = finalEmail.components(separatedBy: "@").first ?? ""
+        } else {
+            emailPrefix = ""
+        }
         
         var params: [String: Any] = [
             "name": nameOnCard ?? "",
-            "email": UserStoreSingleton.shared.verificationEmail ?? "",
+            "email": finalEmail,
             "card_number": cardNumber?.replacingOccurrences(of: " ", with: "") ?? "",
             "cardholder_name": nameOnCard ?? "",
             "exp_month": expiryDate?.components(separatedBy: "/").first ?? "",
@@ -1079,7 +1093,7 @@ class AdditionalInfoVC: BaseVC {
             params["customer_id"] = customerId
         } else {
             params["username"] = emailPrefix
-            params["email"] = UserStoreSingleton.shared.verificationEmail
+            params["email"] = finalEmail
         }
         
         // ✅ Include metadata only if it has at least 1 key-value pair
@@ -1124,11 +1138,28 @@ class AdditionalInfoVC: BaseVC {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
                             print("Response Data: \(responseObject)")
                             
-                            // Check if status is 0 and handle the error
+                            // ✅ Handle duplicate transaction case
+                            if let status = responseObject["status"] as? Bool, status == false,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            if let status = responseObject["status"] as? Int, status == 0,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            // ✅ Handle generic "status == 0" error case
                             if let status = responseObject["status"] as? Int, status == 0 {
                                 let errorMessage = responseObject["message"] as? String ?? "Unknown error"
                                 self.presentPaymentErrorVC(errorMessage: errorMessage)
-                            } else {
+                                return
+                            }
+                            else {
                                 DispatchQueue.main.async {
                                     if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
                                         paymentDoneVC.chargeData = responseObject
@@ -1232,7 +1263,7 @@ class AdditionalInfoVC: BaseVC {
             let emailText = userEmail
             let emailPrefix = emailText?.components(separatedBy: "@").first ?? ""
             
-            params["save_account"] = 1
+            params["save_account"] = (isSavedNewAccount ?? false) ? 1 : 0
             
             if let customerId = UserStoreSingleton.shared.customerId, !customerId.isEmpty {
                 params["customer"] = customerId
@@ -1354,11 +1385,28 @@ class AdditionalInfoVC: BaseVC {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
                             print("Response Data: \(responseObject)")
                             
-                            // Check if status is 0 and handle the error
+                            // ✅ Handle duplicate transaction case
+                            if let status = responseObject["status"] as? Bool, status == false,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            if let status = responseObject["status"] as? Int, status == 0,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            // ✅ Handle generic "status == 0" error case
                             if let status = responseObject["status"] as? Int, status == 0 {
                                 let errorMessage = responseObject["message"] as? String ?? "Unknown error"
                                 self.presentPaymentErrorVC(errorMessage: errorMessage)
-                            } else {
+                                return
+                            }
+                            else {
                                 DispatchQueue.main.async {
                                     if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
                                         paymentDoneVC.chargeData = responseObject
@@ -1442,8 +1490,22 @@ class AdditionalInfoVC: BaseVC {
         // Extract only the digits from the phone number (local only, no country code)
         let localPhone = txtFieldPhoneNumber.text?.components(separatedBy: CharacterSet.decimalDigits.inverted).joined() ?? ""
         
-        let emailText = UserStoreSingleton.shared.verificationEmail ?? ""
-        let emailPrefix = emailText.components(separatedBy: "@").first ?? ""
+//        let emailText = UserStoreSingleton.shared.verificationEmail ?? ""
+//        let emailPrefix = emailText.components(separatedBy: "@").first ?? ""
+        
+        let finalEmail: String
+        if let verificationEmail = UserStoreSingleton.shared.verificationEmail, !verificationEmail.isEmpty {
+            finalEmail = verificationEmail
+        } else {
+            finalEmail = request.email ?? ""
+        }
+
+        let emailPrefix: String
+        if !finalEmail.isEmpty {
+            emailPrefix = finalEmail.components(separatedBy: "@").first ?? ""
+        } else {
+            emailPrefix = ""
+        }
         
         // Determine name: use request.name if available, otherwise fallback to email prefix
         let nameParam: String
@@ -1460,7 +1522,7 @@ class AdditionalInfoVC: BaseVC {
             "payment_method": "ach",
             "customer": customerID ?? "",
             "currency": "usd",
-            "email": UserStoreSingleton.shared.verificationEmail ?? ""
+            "email": finalEmail
         ]
         
         // Conditionally add billing info
@@ -1572,11 +1634,28 @@ class AdditionalInfoVC: BaseVC {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
                             print("Response Data: \(responseObject)")
                             
-                            // Check if status is 0 and handle the error
+                            // ✅ Handle duplicate transaction case
+                            if let status = responseObject["status"] as? Bool, status == false,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            if let status = responseObject["status"] as? Int, status == 0,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            // ✅ Handle generic "status == 0" error case
                             if let status = responseObject["status"] as? Int, status == 0 {
                                 let errorMessage = responseObject["message"] as? String ?? "Unknown error"
                                 self.presentPaymentErrorVC(errorMessage: errorMessage)
-                            } else {
+                                return
+                            }
+                            else {
                                 DispatchQueue.main.async {
                                     if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
                                         paymentDoneVC.chargeData = responseObject
@@ -1660,7 +1739,21 @@ class AdditionalInfoVC: BaseVC {
         // Extract only the digits from the phone number (local only, no country code)
         let localPhone = txtFieldPhoneNumber.text?.components(separatedBy: CharacterSet.decimalDigits.inverted).joined() ?? ""
         
-        let emailPrefix = UserStoreSingleton.shared.verificationEmail?.components(separatedBy: "@").first ?? ""
+       // let emailPrefix = UserStoreSingleton.shared.verificationEmail?.components(separatedBy: "@").first ?? ""
+        
+        let finalEmail: String
+        if let verificationEmail = UserStoreSingleton.shared.verificationEmail, !verificationEmail.isEmpty {
+            finalEmail = verificationEmail
+        } else {
+            finalEmail = request.email ?? ""
+        }
+
+        let emailPrefix: String
+        if !finalEmail.isEmpty {
+            emailPrefix = finalEmail.components(separatedBy: "@").first ?? ""
+        } else {
+            emailPrefix = ""
+        }
         
         var params: [String: Any] = [
            // "name": accountName ?? "",
@@ -1672,7 +1765,7 @@ class AdditionalInfoVC: BaseVC {
             "account_number": accountNumber ?? "",
             "payment_mode": "auth_and_capture",
             "levelIndicator": 1,
-            "save_account": 1,
+            "save_account": (isSavedNewAccount ?? false) ? 1 : 0,
             "payment_method": "ach"
         ]
         
@@ -1797,11 +1890,28 @@ class AdditionalInfoVC: BaseVC {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
                             print("Response Data: \(responseObject)")
                             
-                            // Check if status is 0 and handle the error
+                            // ✅ Handle duplicate transaction case
+                            if let status = responseObject["status"] as? Bool, status == false,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            if let status = responseObject["status"] as? Int, status == 0,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            // ✅ Handle generic "status == 0" error case
                             if let status = responseObject["status"] as? Int, status == 0 {
                                 let errorMessage = responseObject["message"] as? String ?? "Unknown error"
                                 self.presentPaymentErrorVC(errorMessage: errorMessage)
-                            } else {
+                                return
+                            }
+                            else {
                                 DispatchQueue.main.async {
                                     if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
                                         paymentDoneVC.chargeData = responseObject
@@ -1903,8 +2013,10 @@ class AdditionalInfoVC: BaseVC {
             let emailText = userEmail
             let emailPrefix = emailText?.components(separatedBy: "@").first ?? ""
             
-            params["save_card"] = 1
-            params["is_default"] = "1"
+            params["save_card"] = isSavedNewCard ? 1 : 0
+            if isSavedNewCard {
+                params["is_default"] = "1"
+            }
             params["tokenize"] = request.tokenOnly ?? ""
             params["username"] = emailPrefix
             
@@ -2029,11 +2141,28 @@ class AdditionalInfoVC: BaseVC {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
                             print("Response Data: \(responseObject)")
                             
-                            // Check if status is 0 and handle the error
+                            // ✅ Handle duplicate transaction case
+                            if let status = responseObject["status"] as? Bool, status == false,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            if let status = responseObject["status"] as? Int, status == 0,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            // ✅ Handle generic "status == 0" error case
                             if let status = responseObject["status"] as? Int, status == 0 {
                                 let errorMessage = responseObject["message"] as? String ?? "Unknown error"
                                 self.presentPaymentErrorVC(errorMessage: errorMessage)
-                            } else {
+                                return
+                            }
+                            else {
                                 DispatchQueue.main.async {
                                     if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "ThreeDSecurePaymentDoneVC") as? ThreeDSecurePaymentDoneVC {
                                         
@@ -2249,11 +2378,28 @@ class AdditionalInfoVC: BaseVC {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
                             print("Response Data: \(responseObject)")
                             
-                            // Check if status is 0 and handle the error
+                            // ✅ Handle duplicate transaction case
+                            if let status = responseObject["status"] as? Bool, status == false,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            if let status = responseObject["status"] as? Int, status == 0,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            // ✅ Handle generic "status == 0" error case
                             if let status = responseObject["status"] as? Int, status == 0 {
                                 let errorMessage = responseObject["message"] as? String ?? "Unknown error"
                                 self.presentPaymentErrorVC(errorMessage: errorMessage)
-                            } else {
+                                return
+                            }
+                            else {
                                 DispatchQueue.main.async {
                                     if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "ThreeDSecurePaymentDoneVC") as? ThreeDSecurePaymentDoneVC {
                                         
@@ -2352,7 +2498,7 @@ class AdditionalInfoVC: BaseVC {
             let emailText = userEmail
             let emailPrefix = emailText?.components(separatedBy: "@").first ?? ""
             
-            params["save_account"] = 1
+            params["save_account"] = (isSavedNewAccount ?? false) ? 1 : 0
             params["is_default"] = 1
             params["customer_id"] = UserStoreSingleton.shared.customerId ?? ""
             
@@ -2487,11 +2633,28 @@ class AdditionalInfoVC: BaseVC {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
                             print("Response Data: \(responseObject)")
                             
-                            // Check if status is 0 and handle the error
+                            // ✅ Handle duplicate transaction case
+                            if let status = responseObject["status"] as? Bool, status == false,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            if let status = responseObject["status"] as? Int, status == 0,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            // ✅ Handle generic "status == 0" error case
                             if let status = responseObject["status"] as? Int, status == 0 {
                                 let errorMessage = responseObject["message"] as? String ?? "Unknown error"
                                 self.presentPaymentErrorVC(errorMessage: errorMessage)
-                            } else {
+                                return
+                            }
+                            else {
                                 DispatchQueue.main.async {
                                     if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
                                         paymentDoneVC.chargeData = responseObject
@@ -2577,8 +2740,8 @@ class AdditionalInfoVC: BaseVC {
             "account_id": self.grailPayAccountID ?? "",
             "account_type": self.selectedGrailPayAccountType ?? "",
             "name": self.selectedGrailPayAccountName ?? "",
-            "save_account": 1,
-            "is_default": 1,
+            "save_account": (isSavedForFuture ?? false) ? 1 : 0,
+            "is_default": (isSavedForFuture ?? false) ? 1 : 0,
             "customer_id": customerId ?? "",
             "email": userEmail ?? "",
             "create_customer": "1",
@@ -2735,11 +2898,28 @@ class AdditionalInfoVC: BaseVC {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
                             print("Response Data: \(responseObject)")
                             
-                            // Check if status is 0 and handle the error
+                            // ✅ Handle duplicate transaction case
+                            if let status = responseObject["status"] as? Bool, status == false,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            if let status = responseObject["status"] as? Int, status == 0,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            // ✅ Handle generic "status == 0" error case
                             if let status = responseObject["status"] as? Int, status == 0 {
                                 let errorMessage = responseObject["message"] as? String ?? "Unknown error"
                                 self.presentPaymentErrorVC(errorMessage: errorMessage)
-                            } else {
+                                return
+                            }
+                            else {
                                 DispatchQueue.main.async {
                                     if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
                                         paymentDoneVC.chargeData = responseObject