@jimrising/easymerchantsdk-react-native 2.0.0 → 2.0.2

package/.idea/misc.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ProjectRootManager">
     <output url="file://$PROJECT_DIR$/out" />

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": "^2.0.0"
+  "@jimrising/easymerchantsdk-react-native": "^2.0.2"
 },
 ```
 

package/android/build.gradle

@@ -39,7 +39,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.app:paysdk:1.4.7'
+    implementation 'com.app:paysdk:1.4.8'
     implementation 'com.hbb20:ccp:2.7.3'
     implementation 'com.github.bumptech.glide:glide:4.16.0'
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1"

package/ios/Models/Request.swift

@@ -284,6 +284,54 @@ public final class Request: NSObject {
         
         super.init()
         
+        // ✅ Validate recurring intervals
+        if is_recurring == true {
+            let intervals = recurringIntervals ?? []
+            
+            if intervals.count < 2 {
+                DispatchQueue.main.async {
+                    if let topVC = UIApplication.topViewController() {
+                        let alert = UIAlertController(
+                            title: "Recurring Interval Required",
+                            message: "Please add minimum two intervals for recurring.",
+                            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)
+                    }
+                }
+                return
+            }
+
+            let uniqueIntervals = Set(intervals)
+            if uniqueIntervals.count < intervals.count {
+                DispatchQueue.main.async {
+                    if let topVC = UIApplication.topViewController() {
+                        let alert = UIAlertController(
+                            title: "Duplicate Intervals",
+                            message: "Duplicate interval values",
+                            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)
+                    }
+                }
+                return
+            }
+        }
+        
         // If tokenOnly is true, fetch only the clientToken and do not open the SDK
         if tokenOnly {
             self.paymentIntentApi { success in
@@ -342,9 +390,7 @@ public final class Request: NSObject {
         }
         
         let params: [String: Any] = [
-            // "amount": amount ?? 0,
             "amount": ((amount ?? 0) * 100).rounded() / 100,
-            // "allowed_cycles": String(recurringIntervals?.count ?? 0),
             "allowed_cycles": numOfCycle ?? 0,
             "intervals": recurringIntervals?.map { $0.rawValue } ?? [],
             "is_recurring": self.is_recurring ?? false,
@@ -375,7 +421,7 @@ public final class Request: NSObject {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
                             if let clientToken = responseObject["client_token"] as? String {
                                 UserStoreSingleton.shared.clientToken = clientToken
-                                print(clientToken)
+                                // print(clientToken)
                             }
                             if let paymentIntent = responseObject["payment_intent"] as? String {
                                 UserStoreSingleton.shared.paymentIntent = paymentIntent
@@ -404,7 +450,6 @@ public final class Request: NSObject {
             }
             completion(false)
         }
-        
         task.resume()
     }
         
@@ -444,7 +489,6 @@ public final class Request: NSObject {
         request.addValue(UserStoreSingleton.shared.clientToken ?? "", forHTTPHeaderField: "clientToken")
         
         let params: [String: Any] = [
-            // "amount": amount ?? 0,
             "amount": ((amount ?? 0) * 100).rounded() / 100,
         ]
         
@@ -623,7 +667,6 @@ public final class Request: NSObject {
                 completion(nil)
             }
         }
-        
         task.resume()
     }
     
@@ -670,35 +713,3 @@ extension UIApplication {
     }
 }
 
-
-//extension UIViewController {
-//    
-//    func ep_showLoadingIndicator() {
-//        let tag = 99999 // A unique tag so we can identify and remove the loader later
-//        if self.view.viewWithTag(tag) == nil {
-//            let loader = UIActivityIndicatorView(style: .large)
-//            loader.center = self.view.center
-//            loader.tag = tag
-//            loader.startAnimating()
-//            loader.color = .gray
-//            loader.hidesWhenStopped = true
-//            loader.translatesAutoresizingMaskIntoConstraints = false
-//            self.view.addSubview(loader)
-//            
-//            // Optional: center constraints
-//            NSLayoutConstraint.activate([
-//                loader.centerXAnchor.constraint(equalTo: self.view.centerXAnchor),
-//                loader.centerYAnchor.constraint(equalTo: self.view.centerYAnchor)
-//            ])
-//        }
-//    }
-//    
-//    func ep_hideLoadingIndicator() {
-//        let tag = 99999
-//        if let loader = self.view.viewWithTag(tag) as? UIActivityIndicatorView {
-//            loader.stopAnimating()
-//            loader.removeFromSuperview()
-//        }
-//    }
-//}
-

package/ios/easymerchantsdk.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'easymerchantsdk'
-  s.version          = '2.0.0'
+  s.version          = '2.0.2'
   s.summary          = 'A React Native SDK for Easy Merchant.'
   s.description      = <<-DESC
     A React Native SDK to enable Easy Merchant functionality in mobile applications.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jimrising/easymerchantsdk-react-native",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "",
   "main": "index.js",
   "scripts": {