@jimrising/easymerchantsdk-react-native 1.6.8 → 1.6.9

package/.idea/caches/deviceStreaming.xml

@@ -300,6 +300,17 @@
           <option name="screenX" value="384" />
           <option name="screenY" value="384" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="35" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="eqe" />
+          <option name="id" value="eqe" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="edge 50 pro" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1220" />
+          <option name="screenY" value="2712" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="33" />
           <option name="brand" value="google" />

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

package/android/build.gradle

@@ -39,8 +39,9 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.app:paysdk:1.3.2'
+    implementation 'com.app:paysdk:1.3.3'
     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"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1"
     implementation 'com.github.androidmads:QRGenerator:1.0.1'

package/ios/Pods/ViewControllers/OTPVerificationVC.swift

@@ -504,9 +504,9 @@ class OTPVerificationVC: BaseVC {
                 if let data = serviceData,
                    let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
                    let message = responseObj["message"] as? String {
-                   DispatchQueue.main.async {
-                                           self.showToast(message: message)
-                                       }
+                    DispatchQueue.main.async {
+                        self.showToast(message: message)
+                    }
                 }
             }
         }
@@ -540,7 +540,7 @@ class OTPVerificationVC: BaseVC {
             uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
         }
         
-        //  let emailPrefix = email?.components(separatedBy: "@").first ?? ""
+        let emailPrefix = userEmail?.components(separatedBy: "@").first ?? ""
         
         var params: [String: Any] = [
             "name": nameOnCard ?? "",
@@ -550,15 +550,18 @@ class OTPVerificationVC: BaseVC {
             "exp_year": expiryDate?.components(separatedBy: "/").last ?? "",
             "cvc": cvv ?? "",
             "currency": "usd",
-            // "payment_method": selectedPaymentMethod ?? "",
-            "save_card": "1",
+            "payment_method": selectedPaymentMethod ?? "",
+            "save_card": 1,
             "is_default": "1",
             // "create_customer": "1"
-            "email": userEmail ?? ""
+            "email": userEmail ?? "",
+           // "price":"6.0",
+            "tokenize": request.tokenOnly ?? "",
+            "username": emailPrefix
         ]
         
         if let customerId = customerId {
-            // params["customer"] = customerId
+            params["customer"] = customerId
             params["customer_id"] = customerId
         }
         //        else {
@@ -566,6 +569,10 @@ class OTPVerificationVC: BaseVC {
         //            params["email"] = userEmail ?? ""
         //        }
         
+        if customerId == nil {
+            params["create_customer"] = "1"
+        }
+
         if let billingInfoData = request.billingInfoData {
             do {
                 let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
@@ -793,6 +800,10 @@ class OTPVerificationVC: BaseVC {
             params["email"] = email ?? ""
         }
         
+        if customerId == nil {
+            params["create_customer"] = "1"
+        }
+        
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
             if let recurringType = req.recurringStartDateType, recurringType == .custom {
@@ -948,6 +959,10 @@ class OTPVerificationVC: BaseVC {
             params["username"] = emailPrefix
         }
         
+        if customerId == nil {
+            params["create_customer"] = "1"
+        }
+        
         if let billingInfoData = request.billingInfoData {
             do {
                 let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
@@ -1174,6 +1189,10 @@ class OTPVerificationVC: BaseVC {
             params["username"] = emailPrefix
         }
         
+        if customerId == nil {
+            params["create_customer"] = "1"
+        }
+        
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
             if let recurringType = req.recurringStartDateType, recurringType == .custom {
@@ -1316,6 +1335,10 @@ class OTPVerificationVC: BaseVC {
             params["username"] = emailPrefix
         }
         
+        if customerId == nil {
+            params["create_customer"] = "1"
+        }
+        
 //        // Billing Info
 //        if let visibility = visibility, visibility.billing == true,
 //           let billing = billingInfo, !billing.isEmpty {
@@ -1534,6 +1557,10 @@ class OTPVerificationVC: BaseVC {
             "customer_id": customerId ?? ""
         ]
         
+        if customerId == nil {
+            params["create_customer"] = "1"
+        }
+        
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
             if let recurringType = req.recurringStartDateType, recurringType == .custom {
@@ -1670,9 +1697,14 @@ class OTPVerificationVC: BaseVC {
             "tokenize": request.tokenOnly ?? false,
             "save_card": "1",
             "is_default": "1",
-            "customer_id": customerId ?? ""
+            "customer_id": customerId ?? "",
+            "customer" : customerId ?? ""
         ]
         
+        if customerId == nil {
+            params["create_customer"] = "1"
+        }
+        
         // Always include Billing Info if available
         if let billing = billingInfo, !billing.isEmpty {
             var billingDict: [String: Any] = [:]

package/ios/easymerchantsdk.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'easymerchantsdk'
-  s.version          = '1.6.8'
+  s.version          = '1.6.9'
   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": "1.6.8",
+  "version": "1.6.9",
   "description": "",
   "main": "index.js",
   "scripts": {