@jimrising/easymerchantsdk-react-native 1.3.4 → 1.3.6

package/ios/Example/ViewController.swift

@@ -1,5 +1,3 @@
-//
-//
 //import UIKit
 //import EasyPay
 //
@@ -28,53 +26,51 @@
 //    }
 //
 //    @IBAction private func payAction() {
-////        let apiKey = "f149cf5afc3a67c79e0aa87e7"
-////        let apiSecret = "22b9dd1e588146077ca77da82"
-//
-//         let apiKey = "14fbf8a186091763e59c289c1"
-//         let apiSecret = "f90863e7a853539f8ace8d6de"
+//        let apiKey = "14fbf8a186091763e59c289c1"
+//        let apiSecret = "f90863e7a853539f8ace8d6de"
 //
 //        EasyPay.EnvironmentConfig.configure(apiKey: apiKey, apiSecret: apiSecret)
 //
-//        // Theme Configuration
+//
 //        let themeConfiguration = ThemeConfiguration(
-//            bodyBackgroundColor: "#EBF8FF",
-//            containerBackgroundColor: "#FFFFFF",
-//            primaryFontColor: "#1E3A8A",
-//            secondaryFontColor: "#696969",
-//            primaryButtonBackgroundColor: "#1D4ED8",
-//            primaryButtonHoverColor: "#2563EB",
-//            primaryButtonFontColor: "#FFFFFF",
-//            secondaryButtonBackgroundColor: "#FFFFFF",
-//            secondaryButtonHoverColor: "#BFDBFE",
-//            secondaryButtonFontColor: "#1E40AF",
+//            bodyBackgroundColor: "#1F2937", // dark gray-blue
+//            containerBackgroundColor: "#374151", // darker container
+//            primaryFontColor: "#F9FAFB", // near white
+//            secondaryFontColor: "#D1D5DB", // light gray
+//            primaryButtonBackgroundColor: "#4F46E5", // indigo (keep for contrast)
+//            primaryButtonHoverColor: "#4338CA", // deeper indigo
+//            primaryButtonFontColor: "#FFFFFF", // white text on button
+//            secondaryButtonBackgroundColor: "#1E40AF", // dark blue
+//            secondaryButtonHoverColor: "#1E3A8A", // deeper blue on hover
+//            secondaryButtonFontColor: "#E0E7FF", // soft blue-white
 //            borderRadius: "8",
 //            fontSize: "14"
 //        )
 //
-//        let additionalInfoRequest: [String: Any] = [
-//            "name": "Test User",
-//            "email": "test@gmail.com",
-//            "phone_number": "9465351125",
-//            "country_code": "91",
-//            "description": "Test"
-//        ]
-//
-//        let json: [String: Any] = [
-//            "address": "Mohali, Punjab",
-//            "country": "India",
-//            "state": "Punjab",
-//            "city": "Anandpur Sahib",
-//            "postal_code": "140118",
-//            "additional_info": additionalInfoRequest
-//        ]
-//
-//        guard let jsonData = try? JSONSerialization.data(withJSONObject: json, options: []) else {
-//            print("Failed to serialize JSON")
+//        let additionalInfo = AdditionalInfo(
+//            name: "Test User",
+//            email: "test@gmail.com",
+//            phone_number: "9465351125",
+//            country_code: "91",
+//            description: "Test"
+//        )
+//
+//        let billingInfo = BillingInfo(
+//            address: "Mohali, Punjab",
+//            country: "India",
+//            state: "Punjab",
+//            city: "Anandpur Sahib",
+//            postal_code: "140118",
+//            additional_info: additionalInfo
+//        )
+//
+//        // Encode Billing Info to Data
+//        guard let billingData = try? JSONEncoder().encode(billingInfo) else {
+//            print("Failed to encode BillingInfo")
 //            return
 //        }
 //
-//        let authenticatedACH = true
+//        let authenticatedACH = false
 //
 //        let grailPayParams = GrailPayRequest(
 //            accessToken: "251|uTijpDGfrS88UR2V1cZNMQ8S4hUJA0sVzsnsoUZF",
