@jimrising/easymerchantsdk-react-native 1.3.2 → 1.3.4

package/ios/CustomComponents/DatePickerHandler.swift

@@ -0,0 +1,71 @@
+//
+//  DatePickerHandler.swift
+//  EasyPay
+//
+//  Created by Mony's Mac on 14/05/25.
+//
+
+import UIKit
+
+class DatePickerHandler: NSObject {
+    
+    private let datePicker = UIDatePicker()
+    private var targetTextField: UITextField?
+    
+    var onDateSelected: ((Date) -> Void)?
+    
+    init(textField: UITextField, initialDate: Date? = nil) {
+        super.init()
+        
+        self.targetTextField = textField
+        configureDatePicker()
+        
+        if let date = initialDate {
+            datePicker.date = date
+        }
+        
+        setupInputView(for: textField)
+    }
+    
+    private func configureDatePicker() {
+        if #available(iOS 14.0, *) {
+            datePicker.preferredDatePickerStyle = .inline
+        }
+        datePicker.datePickerMode = .date
+        datePicker.minimumDate = Date()
+        datePicker.addTarget(self, action: #selector(dateChanged(_:)), for: .valueChanged)
+    }
+    
+    private func setupInputView(for textField: UITextField) {
+        textField.inputView = datePicker
+        
+        let toolbar = UIToolbar()
+        toolbar.sizeToFit()
+        
+        let doneButton = UIBarButtonItem(title: "Done", style: .done, target: self, action: #selector(doneDateSelection))
+        let space = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil)
+        
+        toolbar.setItems([space, doneButton], animated: false)
+        textField.inputAccessoryView = toolbar
+    }
+    
+    @objc private func dateChanged(_ sender: UIDatePicker) {
+        let formatter = DateFormatter()
+        formatter.dateFormat = "dd/MM/yyyy"
+        targetTextField?.text = formatter.string(from: sender.date)
+        onDateSelected?(sender.date)
+    }
+    
+    @objc private func doneDateSelection() {
+        if targetTextField?.text?.isEmpty ?? true {
+            let formatter = DateFormatter()
+            formatter.dateFormat = "dd/MM/yyyy"
+            let dateText = formatter.string(from: datePicker.date)
+            targetTextField?.text = dateText
+            onDateSelected?(datePicker.date)
+        }
+        targetTextField?.resignFirstResponder()
+    }
+    
+}
+

package/ios/CustomComponents/PlanSelector.swift

@@ -0,0 +1,58 @@
+//
+//  PlanSelector.swift
+//  EasyPay
+//
+//  Created by Mony's Mac on 14/05/25.
+//
+
+import UIKit
+
+class PlanSelector {
+    
+    static func presentPlanOptions(from viewController: UIViewController, sourceView: UIView, 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")
+        }
+        
+        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
+        if let secondaryColorHex = UserStoreSingleton.shared.secondary_font_col,
+           let secondaryColor = UIColor(hex: secondaryColorHex) {
+            let titleAttrString = NSAttributedString(string: "Select Plan", attributes: [
+                .foregroundColor: secondaryColor,
+                .font: UIFont.systemFont(ofSize: 16, weight: .medium)
+            ])
+            alertController.setValue(titleAttrString, 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")
+        }
+
+        // iPad Support
+        if let popoverController = alertController.popoverPresentationController {
+            popoverController.sourceView = sourceView
+            popoverController.sourceRect = sourceView.bounds
+        }
+        
+        viewController.present(alertController, animated: true)
+    }
+}
+

package/ios/EnvironmentConfig.swift

