@jimrising/easymerchantsdk-react-native 1.4.2 → 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.2"
+  "@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/android/build.gradle

@@ -39,7 +39,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.app:paysdk:1.2.2'
+    implementation 'com.app:paysdk:1.2.3'
     implementation 'com.hbb20:ccp:2.7.3'
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1"

package/android/src/main/java/com/reactlibrary/RNEasymerchantsdkModule.java

@@ -102,7 +102,6 @@ public class RNEasymerchantsdkModule extends ReactContextBaseJavaModule {
             recurringInfo.put("intervals", intervals);
             recurringInfo.put("recurringStartType", recurringDataMap.getString("recurringStartType"));
             hashMap.put("recurringData", recurringInfo);
-
             hashMap.put("authenticateBank", hashMapConfig.getBoolean("authenticateBank"));
 
             // Handle GrailPayParams

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()
     }
 }
+