@@ -89,15 +85,20 @@
 //
 //        let request = EasyPay.Request(
 //            amount: 99,
-//            billingInfoData: jsonData,
-//            paymentMethods: [.Card, .Bank, .Crypto],
+//            billingInfoData: billingData,
+//            paymentMethods: [.Card, .Bank],
 //            themeConfiguration: themeConfiguration,
 //            tokenOnly: false,
 //            saveCard: false,
 //            saveAccount: false,
 //            submitButtonText: "Submit",
 //            authenticatedACH: authenticatedACH,
-//            grailPayParams: authenticatedACH ? grailPayParams : nil
+//            grailPayParams: authenticatedACH ? grailPayParams : nil,
+//            is_recurring: true,
+//            recurringIntervals: [.weekly, .monthly],
+//            recurringStartDateType: .custom,
+//            recurringStartDate: "05/30/2025", /// Format MM/dd/yyyy, must be today or future date
+//            enable3DS: true
 //        )
 //
 //        if request.tokenOnly == true {
@@ -120,6 +121,11 @@
 //        switch result.type {
 //        case .cancelled:
 //            print("Cancelled")
+//            lblResponseShow.isHidden = false
+//            if let message = result.chargeData?["message"] as? String {
+//                print("Message from chargeData: \(message)")
+//                lblResponseShow.text = message
+//            }
 //        case .success:
 //            if let chargeData = result.chargeData {
 //                if let clientToken = chargeData["clientToken"] as? String {
@@ -148,13 +154,3 @@
 //
 //}
 //
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//

package/ios/Models/AdditionalInfo.swift

@@ -7,10 +7,47 @@
 
 import Foundation
 
-struct AdditionalInfo {
-    let name: String
-    let email: String
-    let phone: String
-    let description: String
-}
+//struct AdditionalInfo {
+//    let name: String
+//    let email: String
+//    let phone: String
+//    let description: String
+//}
+
+//public struct AdditionalInfo: Codable {
+//    public let name: String
+//    public let email: String
+//    public let phone_number: String
+//    public let country_code: String
+//    public let description: String
+//
+//    public init(name: String, email: String, phone_number: String, country_code: String, description: String) {
+//        self.name = name
+//        self.email = email
+//        self.phone_number = phone_number
+//        self.country_code = country_code
+//        self.description = description
+//    }
+//}
 
+public struct AdditionalInfo: Codable {
+    public let name: String?
+    public let email: String?
+    public let phone_number: String?
+    public let country_code: String?
+    public let description: String?
+
+    public init(
+        name: String? = nil,
+        email: String? = nil,
+        phone_number: String? = nil,
+        country_code: String? = nil,
+        description: String? = nil
+    ) {
+        self.name = name
+        self.email = email
+        self.phone_number = phone_number
+        self.country_code = country_code
+        self.description = description
+    }
+}

package/ios/Models/BillingInfo.swift

@@ -7,10 +7,54 @@
 
 import Foundation
 
