@nuskin/ns-shop 5.11.21 → 5.11.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-shop",
-  "version": "5.11.21",
+  "version": "5.11.24",
   "description": "The description that will amaze and astound your audience when they read it",
   "main": "src/shop.js",
   "scripts": {

package/src/payment/Payment.js

@@ -44,6 +44,10 @@ newShop.Payment = function(paymentData){
         this.installmentSelectedNumber = paymentData.installmentSelectedNumber;
         this.availableInstallmentPeriods = paymentData.availableInstallmentPeriods;
         this.mandateType = paymentData.mandateType;
+        this.storedCredentialsAgreementDate = paymentData.storedCredentialsAgreementDate;
+        this.storedCredentialsNetworkTransactionId = paymentData.storedCredentialsNetworkTransactionId;
+        this.storedCredentialsNetworkDateStr = paymentData.storedCredentialsNetworkDateStr;
+
 
         // Columbia Fields
         this.extTerm = paymentData.extTerm;
@@ -141,6 +145,10 @@ newShop.Payment = function(paymentData){
         payment.availableInstallmentPeriods = this.availableInstallmentPeriods;
         payment.countryCode = this.countryCode;
         payment.mandateType = this.mandateType;
+        payment.storedCredentialsAgreementDate = this.storedCredentialsAgreementDate;
+        payment.storedCredentialsNetworkTransactionId = this.storedCredentialsNetworkTransactionId;
+        payment.storedCredentialsNetworkDateStr = this.storedCredentialsNetworkDateStr;
+
 
         // Columbia Fields
         payment.extTerm = this.extTerm;
@@ -274,6 +282,16 @@ newShop.Payment = function(paymentData){
     this.setMandateType  = function(newMandateType) {
         this.mandateType  = newMandateType;
     };
+    this.setStoredCredentialsAgreementDate = function(newStoredCredentialsAgreementDate) {
+        this.storedCredentialsAgreementDate = newStoredCredentialsAgreementDate;
+    };
+    this.setStoredCredentialsNetworkTransactionId = function(newStoredCredentialsNetworkTransactionId) {
+        this.storedCredentialsNetworkTransactionId = newStoredCredentialsNetworkTransactionId;
+    };
+    this.setStoredCredentialsNetworkDateStr = function(newStoredCredentialsNetworkDateStr) {
+        this.storedCredentialsNetworkDateStr = newStoredCredentialsNetworkDateStr;
+    };
+
 
     // ---------------------------------------------
     //
@@ -330,7 +348,13 @@ newShop.Payment = function(paymentData){
     };
     this.getStoredCredentialsAgreementDate = function() {
         return this.storedCredentialsAgreementDate;
-    }
+    };
+    this.getStoredCredentialsNetworkTransactionId = function() {
+        return this.storedCredentialsNetworkTransactionId;
+    };
+    this.getStoredCredentialsNetworkDateStr = function() {
+        return this.storedCredentialsNetworkDateStr;
+    };
     this.getDefaultPayment = function() {
         return this.defaultPayment;
     };

package/src/payment/PaymentAdapter.js

@@ -169,8 +169,8 @@ function populatePayment(order, salesOrder) {
                         paymentToSend.CreditCard.TrackOne = "";
                         if (order.selectedPayment.storedCredentialsAgreementDate) {
                             paymentToSend.storedCredentialsAgreementDate = order.selectedPayment.storedCredentialsAgreementDate;
-                            paymentToSend.storedCredentialsNetworkTransactionId = order.selectedPayment.storedCredentialsNetworkTransactionId;
                             paymentToSend.storedCredentialsNetworkDateStr = order.selectedPayment.storedCredentialsNetworkDateStr;
+                            paymentToSend.storedCredentialsNetworkTransactionId = order.selectedPayment.storedCredentialsNetworkTransactionId;
                         }
                         if(cx8_380_accertify) {
                             if (AccertifyFraudService.accertifyInMarketConfig(ConfigService.getMarketConfig())) {

package/src/payment/paymentDto.js

@@ -40,6 +40,8 @@ class PaymentDto {
      *  countryCode?: string,
      *  ccToken?: string,
      *  email?: string,
+     *  storedCredentialsAgreementDate?: string, 
+     *  storedCredentialsAgreementDate?: string, 
      *  storedCredentialsAgreementDate?: string 
      * }} [data]
      */
@@ -62,6 +64,8 @@ class PaymentDto {
         this.countryCode = data.countryCode;
         this.email = data.email;
         this.storedCredentialsAgreementDate = data.storedCredentialsAgreementDate;
+        this.storedCredentialsNetworkTransactionId = data.storedCredentialsNetworkTransactionId;
+        this.storedCredentialsNetworkDateStr = data.storedCredentialsNetworkDateStr;
     }
 }
 

package/src/receiver.js

@@ -294,61 +294,57 @@ const addItemsToCart = async () => {
     }
 };
 
-const initalizeForMobile = async () => {
-    return new Promise((resolve) => {
-        let timer = null;
-        const promises = [];
-        const runConfig = RunConfigService.getRunConfig();
-        const user = UserService.getUser();
-
-        ShoppingContext.setShoppingContext(ShoppingContext.MOBILE_CONSUMER);
-
-        window.addEventListener("message", async message => {
-            let data = JSON.parse(message.data);
-
-            if (data.eid) {
-                if (user && Base64.decode(data.eid).indexOf(user.id) >= 0) {
-                    user.eid = data.eid;
-                    UserService.setUser(user);
-                } else {
-                    try {
-                        CartService.clearCart();
-                        promises.push(AccountManager.authenticateWithEid(data.eid, true));
-                    } catch (err) {
-                        console.error('Unable to log in mobile user!');
-                    }
+const eventListener = async (message) => {
+    const promises = [];
+    const runConfig = RunConfigService.getRunConfig();
+    const user = UserService.getUser();
+    let data = JSON.parse(message.data);
+
+    if (data.eid && data.products) {
+        if (data.eid) {
+            if (user && Base64.decode(data.eid).indexOf(user.id) >= 0) {
+                user.eid = data.eid;
+                UserService.setUser(user);
+            } else {
+                try {
+                    CartService.clearCart();
+                    promises.push(AccountManager.authenticateWithEid(data.eid, true));
+                } catch (err) {
+                    console.error('Unable to log in mobile user!');
                 }
             }
+        }
 
-            if (data.shoppingContext && ShoppingContext[data.shoppingContext]) {
-                ShoppingContext.setShoppingContext(ShoppingContext[data.shoppingContext]);
-            }
+        if (data.shoppingContext && ShoppingContext[data.shoppingContext]) {
+            ShoppingContext.setShoppingContext(ShoppingContext[data.shoppingContext]);
+        }
 
-            if (Array.isArray(data.products)) {
-                data.products.forEach(product => {
-                    promises.push(CartService.addSkuToCart({
-                        sku: product.sku,
-                        cntryCd: runConfig.country,
-                        language: runConfig.language,
-                        qty: product.qty,
-                        isAdr: product.oneTime === false
-                    }));
-                })
-            }
-            await Promise.allSettled(promises);
-            // the user is being authenticated synchronously so let's make sure
-            // the products reflect the correct price.
-            CartService.updateItemPrices();
-            clearTimeout(timer);
-            resolve();
-        });
+        if (Array.isArray(data.products)) {
+            data.products.forEach(product => {
+                promises.push(CartService.addSkuToCart({
+                    sku: product.sku,
+                    cntryCd: runConfig.country,
+                    language: runConfig.language,
+                    qty: product.qty,
+                    isAdr: product.oneTime === false
+                }));
+            })
+        }
+        await Promise.allSettled(promises);
+        // the user is being authenticated synchronously so let's make sure
+        // the products reflect the correct price.
+        CartService.updateItemPrices();
+        events.setValue(events.mobile.NATIVE_INITIALIZING, [false]);
+    }
+}
+
+const initalizeForMobile = () => {
+    ShoppingContext.setShoppingContext(ShoppingContext.MOBILE_CONSUMER);
 
-        window.ReactNativeWebView.postMessage(JSON.stringify({name: 'ready_to_receive', payload: {}}));
+    window.addEventListener("message", eventListener)
+    document.addEventListener("message", eventListener);
 
-        timer = setTimeout(() => {
-            resolve();
-        }, 8000)
-    });
+    window.ReactNativeWebView.postMessage(JSON.stringify({name: 'ready_to_receive', payload: {}}));
 };
 
 const receiveUrlParams = () => {
@@ -412,9 +408,7 @@ const receiveUrlParams = () => {
 const receive = () => {
     if (window.ReactNativeWebView) {
         events.setValue(events.mobile.NATIVE_INITIALIZING, [true]);
-        initalizeForMobile().then(() => {
-            events.setValue(events.mobile.NATIVE_INITIALIZING, [false]);
-        });
+        initalizeForMobile();
     } else {
         receiveUrlParams();
     }