@traund/orquezta-widget-calculator 1.0.2 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@traund/orquezta-widget-calculator",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Calculator React component",
   "main": "dist/index.js",
   "typings": "dist/index.js",

package/src/calculatorV2.js

@@ -292,12 +292,12 @@ class Calculator extends Component {
     _convertAmount = async (currency) => {
         try {
             if (currency == "ARS") {
-                const { data } = await axios.get(`${this.ENDPOINTS.CALCULATOR.exchangeBlue}`);
+                const { data } = await axios.get(`${this.ENDPOINTS.EXCHANGE.getUSDBlueRate}`);
                 let blueRate = await JSON.parse(JSON.stringify(data));
                 blueRate = { result: blueRate.blue.value_sell };
                 return blueRate;
             } else {
-                const { data } = await axios.get(`${this.ENDPOINTS.CALCULATOR.exchangeRatev2}`);
+                const { data } = await axios.get(`${this.ENDPOINTS.EXCHANGE.getRate_v2(currency)}`);
                 return { result: parseFloat(data['usd'][currency.toLowerCase()].toFixed(2)) };
             }
         } catch (e) {
@@ -720,7 +720,7 @@ class Calculator extends Component {
         };
 
         if (source == "initial" || source == "end") {
-            const url = this.ENDPOINTS.TRANSACTION.calculate_v2(this.state.storeId || sessionStorage.getItem('storeId'), "from");
+            const url = this.ENDPOINTS.OPERATIONS.calculate(this.state.storeId || sessionStorage.getItem('storeId'), "from");
 
             const res = await axios.post(
             url,
@@ -779,7 +779,7 @@ class Calculator extends Component {
                         this.setState({
                             sendValue: "",
                         });
-                    const url = this.ENDPOINTS.TRANSACTION.calculate_v2(this.state.storeId, source)
+                    const url = this.ENDPOINTS.OPERATIONS.calculate(this.state.storeId, source)
 
                     const res = await axios.post(
                         url,
@@ -982,7 +982,7 @@ class Calculator extends Component {
             }
 
             //if (db) db.clearPersistence();
-            const firebase = await loadFirebaseDB(this.state.testMode);
+            const firebase = await loadFirebaseDB(this.state.testMode,this.state.config);
             const db = firebase.firestore();
 
             if (this.state.couponRedeemed && this.state.couponValue != "") {
@@ -1060,7 +1060,7 @@ class Calculator extends Component {
     };
 
     validateCoupon = async (cupon) => {
-      const url =  `${this.ENDPOINTS.COUPON.validate}/${cupon}`
+      const url =  `${this.ENDPOINTS.OPERATIONS.validateCoupon}/${cupon}`
 
         try {
         const response = await axios.get(

package/src/core/endpoints.js

@@ -1,37 +1,41 @@
 import { BACKEND_SETTINGS } from "./backend-settings";
+
 class EndPoints {
     constructor(testMode = 'production', externalConfig = null) {
         this._testMode = testMode;
-        this.baseUrl = externalConfig && externalConfig.url;
+        this.baseUrl = externalConfig?.backendUrl;
         this.path_managment_operations = `${this.baseUrl}/handle-operations`;
     }
 
-    /*get HEADERS() {
-        return this.baseUrl = BACKEND_SETTINGS[this._testMode].HEADERS;
-    };*/
 
-    get COUPON() {
+    get CALLBACK() {
         return {
-            validate: `${this.path_managment_operations}/coupon/v1/validate`,
+            landing_transfer: (baseUrl, locale) => `${baseUrl}/${locale}/send`,
+            landing_receive: (baseUrl, locale) => `${baseUrl}/${locale}/receive`,
+            landing_wallet: (baseUrl, locale) => `${baseUrl}/${locale}/wallet`,
+            referral_transfer: (baseUrl, locale, storeId) => `${baseUrl}/${locale}/login?referral=operation&type=transfer&reference=${storeId}`,
+            referral_receive: (baseUrl, locale, storeId) => `${baseUrl}/${locale}/login?referral=operation&type=pay&reference=${storeId}`,
+            referral_recharge: (baseUrl, locale, storeId) => `${baseUrl}/${locale}/login?referral=operation&type=recharge&reference=${storeId}`,
         }
     };
 
-    get TRANSACTION() {
+    get OPERATIONS() {
         return {
-            calculate: `${this.path_managment_operations}/transaction/v1/calculate`,
-            calculate_v2: (storeId, source) =>
-                `${this.path_managment_operations}/calculate/v1/update/${storeId}/${source}`,
+            calculate: (storeId, source) => `${this.path_managment_operations}/calculate/v1/update/${storeId}/${source}`,
+            validateCoupon: `${this.path_managment_operations}/coupon/v1/validate`
         }
     };
 
-    get CALCULATOR() {
+    get EXCHANGE() {
         return {
-            exchangeRate: `https://api.exchangerate.host/convert?from=USD&to=`,
-            exchangeRatev2: 'https://cdn.jsdelivr.net/npm/@fawazahmed0/currency-api@latest/v1/currencies/usd.json',
-            exchangeBlue: `https://api.bluelytics.com.ar/v2/latest`,
-            convert: `https://api.exchangerate.host/convert?from=USD&to=`,
+            getRate: (currencyFrom, currencyTo) => `https://api.exchangerate.host/convert?from=${currencyFrom}&to=${currencyTo}`,
+            getRate_bk_1: (currencyFrom, currencyTo) => `https://api-us.exchangerate.host/convert?from=${currencyFrom}&to=${currencyTo}`,
+            getRate_bk_2: (currencyFrom, currencyTo) => `https://api-eu.exchangerate.host/convert?from=${currencyFrom}&to=${currencyTo}`,
+            getRate_v2: (currencyFrom) => `https://cdn.jsdelivr.net/npm/@fawazahmed0/currency-api@latest/v1/currencies/${currencyFrom.toLowerCase()}.json`,
+            getRate_v3: (currencyFrom, currencyTo) => `https://cdnhlp-staging.traund.xyz/rates/v1/${currencyFrom}/${currencyTo}`,
+            getUSDBlueRate: `https://api.bluelytics.com.ar/v2/latest`
         }
     };
 }
 
-module.exports = EndPoints;
+export default EndPoints;

package/src/simulator.js

@@ -7,7 +7,7 @@ import Button from "@material-ui/core/Button";
 import en from "./locale/en";
 import es from "./locale/es";
 import loadFirebaseDB from "./firebase.config";
-import Endpoints from "./core/endpointsv2";
+import Endpoints from "./core/endpoints";
 import TransferUser from "./model/transferUser";
 import { TransferType, UserType, SimulatorMode } from "./model/enums";
 import CalculateHelper from "./utils/calculateHelper";
@@ -33,9 +33,9 @@ function Simulator(props) {
     const content = locale === "es" ? es : en;
     const classes = useStyles();
 
-    const __ENDPOINTS = new Endpoints(props.testMode);
-    const __calculateHelper = new CalculateHelper(props.testMode);
-    const __operationsHelper = new OperationsHelper(props.testMode, props.reference);
+    const __ENDPOINTS = new Endpoints(props.testMode, props.config);
+    const __calculateHelper = new CalculateHelper(props.testMode, props.config);
+    const __operationsHelper = new OperationsHelper(props.testMode, props.reference,props.config);
 
     const __firebase = loadFirebaseDB(props.testMode, props.config);
 

package/src/utils/calculateHelper.js

@@ -1,12 +1,13 @@
 import RateHelper from "./rateHelper";
 
 class CalculateHelper {
-    constructor(testMode = 'production') {
+    constructor(testMode = 'production',config=null) {
         this._testMode = testMode;
+        this.config = config;
     }
 
     async getCaculateRates(countriesData) {
-        const rateHelper = new RateHelper(this._testMode);
+        const rateHelper = new RateHelper(this._testMode, this.config);
         const middleCurrency = "USD";
 
         for (var key in countriesData) {

package/src/utils/operationsHelper.js

@@ -1,13 +1,14 @@
 import axios from "axios";
 import moment from "moment";
-import EndPoints from "../core/endpointsv2";
+import EndPoints from "../core/endpoints";
 import { TRANSACTION_TIMES } from "../core/transaction-settings";
 import { getExpirationDate } from "../core/working-setup";
 import { getSignatureHeader } from "../../src/core/signature";
+import { config } from "aws-sdk";
 
 class OperationsHelper {
-    constructor(testMode = 'production', secretKey = null) {
-        this.endpoints = new EndPoints(testMode);
+    constructor(testMode = 'production', secretKey = null, config=null) {
+        this.endpoints = new EndPoints(testMode, config);
         this.reference = secretKey;
         this.FEES = {
             "ach": { type: "A", value: 0 },

package/src/utils/rateHelper.js

@@ -1,9 +1,9 @@
 import axios from "axios";
-import EndPoints from "../core/endpointsv2";
+import EndPoints from "../core/endpoints";
 
 class RateHelper {
-    constructor(testMode = 'production') {
-        this.endpoints = new EndPoints(testMode);
+    constructor(testMode = 'production',externalConfig = null) {
+        this.endpoints = new EndPoints(testMode, externalConfig);
     }
 
     async getExchangeRate(currencyFrom, currencyTo) {

package/src/core/endpointsv2.js

@@ -1,44 +0,0 @@
-import { BACKEND_SETTINGS } from "./backend-settings";
-
-class EndPoints {
-    constructor(testMode = 'production') {
-        this._testMode = testMode;
-        this.baseUrl = BACKEND_SETTINGS[this._testMode].URL;
-        this.path_managment_operations = `${this.baseUrl}/handle-operations`;
-    }
-
-    get HEADERS() {
-        return this.baseUrl = BACKEND_SETTINGS[this._testMode].HEADERS;
-    };
-
-    get CALLBACK() {
-        return {
-            landing_transfer: (baseUrl, locale) => `${baseUrl}/${locale}/send`,
-            landing_receive: (baseUrl, locale) => `${baseUrl}/${locale}/receive`,
-            landing_wallet: (baseUrl, locale) => `${baseUrl}/${locale}/wallet`,
-            referral_transfer: (baseUrl, locale, storeId) => `${baseUrl}/${locale}/login?referral=operation&type=transfer&reference=${storeId}`,
-            referral_receive: (baseUrl, locale, storeId) => `${baseUrl}/${locale}/login?referral=operation&type=pay&reference=${storeId}`,
-            referral_recharge: (baseUrl, locale, storeId) => `${baseUrl}/${locale}/login?referral=operation&type=recharge&reference=${storeId}`,
-        }
-    };
-
-    get OPERATIONS() {
-        return {
-            calculate: (storeId, source) => `${this.path_managment_operations}/calculate/v1/update/${storeId}/${source}`,
-            validateCoupon: `${this.path_managment_operations}/coupon/v1/validate`
-        }
-    };
-
-    get EXCHANGE() {
-        return {
-            getRate: (currencyFrom, currencyTo) => `https://api.exchangerate.host/convert?from=${currencyFrom}&to=${currencyTo}`,
-            getRate_bk_1: (currencyFrom, currencyTo) => `https://api-us.exchangerate.host/convert?from=${currencyFrom}&to=${currencyTo}`,
-            getRate_bk_2: (currencyFrom, currencyTo) => `https://api-eu.exchangerate.host/convert?from=${currencyFrom}&to=${currencyTo}`,
-            getRate_v2: (currencyFrom) => `https://cdn.jsdelivr.net/npm/@fawazahmed0/currency-api@latest/v1/currencies/${currencyFrom.toLowerCase()}.json`,
-            getRate_v3: (currencyFrom, currencyTo) => `https://cdnhlp-staging.traund.xyz/rates/v1/${currencyFrom}/${currencyTo}`,
-            getUSDBlueRate: `https://api.bluelytics.com.ar/v2/latest`
-        }
-    };
-}
-
-export default EndPoints;