@nuskin/ns-shop 5.21.1 → 5.21.4

package/package.json

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

package/src/order/orderAdapter.js

@@ -860,8 +860,13 @@ let setSelectedShipMethod = function(order, matchMethod = {}) {
     }
 };
 
-// Parses pickup points from SAP response, in case shipping method is set to pickup points!
-function setPickupPoints(custom, order) {
+/**
+ * Parses pickup points from SAP response, in case shipping method is set to pickup points!
+ * @param {Object[]} custom The Custom array on the salesorderrequest
+ * @param {Object} order
+ */
+function setPickupPoints(custom = [], order) {
+    custom = custom || [];
     if (order.selectedShippingMethod && PickupUtil.supports(order.selectedShippingMethod.Code)) {
         order.pickupPoints = PickupUtil.parse(custom);
         if (order.selectedPickupPoint) {

package/src/receiver.js

@@ -1,5 +1,5 @@
 import $ from '@nuskin/nuskinjquery';
-import {UserService, AuthenticationService} from "@nuskin/ns-account";
+import {UserService, AuthenticationService, VGDistInfoService} from "@nuskin/ns-account";
 import {ConfigService, RunConfigService, storage, util, ShoppingContext, Base64, events} from "@nuskin/ns-util";
 import {Agelocme} from '@nuskin/ns-product-lib';
 import CartService from './cart/cartService';
@@ -350,11 +350,16 @@ const setUserInfo = (mobileUser) => {
     UserService.setLoggedIn(true);
     events.publish(events.authentication.VALID, [userInfo]);
     AuthenticationService.generateMecCookies();
+    VGDistInfoService.checkVolumeData().then(() => console.log('Checked Volume Data'));
 };
 
 let receivingMobile = false;
 const eventListener = async (message) => {
-    let data = JSON.parse(message.data);
+    let data = {};
+
+    if (typeof message.data === 'string') {
+        data = JSON.parse(message.data);
+    }
 
     if (data.cartMessage) {
         receivingMobile = true;
@@ -372,11 +377,7 @@ const eventListener = async (message) => {
         if (data.eid) {
             await authenticateWithEid(data.eid);
         } else if (data.user && data.user.eid) {
-            if (RunConfigService.getRunConfig().country === 'JP') {
-                await authenticateWithEid(data.user.eid);
-            } else {
-                setUserInfo(data.user);
-            }
+            setUserInfo(data.user);
         } else {
             if (AuthenticationService.isLoggedIn()) {
                 CartService.clearCart();