@jimrising/easymerchantsdk-react-native 1.3.5 → 1.3.6

package/README.md

@@ -162,7 +162,7 @@ const App = () => {
   };
 
   const handleBilling = async () => {
-    const amount = '64';
+    const amount = '72';
     const billingInfo = {
       address: 'Test',
       country: 'test',
@@ -172,7 +172,7 @@ const App = () => {
       additional_info: {
         name: 'Test User',
         email: 'test@gmail.com',
-        phone_number: '234983789',
+        phone_number: '7888821587',
         country_code: '91',
         description: 'SDK Test',
       },
@@ -218,7 +218,13 @@ const App = () => {
          false, // saveCard
          false, // saveAccount
          true,  // authenticatedACH
-         authConfig
+         authConfig,
+         "Submit",
+         true,
+         ['weekly', 'monthly'],            
+         'custom',
+          "05/30/2025", 
+           true
        );
 
        console.log("Billing success:", result);
@@ -279,6 +285,7 @@ const styles = StyleSheet.create({
 
 
 
+
 ```
 
 You can send `null` if billing info not available.

package/android/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Tue May 27 14:48:21 IST 2025
+gradle.version=8.10

package/android/.gradle/nb-cache/trust/0B5D6BE682AD6AEE9815EC13516BF075752CAE5AD5BECDCC00315C37622C2FD3

@@ -0,0 +1 @@
+14CECFB310D8C466291C81DD53127CB2C5FDEED791047216FAF15D765467001D

package/android/.gradle/nb-cache/trust/23843E1876B2E51C07E80AB52D1E797E5D8053D8097EEEB15FB63DD903195C14

@@ -0,0 +1 @@
+7B4711EF5BD8AAFCB0F97ED30C712B87657E9522834D63197B63D19F2590EA9F

package/android/.settings/org.eclipse.buildship.core.prefs

@@ -0,0 +1,2 @@
+connection.project.dir=../../../../android
+eclipse.preferences.version=1

package/ios/Classes/EasyMerchantSdk.m

@@ -3,7 +3,7 @@
 #import <React/RCTBridgeModule.h>
 #import <easymerchantsdk/easymerchantsdk-Swift.h>
 
-//#import <easymerchantsdk-Swift.h>
+// #import <easymerchantsdk-Swift.h>
 
 @interface EasyMerchantSdk()
 @property (nonatomic, strong) EasyMerchantSdkPlugin *sdkPluginInstance;
@@ -24,17 +24,23 @@ RCT_EXPORT_METHOD(configureEnvironment:(NSString *)env
 }
 
 RCT_EXPORT_METHOD(
-    billing:(NSString *)amount
-    billingInfo:(NSString *)billingInfo
-    paymentMethods:(NSArray *)paymentMethods
-    themeConfiguration:(NSDictionary *)themeConfiguration
-    tokenOnly:(BOOL)tokenOnly
-    saveCard:(BOOL)saveCard
-    saveAccount:(BOOL)saveAccount
-    authenticatedACH:(BOOL)authenticatedACH
-    grailPayParams:(NSDictionary *)grailPayParams
-    resolver:(RCTPromiseResolveBlock)resolve
-    rejecter:(RCTPromiseRejectBlock)reject
+        billing:(NSString *)amount
+        billingInfo:(NSString *)billingInfo
+        paymentMethods:(NSArray *)paymentMethods
+        themeConfiguration:(NSDictionary *)themeConfiguration
+        tokenOnly:(BOOL)tokenOnly
+        saveCard:(BOOL)saveCard
+        saveAccount:(BOOL)saveAccount
+        authenticatedACH:(BOOL)authenticatedACH
+        grailPayParams:(NSDictionary *)grailPayParams
+        submitButtonText:(NSString *)submitButtonText
+        isRecurring:(BOOL)isRecurring
+        recurringIntervals:(NSArray *)recurringIntervals
+        recurringStartDateType:(NSString *)recurringStartDateType
+        recurringStartDate:(NSString *)recurringStartDate
+        enable3DS:(BOOL)enable3DS
+        resolver:(RCTPromiseResolveBlock)resolve
+        rejecter:(RCTPromiseRejectBlock)reject
 )
 {
     if (!self.sdkPluginInstance) {
@@ -42,27 +48,34 @@ RCT_EXPORT_METHOD(
     }
 
     [self.sdkPluginInstance billing:amount
-                      billinginfo:billingInfo
-                   paymentMethods:paymentMethods
-               themeConfiguration:themeConfiguration
-                        tokenOnly:tokenOnly
-                         saveCard:saveCard
-                      saveAccount:saveAccount
-                 authenticatedACH:authenticatedACH
-                   grailPayParams:grailPayParams
-                         resolver:^(id result) {
-                             resolve(result);
-                             self.sdkPluginInstance = nil;
-                         }
-                         rejecter:^(NSString *code, NSString *message, NSError *error) {
-                             reject(code, message, error);
-                             self.sdkPluginInstance = nil;
-                         }];
+                        billinginfo:billingInfo
+                     paymentMethods:paymentMethods
+                 themeConfiguration:themeConfiguration
+                          tokenOnly:tokenOnly
+                           saveCard:saveCard
+                        saveAccount:saveAccount
+                   authenticatedACH:authenticatedACH
+                     grailPayParams:grailPayParams
+                   submitButtonText:submitButtonText
+                        isRecurring:isRecurring
+                 recurringIntervals:recurringIntervals
+             recurringStartDateType:recurringStartDateType
+                 recurringStartDate:recurringStartDate
+                          enable3DS:enable3DS
+                           resolver:^(id result) {
+                               resolve(result);
+                               self.sdkPluginInstance = nil;
+                           }
+                           rejecter:^(NSString *code, NSString *message, NSError *error) {
+                               reject(code, message, error);
+                               self.sdkPluginInstance = nil;
+                           }];
 }
 
 
 
 
+
 RCT_REMAP_METHOD(setViewController,
                  setViewControllerWithResolver:(RCTPromiseResolveBlock)resolve
                  rejecter:(RCTPromiseRejectBlock)reject)

package/ios/Classes/EasyMerchantSdk.swift

@@ -4,23 +4,26 @@ import React
 
 @objc(EasyMerchantSdkPlugin)
 public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
+
+    // MARK: - React Native Module Setup
     public static func moduleName() -> String { "EasyMerchantSdk" }
     public static func requiresMainQueueSetup() -> Bool { true }
 
     public var bridge: RCTBridge?
 
+    // MARK: - Private Properties
     private var viewController: UIViewController?
     private let viewControllerQueue = DispatchQueue(label: "com.easymerchantsdk.viewController")
 
     private var billingResolver: RCTPromiseResolveBlock?
     private var billingRejecter: RCTPromiseRejectBlock?
 
-    // ✅ Default initializer for Objective-C compatibility
+    // MARK: - Initializer
     @objc public override init() {
         super.init()
     }
 
-    // Optional: Called when the bridge finishes loading
+    // Called when the bridge finishes loading
     public func bridgeDidFinishLoading() {
         if self.bridge != nil {
             print("Bridge has been initialized successfully.")
@@ -29,6 +32,7 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
         }
     }
 
+    // MARK: - Set ViewController (for presenting modal)
     @objc public func setViewController(_ viewController: UIViewController) {
         viewControllerQueue.sync {
             self.viewController = viewController
@@ -36,6 +40,7 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
         print("ViewController set: \(String(describing: self.viewController))")
     }
 
+    // MARK: - Billing method exposed to React Native
     @objc public func billing(
         _ amount: String,
         billinginfo: String?,
@@ -46,31 +51,41 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
         saveAccount: Bool,
         authenticatedACH: Bool,
         grailPayParams: [String: Any]?,
+        submitButtonText: String?,
+        isRecurring: Bool,
+        recurringIntervals: [String]?,
+        recurringStartDateType: String?,
+        recurringStartDate: String?,
+        enable3DS: Bool,
         resolver: @escaping RCTPromiseResolveBlock,
         rejecter: @escaping RCTPromiseRejectBlock
     ) {
+        // Validate amount
         guard let amountValue = Double(amount), amountValue > 0 else {
             rejecter("INVALID_AMOUNT", "Amount must be a positive number", nil)
             return
         }
 
+        // Validate billinginfo JSON if present
         if let billinginfo = billinginfo {
             guard let billingInfoData = billinginfo.data(using: .utf8),
-                  let _ = try? JSONSerialization.jsonObject(with: billingInfoData, options: []) else {
+                  (try? JSONSerialization.jsonObject(with: billingInfoData, options: [])) != nil else {
                 rejecter("INVALID_BILLING_INFO", "Billing info must be valid JSON", nil)
                 return
             }
         }
 
+        // Map payment method strings to enum cases
         let methods: [PaymentMethod] = paymentMethods.compactMap {
             switch $0.lowercased() {
-                case "card": return .Card
-                case "bank": return .Bank
-                case "crypto": return .Crypto
-                default: return nil
+            case "card": return .Card
+            case "bank": return .Bank
+            case "crypto": return .Crypto
+            default: return nil
             }
         }
 
+        // Setup GrailPayRequest if authenticatedACH is true
         var grailParams: GrailPayRequest? = nil
         if authenticatedACH, let params = grailPayParams {
             grailParams = GrailPayRequest(
@@ -85,6 +100,7 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
             )
         }
 
+        // Setup Theme Configuration with default fallbacks
         let themeConfig = ThemeConfiguration(
             bodyBackgroundColor: themeConfiguration["bodyBackgroundColor"] as? String ?? "#EBF8FF",
             containerBackgroundColor: themeConfiguration["containerBackgroundColor"] as? String ?? "#FFFFFF",
@@ -100,8 +116,40 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
             fontSize: themeConfiguration["fontSize"] as? String ?? "14"
         )
 
+        // Prepare billing info data
         let billingInfoData = billinginfo?.data(using: .utf8) ?? Data()
 
+        
+        print("🔥 recurringIntervals raw from JS:", recurringIntervals as Any)
+
+        // Updated mapping to strip leading "." if present
+        let intervals = (recurringIntervals ?? []).compactMap { raw -> RecurringIntervals? in
+            // 1) Trim whitespace, lowercase
+            let cleaned = raw.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
+            // 2) If it starts with ".", drop that character
+            let noDot = cleaned.hasPrefix(".") ? String(cleaned.dropFirst()) : cleaned
+            // 3) Try to initialize your enum
+            return RecurringIntervals(rawValue: noDot)
+        }
+
+        print("🔥 mapped intervals after stripping dots:", intervals)
+
+          guard !intervals.isEmpty else {
+            rejecter("NO_RECURRING_INTERVALS", "No recurring intervals available.", nil)
+            return
+          }
+
+
+           // 2) Map recurringStartDateType (assuming you have an enum for it)
+           let recurringStartDateTypeEnum: RecurringStartDateType = {
+             switch recurringStartDateType?.lowercased() {
+             case "custom": return .custom
+             case "fixed":  return .fixed
+             default:       return .custom
+             }
+           }()
+
+        // Create Request object with all parameters
         let request = Request(
             amount: amountValue,
             billingInfoData: billingInfoData,
@@ -110,11 +158,17 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
             tokenOnly: tokenOnly,
             saveCard: saveCard,
             saveAccount: saveAccount,
-            submitButtonText: "Submit",
+            submitButtonText: submitButtonText ?? "Submit",
             authenticatedACH: authenticatedACH,
-            grailPayParams: authenticatedACH ? grailParams : nil
+            grailPayParams: authenticatedACH ? grailParams : nil,
+            is_recurring: isRecurring,
+            recurringIntervals: intervals,
+            recurringStartDateType: recurringStartDateTypeEnum,
+            recurringStartDate: recurringStartDate,
+            enable3DS: enable3DS
         )
 
+        // Store resolve/reject callbacks for later
         self.billingResolver = resolver
         self.billingRejecter = rejecter
 
@@ -131,6 +185,7 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
         }
     }
 
+    // MARK: - Environment Configuration
     @objc public func configureEnvironment(_ env: String, apiKey: String, apiSecret: String) {
         switch env.lowercased() {
         case "production":
@@ -143,6 +198,7 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
         EnvironmentConfig.configure(apiKey: apiKey, apiSecret: apiSecret)
     }
 
+    // MARK: - Platform Version
     @objc public func getPlatformVersion(
         _ resolver: @escaping RCTPromiseResolveBlock,
         rejecter: @escaping RCTPromiseRejectBlock
@@ -150,12 +206,14 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
         resolver("iOS \(UIDevice.current.systemVersion)")
     }
 
+    // MARK: - Clear stored callbacks
     private func clearResolvers() {
         self.billingResolver = nil
         self.billingRejecter = nil
     }
 }
 
+// MARK: - EasyPayViewControllerDelegate Implementation
 extension EasyMerchantSdkPlugin: EasyPayViewControllerDelegate {
     public func easyPayController(_ controller: EasyPayViewController, didFinishWith result: Result) {
         DispatchQueue.main.async {
@@ -181,3 +239,4 @@ extension EasyMerchantSdkPlugin: EasyPayViewControllerDelegate {
         }
     }
 }
+

package/ios/CustomComponents/PlanSelector.swift

@@ -8,51 +8,49 @@
 import UIKit
 
 class PlanSelector {
-    
-    static func presentPlanOptions(from viewController: UIViewController, sourceView: UIView, onSelection: @escaping (String) -> Void) {
-        
+    static func presentPlanOptions(
+        from viewController: UIViewController,
+        sourceView: UIView,
+        allowedPlans: [RecurringIntervals],
+        onSelection: @escaping (String) -> Void
+    ) {
         let alertController = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)
-        
-        // Create actions
-        let weeklyAction = UIAlertAction(title: "Weekly", style: .default) { _ in
-            onSelection("Weekly")
-        }
-        
-        let monthlyAction = UIAlertAction(title: "Monthly", style: .default) { _ in
-            onSelection("Monthly")
+
+        for plan in allowedPlans {
+            let displayName = plan.displayName
+            let action = UIAlertAction(title: displayName, style: .default) { _ in
+                onSelection(displayName)  // ✅ Return user-friendly display name
+            }
+            alertController.addAction(action)
         }
-        
+
         let cancelAction = UIAlertAction(title: "Cancel", style: .cancel, handler: nil)
-        
-        alertController.addAction(weeklyAction)
-        alertController.addAction(monthlyAction)
         alertController.addAction(cancelAction)
-        
-        // Set attributed title with secondary font color
+
+        // Optional styling
         if let secondaryColorHex = UserStoreSingleton.shared.secondary_font_col,
            let secondaryColor = UIColor(hex: secondaryColorHex) {
-            let titleAttrString = NSAttributedString(string: "Select Plan", attributes: [
+            let titleAttr = NSAttributedString(string: "Select Plan", attributes: [
                 .foregroundColor: secondaryColor,
                 .font: UIFont.systemFont(ofSize: 16, weight: .medium)
             ])
-            alertController.setValue(titleAttrString, forKey: "attributedTitle")
+            alertController.setValue(titleAttr, forKey: "attributedTitle")
         }
-        
-        // Set title colors for actions using primary font color
+
         if let buttonColorHex = UserStoreSingleton.shared.primary_btn_bg_col,
            let buttonColor = UIColor(hex: buttonColorHex) {
-            weeklyAction.setValue(buttonColor, forKey: "titleTextColor")
-            monthlyAction.setValue(buttonColor, forKey: "titleTextColor")
-            cancelAction.setValue(UIColor.red, forKey: "titleTextColor")
+            alertController.actions.forEach {
+                if $0.title != "Cancel" {
+                    $0.setValue(buttonColor, forKey: "titleTextColor")
+                }
+            }
         }
 
-        // iPad Support
-        if let popoverController = alertController.popoverPresentationController {
-            popoverController.sourceView = sourceView
-            popoverController.sourceRect = sourceView.bounds
+        if let popover = alertController.popoverPresentationController {
+            popover.sourceView = sourceView
+            popover.sourceRect = sourceView.bounds
         }
-        
+
         viewController.present(alertController, animated: true)
     }
 }
-

package/ios/EnvironmentConfig.swift

@@ -39,34 +39,34 @@ public class EnvironmentConfig {
         self.currentEnvironment = environment
     }
     
-    public enum Endpoints {
-        case paymentIntent
-        case hostedCheckouts
-        case emailVerification
-        case verifyOtp
-        case getCards
-        case creditCharges
-        case account
-        case achCharge
-        case charges
-        case accountConnect
-        
-        func path() -> String {
-            switch self {
-            case .paymentIntent: return "/api/v1/paymentintent"
-            case .hostedCheckouts: return "/api/v1/hostedcheckouts"
-            case .emailVerification: return "/api/v1/customer/send_otp"
-            case .verifyOtp: return "/api/v1/customer/verify_otp"
-//            case .getCards: return "/api/v1/customer/card"
-            case .getCards: return "/api/v1/card"
-            case .creditCharges: return "/api/v1/customer/charges"
-            case .account: return "/api/v1/ach/account"
-            case .achCharge: return "/api/v1/ach/charge"
-            case .charges: return "/api/v1/charges"
-            case .accountConnect: return "/api/v1/ach/account/connect"
-             
-                
-            }
-        }
-    }
+   public enum Endpoints {
+           case paymentIntent
+           case hostedCheckouts
+           case emailVerification
+           case verifyOtp
+           case getCards
+           case creditCharges
+           case account
+           case achCharge
+           case charges
+           case accountConnect
+           case threeDSecure
+
+           func path() -> String {
+               switch self {
+               case .paymentIntent: return "/api/v1/paymentintent"
+               case .hostedCheckouts: return "/api/v1/hostedcheckouts"
+               case .emailVerification: return "/api/v1/customer/send_otp"
+               case .verifyOtp: return "/api/v1/customer/verify_otp"
+                   // case .getCards: return "/api/v1/customer/card"
+               case .getCards: return "/api/v1/card"
+               case .creditCharges: return "/api/v1/customer/charges"
+               case .account: return "/api/v1/ach/account"
+               case .achCharge: return "/api/v1/ach/charge"
+               case .charges: return "/api/v1/charges"
+               case .accountConnect: return "/api/v1/ach/account/connect"
+               case .threeDSecure: return "/api/v1/3dsecure"
+               }
+           }
+       }
 }