@@ -57,7 +57,8 @@ public class EnvironmentConfig {
             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/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"

package/ios/Models/Request.swift

@@ -87,7 +87,7 @@ public final class Request: NSObject {
     public let billingInfoData: Data?
     let themeConfiguration: ThemeConfiguration?
     let selectedPaymentMethods: [PaymentMethod]
-
+    
     // New parameters
     public let tokenOnly: Bool?
     public let saveCard: Bool?
@@ -95,10 +95,11 @@ public final class Request: NSObject {
     public let submitButtonText: String?
     public let authenticatedACH: Bool?
     public let grailPayParams: GrailPayRequest?
-
+    public let enableRecurring: Bool?
+    
     public init(
         amount: Double,
-        billingInfoData: Data,
+        billingInfoData: Data? = nil,
         paymentMethods: [PaymentMethod]? = nil,
         themeConfiguration: ThemeConfiguration? = nil,
         tokenOnly: Bool = false,
@@ -106,7 +107,8 @@ public final class Request: NSObject {
         saveAccount: Bool = false,
         submitButtonText: String? = nil,
         authenticatedACH: Bool = false,
-        grailPayParams: GrailPayRequest? = nil
+        grailPayParams: GrailPayRequest? = nil,
+        enableRecurring: Bool = false
     ) {
         self.amount = amount
         self.billingInfoData = billingInfoData
@@ -117,7 +119,8 @@ public final class Request: NSObject {
         self.submitButtonText = submitButtonText
         self.authenticatedACH = authenticatedACH
         self.grailPayParams = authenticatedACH ? grailPayParams : nil
-
+        self.enableRecurring = enableRecurring
+        
         if let paymentMethods = paymentMethods {
             self.selectedPaymentMethods = paymentMethods
             UserStoreSingleton.shared.paymentMethods = paymentMethods.map { $0.rawValue }
@@ -140,9 +143,9 @@ public final class Request: NSObject {
             UserStoreSingleton.shared.border_radious = themeConfig.borderRadius
             UserStoreSingleton.shared.fontSize = themeConfig.fontSize
         }
-
+        
         super.init()
-
+        
         // If tokenOnly is true, fetch only the clientToken and do not open the SDK
         if tokenOnly {
             self.paymentIntentApi { success in
@@ -163,29 +166,29 @@ 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)
             return
         }
-
+        
         var request = URLRequest(url: serviceURL)
         request.httpMethod = "POST"
         request.addValue("application/json", forHTTPHeaderField: "Content-Type")
         request.addValue(EnvironmentConfig.apiKey ?? "", forHTTPHeaderField: "X-Api-Key")
         request.addValue(EnvironmentConfig.apiSecret ?? "", forHTTPHeaderField: "X-Api-Secret")
-
+        
         let params: [String: Any] = [
             "amount": amount,
         ]
-
+        
         do {
             request.httpBody = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
         } catch {
@@ -193,34 +196,34 @@ public final class Request: NSObject {
             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")")
                 completion(false)
                 return
             }
-
+            
             if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
                 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)
                             }
@@ -243,29 +246,29 @@ public final class Request: NSObject {
         }
         task.resume()
     }
-
+    
     // 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")
             completion(false)
             return
         }
-
+        
         let endpointPath = EnvironmentConfig.Endpoints.hostedCheckouts.path()
         let serviceURL = baseURL.appendingPathComponent(endpointPath)
-
+        
         var request = URLRequest(url: serviceURL)
         request.httpMethod = "POST"
         request.addValue("application/json", forHTTPHeaderField: "Content-Type")
         request.addValue(UserStoreSingleton.shared.clientToken ?? "", forHTTPHeaderField: "clientToken")
-
+        
         let params: [String: Any] = [
             "amount": amount,
         ]
-
+        
         do {
             request.httpBody = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
         } catch {
@@ -273,33 +276,33 @@ public final class Request: NSObject {
             completion(false)
             return
         }
-
+        
         let task = URLSession.shared.dataTask(with: request) { data, response, error in
-
+            
             guard let httpResponse = response as? HTTPURLResponse, error == nil else {
                 print("Error: \(error?.localizedDescription ?? "Unknown error")")
                 completion(false)
                 return
             }
-
+            
             if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
                 if let data = data {
                     do {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
                            let dataObject = responseObject["data"] as? [String: Any] {
                             print(dataObject)
-
+                            
                             // Save merchant details
                             if let merchantEmail = dataObject["merchant_email"] as? String {
                                 UserStoreSingleton.shared.merchantEmail = merchantEmail
                                 print("Saved merchantEmail: \(merchantEmail)")
                             }
-
+                            
                             if let merchantName = dataObject["merchant_name"] as? String {
                                 UserStoreSingleton.shared.merchantName = merchantName
                                 print("Saved merchantName: \(merchantName)")
                             }
-
+                            
                             // Save payment methods (crypto payment account)
                             if let paymentMethods = dataObject["payment_methods"] as? [String: Any],
                                let cryptoSection = paymentMethods["crypto"] as? [String: Any],
@@ -307,31 +310,31 @@ public final class Request: NSObject {
                                 UserStoreSingleton.shared.paymentAccount = paymentAccount
                                 print("Saved paymentAccount (Crypto): \(paymentAccount)")
                             }
-
+                            
                             // Save payment methods
                             if let paymentMethods = dataObject["payment_methods"] as? [String: Any] {
                                 var paymentMethodNames: [String] = []
-
+                                
                                 if paymentMethods["card"] is [String: Any] {
                                     paymentMethodNames.append("Card")
                                 }
-
+                                
                                 if paymentMethods["ach"] is [String: Any] {
                                     paymentMethodNames.append("Bank")
                                 }
-
+                                
                                 if paymentMethods["crypto"] is [String: Any] {
                                     paymentMethodNames.append("Crypto")
                                 }
-
+                                
                                 if paymentMethods["wallet"] is [String: Any] {
                                     paymentMethodNames.append("Wallet")
                                 }
-
+                                
                                 UserStoreSingleton.shared.paymentMethods = paymentMethodNames
                                 print("Saved payment methods: \(paymentMethodNames)")
                             }
-
+                            
                             if self.themeConfiguration == nil, let appearanceSettings = dataObject["apperance_settings"] as? [String: Any] {
                                 UserStoreSingleton.shared.body_bg_col = appearanceSettings["body_bg_col"] as? String
                                 UserStoreSingleton.shared.border_radious = appearanceSettings["border_radious"] as? String
@@ -344,13 +347,13 @@ public final class Request: NSObject {
                                 UserStoreSingleton.shared.secondary_btn_font_col = appearanceSettings["secondary_font_col"] as? String
                                 UserStoreSingleton.shared.secondary_btn_hover_col = appearanceSettings["secondary_btn_hover_col"] as? String
                                 UserStoreSingleton.shared.secondary_font_col = appearanceSettings["secondary_font_col"] as? String
-
+                                
                                 // Clearing the font size value
                                 UserStoreSingleton.shared.fontSize = nil
                             }
-
+                            
                             completion(true)
-
+                            
                         } else {
                             print("Invalid JSON format or 'data' key is missing")
                             completion(false)
@@ -370,6 +373,5 @@ public final class Request: NSObject {
         }
         task.resume()
     }
-
+    
 }
-