@jimrising/easymerchantsdk-react-native 1.0.6 → 1.0.9

package/ios/Pods/ViewControllers/PaymentInformation/PaymentInfoVC.swift

@@ -239,6 +239,14 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     override func viewDidLoad() {
         super.viewDidLoad()
         
+        //        viewCardFields.layer.borderColor = UIColor.systemGray.cgColor
+        //        viewCardFields.layer.borderWidth = 1
+        //        viewCardFields.layer.cornerRadius = 8
+        
+        //        viewBankFields.layer.borderColor = UIColor.systemGray.cgColor
+        //        viewBankFields.layer.borderWidth = 1
+        //        viewBankFields.layer.cornerRadius = 8
+        
         viewCryptoTryAgain.layer.borderColor = UIColor.systemGray.cgColor
         viewCryptoTryAgain.layer.borderWidth = 1
         viewCryptoTryAgain.layer.cornerRadius = 8
@@ -1543,32 +1551,31 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func emailVerificationApi() {
         showLoadingIndicator()
         
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
-        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.emailVerification.path()
+        var components = URLComponents()
+        components.scheme = "https"
+        components.host = "stage-api.stage-easymerchant.io"
+        components.path = "/api/v1/customer/send_otp"
         
-        guard let serviceURL = URL(string: fullURL) else {
+        guard let serviceURL = components.url else {
             print("Invalid URL")
             hideLoadingIndicator()
             return
         }
-                
+        
         var request = URLRequest(url: serviceURL)
         request.httpMethod = "POST"
         request.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
-        // Use the clientToken from your singleton
         let token = UserStoreSingleton.shared.clientToken
         print("Setting clientToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
-        // Define the parameters for the request
         let params: [String: Any] = [
             "card_search_value": txtFieldEmail.text ?? "",
             "card_search_key": "email"
         ]
         
         do {
-            // Convert the dictionary to JSON
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
             request.httpBody = jsonData
             if let jsonString = String(data: jsonData, encoding: .utf8) {
@@ -1601,9 +1608,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 if let data = serviceData {
                     do {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
+                            
                             print("Response Data: \(responseObject)")
+                            
                             DispatchQueue.main.async {
-                                // Handle successful response
+                                
                             }
                         } else {
                             print("Invalid JSON format")
@@ -1624,16 +1633,18 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     //MARK: - OTP Verification Api
     func otpVerificationApi() {
         showLoadingIndicator()
-
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
-        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.verifyOtp.path()
         
-        guard let serviceURL = URL(string: fullURL) else {
+        var components = URLComponents()
+        components.scheme = "https"
+        components.host = "stage-api.stage-easymerchant.io"
+        components.path = "/api/v1/customer/verify_otp"
+        
+        guard let serviceURL = components.url else {
             print("Invalid URL")
             hideLoadingIndicator()
             return
         }
-                
+        
         var request = URLRequest(url: serviceURL)
         request.httpMethod = "POST"
         request.addValue("application/json", forHTTPHeaderField: "Content-Type")
@@ -1765,21 +1776,12 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func getShowCardsApi() {
         showLoadingIndicator()
         
-//        var components = URLComponents()
-//        components.scheme = "https"
-//        components.host = "stage-api.stage-easymerchant.io"
-//        components.path = "/api/v1/card"
-//        
-//        guard let serviceURL = components.url else {
-//            print("Invalid URL")
-//            hideLoadingIndicator()
-//            return
-//        }
-        
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
-        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.getCards.path()
-        
-        guard let serviceURL = URL(string: fullURL) else {
+        var components = URLComponents()
+        components.scheme = "https"
+        components.host = "stage-api.stage-easymerchant.io"
+        components.path = "/api/v1/card"
+        
+        guard let serviceURL = components.url else {
             print("Invalid URL")
             hideLoadingIndicator()
             return
@@ -1845,21 +1847,12 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func paymentIntentApi() {
         showLoadingIndicator()
         
-//        var components = URLComponents()
-//        components.scheme = "https"
-//        components.host = "stage-api.stage-easymerchant.io"
-//        components.path = "/api/v1/charges"
-//        
-//        guard let serviceURL = components.url else {
-//            print("Invalid URL")
-//            hideLoadingIndicator()
-//            return
-//        }
-        
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
-        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.creditCharges.path()
-        
-        guard let serviceURL = URL(string: fullURL) else {
+        var components = URLComponents()
+        components.scheme = "https"
+        components.host = "stage-api.stage-easymerchant.io"
+        components.path = "/api/v1/charges"
+        
+        guard let serviceURL = components.url else {
             print("Invalid URL")
             hideLoadingIndicator()
             return
@@ -1955,21 +1948,12 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func paymentIntentFromShowSavedCardApi() {
         showLoadingIndicator()
         
-//        var components = URLComponents()
-//        components.scheme = "https"
-//        components.host = "stage-api.stage-easymerchant.io"
-//        components.path = "/api/v1/charges"
-//        
-//        guard let serviceURL = components.url else {
-//            print("Invalid URL")
-//            hideLoadingIndicator()
-//            return
-//        }
-        
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
-        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.creditCharges.path()
-        
-        guard let serviceURL = URL(string: fullURL) else {
+        var components = URLComponents()
+        components.scheme = "https"
+        components.host = "stage-api.stage-easymerchant.io"
+        components.path = "/api/v1/charges"
+        
+        guard let serviceURL = components.url else {
             print("Invalid URL")
             hideLoadingIndicator()
             return
@@ -2068,21 +2052,12 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func paymentIntentFromAddNewCardApi(customerId: String?) {
         showLoadingIndicator()
         
-//        var components = URLComponents()
-//        components.scheme = "https"
-//        components.host = "stage-api.stage-easymerchant.io"
-//        components.path = "/api/v1/charges"
-//        
-//        guard let serviceURL = components.url else {
-//            print("Invalid URL")
-//            hideLoadingIndicator()
-//            return
-//        }
-        
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
-        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.creditCharges.path()
-        
-        guard let serviceURL = URL(string: fullURL) else {
+        var components = URLComponents()
+        components.scheme = "https"
+        components.host = "stage-api.stage-easymerchant.io"
+        components.path = "/api/v1/charges"
+        
+        guard let serviceURL = components.url else {
             print("Invalid URL")
             hideLoadingIndicator()
             return
@@ -2245,21 +2220,12 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func updateCardApi(cardID: String) {
         showLoadingIndicator()
         
-//        var components = URLComponents()
-//        components.scheme = "https"
-//        components.host = "stage-api.stage-easymerchant.io"
-//        components.path = "/api/v1/card/\(cardID)" // Append the card_id to the path
-//        
-//        guard let serviceURL = components.url else {
-//            print("Invalid URL")
-//            hideLoadingIndicator()
-//            return
-//        }
-        
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
-        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.getCards.path()+"/\(cardID)"
-        
-        guard let serviceURL = URL(string: fullURL) else {
+        var components = URLComponents()
+        components.scheme = "https"
+        components.host = "stage-api.stage-easymerchant.io"
+        components.path = "/api/v1/card/\(cardID)" // Append the card_id to the path
+        
+        guard let serviceURL = components.url else {
             print("Invalid URL")
             hideLoadingIndicator()
             return
@@ -2407,21 +2373,12 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func deleteCardApi(cardID: String, at index: Int) {
         showLoadingIndicator()
         
-//        var components = URLComponents()
-//        components.scheme = "https"
-//        components.host = "stage-api.stage-easymerchant.io"
-//        components.path = "/api/v1/card/\(cardID)" // Append the card_id to the path
-//        
-//        guard let serviceURL = components.url else {
-//            print("Invalid URL")
-//            hideLoadingIndicator()
-//            return
-//        }
-        
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
-        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.getCards.path()+"/\(cardID)"
-        
-        guard let serviceURL = URL(string: fullURL) else {
+        var components = URLComponents()
+        components.scheme = "https"
+        components.host = "stage-api.stage-easymerchant.io"
+        components.path = "/api/v1/card/\(cardID)" // Append the card_id to the path
+        
+        guard let serviceURL = components.url else {
             print("Invalid URL")
             hideLoadingIndicator()
             return
@@ -2499,21 +2456,12 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func getShowBankAccountsApi() {
         showLoadingIndicator()
         
-//        var components = URLComponents()
-//        components.scheme = "https"
-//        components.host = "stage-api.stage-easymerchant.io"
-//        components.path = "/api/v1/ach/account"
-//        
-//        guard let serviceURL = components.url else {
-//            print("Invalid URL")
-//            hideLoadingIndicator()
-//            return
-//        }
-        
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
-        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.account.path()
-        
-        guard let serviceURL = URL(string: fullURL) else {
+        var components = URLComponents()
+        components.scheme = "https"
+        components.host = "stage-api.stage-easymerchant.io"
+        components.path = "/api/v1/ach/account"
+        
+        guard let serviceURL = components.url else {
             print("Invalid URL")
             hideLoadingIndicator()
             return
@@ -2613,21 +2561,12 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func accountChargeApi() {
         showLoadingIndicator()
         
-//        var components = URLComponents()
-//        components.scheme = "https"
-//        components.host = "stage-api.stage-easymerchant.io"
-//        components.path = "/api/v1/ach/charge"
-//        
-//        guard let serviceURL = components.url else {
-//            print("Invalid URL")
-//            hideLoadingIndicator()
-//            return
-//        }
-        
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
-        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()
-        
-        guard let serviceURL = URL(string: fullURL) else {
+        var components = URLComponents()
+        components.scheme = "https"
+        components.host = "stage-api.stage-easymerchant.io"
+        components.path = "/api/v1/ach/charge"
+        
+        guard let serviceURL = components.url else {
             print("Invalid URL")
             hideLoadingIndicator()
             return
@@ -2724,21 +2663,12 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func accountChargeSavedBankAccountApi() {
         showLoadingIndicator()
         
-//        var components = URLComponents()
-//        components.scheme = "https"
-//        components.host = "stage-api.stage-easymerchant.io"
-//        components.path = "/api/v1/ach/charge"
-//        
-//        guard let serviceURL = components.url else {
-//            print("Invalid URL")
-//            hideLoadingIndicator()
-//            return
-//        }
-        
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
-        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()
-        
-        guard let serviceURL = URL(string: fullURL) else {
+        var components = URLComponents()
+        components.scheme = "https"
+        components.host = "stage-api.stage-easymerchant.io"
+        components.path = "/api/v1/ach/charge"
+        
+        guard let serviceURL = components.url else {
             print("Invalid URL")
             hideLoadingIndicator()
             return
@@ -2832,21 +2762,12 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func accountChargeAddNewAccountApi() {
         showLoadingIndicator()
         
-//        var components = URLComponents()
-//        components.scheme = "https"
-//        components.host = "stage-api.stage-easymerchant.io"
-//        components.path = "/api/v1/ach/charge"
-//        
-//        guard let serviceURL = components.url else {
-//            print("Invalid URL")
-//            hideLoadingIndicator()
-//            return
-//        }
-        
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
-        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()
-        
-        guard let serviceURL = URL(string: fullURL) else {
+        var components = URLComponents()
+        components.scheme = "https"
+        components.host = "stage-api.stage-easymerchant.io"
+        components.path = "/api/v1/ach/charge"
+        
+        guard let serviceURL = components.url else {
             print("Invalid URL")
             hideLoadingIndicator()
             return
@@ -2950,21 +2871,12 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func accountChargeApi(customerId: String?) {
         showLoadingIndicator()
         
-//        var components = URLComponents()
-//        components.scheme = "https"
-//        components.host = "stage-api.stage-easymerchant.io"
-//        components.path = "/api/v1/ach/charge"
-//        
-//        guard let serviceURL = components.url else {
-//            print("Invalid URL")
-//            hideLoadingIndicator()
-//            return
-//        }
-        
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
-        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()
-        
-        guard let serviceURL = URL(string: fullURL) else {
+        var components = URLComponents()
+        components.scheme = "https"
+        components.host = "stage-api.stage-easymerchant.io"
+        components.path = "/api/v1/ach/charge"
+        
+        guard let serviceURL = components.url else {
             print("Invalid URL")
             hideLoadingIndicator()
             return
@@ -3078,21 +2990,12 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func deleteAccountApi(accountID: String, at index: Int) {
         showLoadingIndicator()
         
-//        var components = URLComponents()
-//        components.scheme = "https"
-//        components.host = "stage-api.stage-easymerchant.io"
-//        components.path = "/api/v1/ach/account/\(accountID)" // Append the account_id to the path
-//        
-//        guard let serviceURL = components.url else {
-//            print("Invalid URL")
-//            hideLoadingIndicator()
-//            return
-//        }
-        
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
-        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()+"/\(accountID)"
-        
-        guard let serviceURL = URL(string: fullURL) else {
+        var components = URLComponents()
+        components.scheme = "https"
+        components.host = "stage-api.stage-easymerchant.io"
+        components.path = "/api/v1/ach/account/\(accountID)" // Append the account_id to the path
+        
+        guard let serviceURL = components.url else {
             print("Invalid URL")
             hideLoadingIndicator()
             return
@@ -3158,21 +3061,12 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     // MARK: - Crypto Charge API
     func cryptoChargeApi() {
         showLoadingIndicator()
-//        var components = URLComponents()
-//        components.scheme = "https"
-//        components.host = "stage-api.stage-easymerchant.io"
-//        components.path = "/api/v1/charges"
-//        
-//        guard let serviceURL = components.url else {
-//            print("Invalid URL")
-//            hideLoadingIndicator()
-//            return
-//        }
-        
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
-        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.charges.path()
-        
-        guard let serviceURL = URL(string: fullURL) else {
+        var components = URLComponents()
+        components.scheme = "https"
+        components.host = "stage-api.stage-easymerchant.io"
+        components.path = "/api/v1/charges"
+        
+        guard let serviceURL = components.url else {
             print("Invalid URL")
             hideLoadingIndicator()
             return
@@ -3305,22 +3199,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     //MARK: - GET Crypto Payment Info API
     func getCryptoPaymentInfoApi(chargeId: String) {
         
-//        var components = URLComponents()
-//        components.scheme = "https"
-//        components.host = "stage-api.stage-easymerchant.io"
-//        components.path = "/api/v1/charges/\(chargeId)" // Append chargeId to the path
-//        
-//        guard let serviceURL = components.url else {
-//            print("Invalid URL")
-//            return
-//        }
-        
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
-        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.charges.path()+"/\(chargeId)"
+        var components = URLComponents()
+        components.scheme = "https"
+        components.host = "stage-api.stage-easymerchant.io"
+        components.path = "/api/v1/charges/\(chargeId)" // Append chargeId to the path
         
-        guard let serviceURL = URL(string: fullURL) else {
+        guard let serviceURL = components.url else {
             print("Invalid URL")
-            hideLoadingIndicator()
             return
         }
         

package/ios/easymerchantsdk.podspec

@@ -39,22 +39,7 @@ Pod::Spec.new do |s|
    ]
 
   # Resources and other files that need to be included
-   s.resource_bundles = {
-      "easymerchantsdk" => [
-            "Bundle/*",
-            "Classes/*",
-            "CustomComponents/**/*",
-            "Extensions/**/*",
-            "Models/*",
-            "Resources/*",
-            "ThirdParty/**/*",
-            "*.swift",
-            "*.storyboard",
-            "Example/*",
-            "Pods/**/*",
-            "ThirdParty/**/*"
-      ]
-    }
+   s.resource_bundles = {'easymerchantsdk' => ['Resources/**/*', '*.storyboard']}
 
   s.exclude_files = [
     "Resources/Info.plist",
@@ -77,4 +62,4 @@ Pod::Spec.new do |s|
 
   # Additional settings (uncomment if you have specific resources)
   # s.resources = 'EasyPay/Resources/**/*'
-end
+end

package/package.json

@@ -1,27 +1,18 @@
 {
   "name": "@jimrising/easymerchantsdk-react-native",
-  "version": "1.0.6",
-  "description": "A React Native SDK for EasyMerchant",
+  "version": "1.0.9",
+  "description": "",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "keywords": [
-    "react-native",
-    "easymerchant",
-    "sdk"
+    "react-native"
   ],
   "author": "",
-  "license": "MIT",
+  "license": "",
   "peerDependencies": {
-    "react-native": "^0.76.4",
-    "react-native-windows": "^0.76.2"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/EasyMerchant/em-MobileCheckoutSDK-ReactNative.git#dev-branch"
-  },
-  "publishConfig": {
-    "access": "restricted"
+    "react-native": "^0.77.0",
+    "react-native-windows": "^0.77.1"
   }
 }

package/src/index.js

@@ -14,7 +14,7 @@ const platformVersion = async () => {
   }
 };
 
-const billing = async (amount, billingInfo,env,apiKey,secretKey) => {
+const billing = async (amount, billingInfo) => {
   return new Promise((resolve, reject) => {
     const successCallback = (response) => {
       resolve(response);
@@ -26,7 +26,7 @@ const billing = async (amount, billingInfo,env,apiKey,secretKey) => {
 
     try {
       if (Platform.OS === 'android') {
-        RNEasymerchantsdk.billing(amount, billingInfo, env,apiKey,secretKey,successCallback, errorCallback);
+        RNEasymerchantsdk.billing(amount, billingInfo, successCallback, errorCallback);
       } else if (Platform.OS === 'ios') {
         EasyMerchantSdk.billing(amount, billingInfo)
           .then(successCallback)

package/.idea/misc.xml

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

package/android/build/.transforms/27d3a0c22098810ca42038b1b8102417/results.bin

@@ -1 +0,0 @@
-o/bundleLibRuntimeToDirDebug

package/android/build/.transforms/41cd2635778c1bb5c18af2c46eb9196e/results.bin

@@ -1 +0,0 @@
-o/classes

package/android/build/.transforms/6b36622787f586c4b6e3df98c5efa11c/results.bin

@@ -1 +0,0 @@
-o/bundleLibRuntimeToDirDebug

package/android/build/.transforms/7eb7ceaa43c9e8323ac65b4f785987b6/results.bin

@@ -1 +0,0 @@
-o/classes

package/android/build/.transforms/a8b93af4be449a0e2cca4bd6ddb6685e/results.bin

@@ -1 +0,0 @@
-o/bundleLibRuntimeToDirDebug

package/android/build/.transforms/f1a160720415bc76d8d6c6734c5acf3e/results.bin

@@ -1 +0,0 @@
-o/classes