@nuskin/ns-shop 5.13.0 → 5.14.0

package/package.json

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

package/src/cart/persistentCartService.js

@@ -241,7 +241,17 @@ const getPersistedCart = async (user) => {
         url: getUrl('getCartByAccountId', user.id, {country: runConfig.country, type: 'market'}),
         headers: getHeaders(user.eid)
     });
-    return get(response, 'data.cart', null);
+    const cart = response.data.cart;
+
+    const lsCartId = CartService.getCartProperty('id');
+    if ((cart && lsCartId && cart.id != lsCartId) || (!cart && lsCartId)) {
+        CartService.clearCart();
+    }
+
+    if (cart) {
+        CartService.setCartProperties({id: cart.id, version: response.data.version});
+    }
+    return cart;
 };
 
 /**
@@ -261,8 +271,11 @@ const updatePersistedCart = async (user, cartId, payload) => {
     });
 
     const pCart = response.data.cart || null;
-    const cartOutdated = response.data.cartWasOutdated;
-    CartService.setCartProperties({version: pCart ? pCart.version : -1});
+    if (cartId && pCart.id !== cartId) {
+        CartService.clearCart();
+    }
+    const cartOutdated = response.data.cartOutdated;
+    CartService.setCartProperties({id: pCart.id, version: pCart ? response.data.version : -1});
     return {pCart, cartOutdated};
 };
 
@@ -295,7 +308,7 @@ const addPersistedItemToLocal = (pItem, userId, country, language) => {
         return;
     }
     return CartService.addSkuToCart({
-        id: pItem.lineId,
+        id: pItem.id,
         agelocme: pItem.agelocme,
         sku: pItem.sku,
         userId: userId,
@@ -402,10 +415,8 @@ const mergeIntoLocalCart = async (userId, pCart) => {
     //Todo review (seems overly complicated)
     mergingIntoLocalCart = true;
     if (pCart) {
-        CartService.setCartProperties({id: pCart.id, version: pCart.version});
-
         const {country, language} = RunConfigService.getRunConfig();
-        const lineItems = pCart.order.lineItems || [];
+        const lineItems = pCart.lineItems || [];
         const pItemsBySku = lineItems.reduce((skuArrs, pItem) => {
             let skuArray = skuArrs.find((arr) => arr[0].sku === pItem.sku);
 
@@ -476,7 +487,6 @@ const getAction = (action, data) => {
                 gpid: data.globalProductID,
                 sku: data.sku,
                 quantity: data.quantity || data.qty,
-                channel: data.isAdr ? 'subscription' : 'order',
                 oneTime: !data.isAdr
             };
             break;
@@ -568,7 +578,7 @@ const syncCartItems = (pCart) => {
     const syncItems = [];
     const cartItems = CartService.getItemData();
 
-    pCart.order.lineItems.forEach((pItem) => {
+    pCart.lineItems.forEach((pItem) => {
         const pGpid = pItem.gpid;
         const pSku = pItem.sku;
         const pIsAdr = !pItem.oneTime;
@@ -577,7 +587,7 @@ const syncCartItems = (pCart) => {
 
         if (matchedItem) {
             syncItems.push({
-                id: pItem.lineId,
+                id: pItem.id,
                 key: matchedItem.key
             });
         } else {

package/src/salesEventService.js

@@ -152,14 +152,14 @@ async function getEventStatus(eventsToCheck = []) {
 
     responses.forEach((response) => {
         let activeStatus = false;
-        if (response.status === 'fulfilled') {
+        if (response.status === 'fulfilled' && response.value) {
             const status = _decodeStatus(response.value.status);
             if ((status.eventStatus === PRE_EVENT && status.preWaitTime <= 30000) ||
                 status.eventStatus === IN_EVENT) {
                 activeStatus = true;
             }
+            eventStatus[response.value.eventName] = activeStatus;
         }
-        eventStatus[response.value.eventName] = activeStatus;
     });
 
     return eventStatus;
@@ -173,7 +173,7 @@ async function getEventStatus(eventsToCheck = []) {
  * @returns {Promise<*>} a new or updated ticket for the specified event
  * @private
  */
-async function _getTempTicket(eventName) {
+async function _getTempTicket(eventName, count = 1) {
     let ticket;
 
     try {
@@ -190,12 +190,17 @@ async function _getTempTicket(eventName) {
     } catch (err) {
         if (err.response && err.response.data.status === 404) {
             console.error(`getTempTicket - unable to get a temporary ticket for ${eventName}`);
+            throw err;
         } else {
             console.error(`getTempTicket error or timeout - waiting to try again for ${eventName}`);
-            // Timed out or some other error
-            // Wait and then call again.
-            await _wait(3000);
-            ticket = await _getTempTicket(eventName);
+            if (count < 6) {
+                // Timed out or some other error
+                // Wait and then call again.
+                await _wait(3000);
+                ticket = await _getTempTicket(eventName, count++);
+            } else {
+                throw err;
+            }
         }
     }
 
@@ -553,7 +558,7 @@ function _getTicketName(eventName) {
  * @returns {Promise<*>} a new or updated ticket for the specified event
  * @private
  */
-async function _getRemoteTicket(eventTicketInfo) {
+async function _getRemoteTicket(eventTicketInfo, count = 1) {
     let eventName = eventTicketInfo.eventName,
         ticketId = eventTicketInfo.ticket ? eventTicketInfo.ticket.ticketId : null,
         ticketName = _getTicketName(eventName);
@@ -590,11 +595,14 @@ async function _getRemoteTicket(eventTicketInfo) {
                 }
             }
         } else {
-            console.error('salesEventService.getRemoteTicket - Sales event service error or timeout! Waiting to try again', err);
-            // Timed out or some other error
-            // Wait and then call again.
-            await _wait(3000);
-            await _getRemoteTicket(eventTicketInfo);
+            if (count < 6) {
+                console.error('salesEventService.getRemoteTicket - Sales event service error or timeout! Waiting to try again', err);
+                // Timed out or some other error
+                // Wait and then call again.
+                await _wait(3000);
+                await _getRemoteTicket(eventTicketInfo);
+            }
+            console.err('salesEventService.getRemoteTicket - retry count reached! Continueing with current ticket status.');
         }
     }