-struct BillingInfo {
-    let address: String
-    let country: String
-    let state: String
-    let city: String
-    let postalCode: String
+//struct BillingInfo {
+//    let address: String
+//    let country: String
+//    let state: String
+//    let city: String
+//    let postalCode: String
+//}
+
+//public struct BillingInfo: Codable {
+//    public let address: String
+//    public let country: String
+//    public let state: String
+//    public let city: String
+//    public let postal_code: String
+//    public let additional_info: AdditionalInfo
+//
+//    public init(address: String, country: String, state: String, city: String, postal_code: String, additional_info: AdditionalInfo) {
+//        self.address = address
+//        self.country = country
+//        self.state = state
+//        self.city = city
+//        self.postal_code = postal_code
+//        self.additional_info = additional_info
+//    }
+//}
+
+public struct BillingInfo: Codable {
+    public let address: String?
+    public let country: String?
+    public let state: String?
+    public let city: String?
+    public let postal_code: String?
+    public let additional_info: AdditionalInfo?
+
+    public init(
+        address: String? = nil,
+        country: String? = nil,
+        state: String? = nil,
+        city: String? = nil,
+        postal_code: String? = nil,
+        additional_info: AdditionalInfo? = nil
+    ) {
+        self.address = address
+        self.country = country
+        self.state = state
+        self.city = city
+        self.postal_code = postal_code
+        self.additional_info = additional_info
+    }
 }
+

package/ios/Models/RecurringIntervals.swift

@@ -0,0 +1,34 @@
+//
+//  RecurringIntervals.swift
+//  EasyPay
+//
+//  Created by Mony's Mac on 22/05/25.
+//
+
+import Foundation
+
+public enum RecurringIntervals: String, CaseIterable {
+    case daily = "daily"
+    case weekly = "weekly"
+    case monthly = "monthly"
+    case quarterly = "quarterly"
+    case halfYearly = "halfyearly"
+    case yearly = "yearly"
+    case everyTwoYears = "everytwoyears"
+    case everyThreeYears = "everythreeyears"
+    case everyFourYears = "everyfouryears"
+    case everyFiveYears = "everyfiveyears"
+
+    var displayName: String {
+        switch self {
+        case .halfYearly: return "Half Yearly"
+        case .everyTwoYears: return "Every Two Years"
+        case .everyThreeYears: return "Every Three Years"
+        case .everyFourYears: return "Every Four Years"
+        case .everyFiveYears: return "Every Five Years"
+        default: return rawValue.capitalized
+        }
+    }
+}
+
+

package/ios/Models/RecurringStartDateType.swift

@@ -0,0 +1,13 @@
+//
+//  RecurringStartDateType.swift
+//  EasyPay
+//
+//  Created by Mony's Mac on 24/05/25.
+//
+
+import Foundation
+
+public enum RecurringStartDateType: String, CaseIterable {
+    case custom
+    case fixed
+}

package/ios/Models/Request.swift

@@ -20,7 +20,7 @@ public struct ThemeConfiguration: Codable {
     public let secondaryButtonFontColor: String?
     public let borderRadius: String?
     public let fontSize: String?
-
+    
     public init(
         bodyBackgroundColor: String? = nil,
         containerBackgroundColor: String? = nil,
@@ -59,7 +59,7 @@ public struct GrailPayRequest: Codable {
     public let brandingName: String
     public let finderSubtitle: String
     public let searchPlaceholder: String
-
+    
     public init(
         accessToken: String,
         vendorId: String,
@@ -75,9 +75,9 @@ public struct GrailPayRequest: Codable {
         self.role = role
         self.timeout = timeout
         self.isSandbox = isSandbox
-        self.brandingName = brandingName  // Fixed: Use the actual parameter
-        self.finderSubtitle = finderSubtitle  // Fixed: Use the actual parameter
-        self.searchPlaceholder = searchPlaceholder  // Fixed: Use the actual parameter
+        self.brandingName = brandingName
+        self.finderSubtitle = finderSubtitle
+        self.searchPlaceholder = searchPlaceholder
     }
 }
 
@@ -95,7 +95,11 @@ public final class Request: NSObject {
     public let submitButtonText: String?
     public let authenticatedACH: Bool?
     public let grailPayParams: GrailPayRequest?
-    public let enableRecurring: Bool?
+    public var is_recurring: Bool?
+    public var recurringIntervals: [RecurringIntervals]?
+    public var recurringStartDateType: RecurringStartDateType?
+    public var recurringStartDate: String?
+    public let enable3DS: Bool?
     
     public init(
         amount: Double,
@@ -108,7 +112,11 @@ public final class Request: NSObject {
         submitButtonText: String? = nil,
         authenticatedACH: Bool = false,
         grailPayParams: GrailPayRequest? = nil,
-        enableRecurring: Bool = false
+        is_recurring: Bool = false,
+        recurringIntervals: [RecurringIntervals]? = nil,
+        recurringStartDateType: RecurringStartDateType? = nil,
+        recurringStartDate: String? = nil,
+        enable3DS: Bool = false
     ) {
         self.amount = amount
         self.billingInfoData = billingInfoData
@@ -119,7 +127,24 @@ public final class Request: NSObject {
         self.submitButtonText = submitButtonText
         self.authenticatedACH = authenticatedACH
         self.grailPayParams = authenticatedACH ? grailPayParams : nil
-        self.enableRecurring = enableRecurring
+        self.is_recurring = is_recurring
+        self.recurringIntervals = recurringIntervals
+        self.recurringStartDateType = recurringStartDateType
+        self.recurringStartDate = recurringStartDate
+        self.enable3DS = enable3DS
+        
+        // Conditionally assign recurring fields only if is_recurring == true
+        if is_recurring {
+            self.is_recurring = true
+            self.recurringIntervals = recurringIntervals
+            self.recurringStartDateType = recurringStartDateType
+            self.recurringStartDate = recurringStartDate
+        } else {
+            self.is_recurring = false
+            self.recurringIntervals = nil
+            self.recurringStartDateType = nil
+            self.recurringStartDate = nil
+        }
         
         if let paymentMethods = paymentMethods {
             self.selectedPaymentMethods = paymentMethods
@@ -171,8 +196,6 @@ public final class Request: NSObject {
     
     //MARK: - Payment Intent Api
     func paymentIntentApi(completion: @escaping (Bool) -> Void) {
-        // Start loader when API call starts
-        
         guard let serviceURL = URL(string: EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.paymentIntent.path()) else {
             print("Invalid URL")
             completion(false)
@@ -185,11 +208,47 @@ 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
+        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)
+                    }
+                }
+                
+                completion(false)
+                return
+            }
+        }
+        
         let params: [String: Any] = [
             "amount": amount,
+            "allowed_cycles": String(recurringIntervals?.count ?? 0),
+            "intervals": recurringIntervals?.map { $0.rawValue } ?? [],
+            "is_recurring": self.is_recurring ?? false,
+            "recurring_start_date": recurringStartDate ?? "",
+            "recurring_start_date_type": recurringStartDateType?.rawValue ?? ""
         ]
         
         do {
+            
             request.httpBody = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
         } catch {
             print("Error creating JSON data: \(error)")
@@ -240,7 +299,14 @@ public final class Request: NSObject {
                     completion(false)
                 }
             } else {
-                print("HTTP 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)")
+                }
+                
                 completion(false)
             }
         }
@@ -375,3 +441,46 @@ public final class Request: NSObject {
     }
     
 }
+
+extension DateFormatter {
+    static let recurringDateFormatter: DateFormatter = {
+        let formatter = DateFormatter()
+        formatter.dateFormat = "MM/dd/yyyy"
+        formatter.timeZone = .current
+        return formatter
+    }()
+}
+
+extension UIApplication {
+    static func topViewController(base: UIViewController? = UIApplication.shared.connectedScenes
+        .compactMap { ($0 as? UIWindowScene)?.windows.first(where: \.isKeyWindow) }
+        .first?.rootViewController) -> UIViewController? {
+            if let nav = base as? UINavigationController {
+                return topViewController(base: nav.visibleViewController)
+            }
+            if let tab = base as? UITabBarController {
+                if let selected = tab.selectedViewController {
+                    return topViewController(base: selected)
+                }
+            }
+            if let presented = base?.presentedViewController {
+                return topViewController(base: presented)
+            }
+            return base
+        }
+}
+
+extension UIApplication {
+    // Recursively find the presented EasyPayViewController (if any)
+    static func findEasyPayViewController(from vc: UIViewController?) -> EasyPayViewController? {
+        if let easyPayVC = vc as? EasyPayViewController {
+            return easyPayVC
+        }
+        if let presented = vc?.presentedViewController {
+            return findEasyPayViewController(from: presented)
+        }
+        return nil
+    }
+}
+
+