@nuskin/ns-shop 5.13.0 → 5.13.1

package/package.json

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

package/src/cart/cartService.js

@@ -106,7 +106,6 @@ function _getCart() {
 
         // If the cartJson userId is empty OR null, then we are going from nothing to something, and we want to keep our items
         if (cartJson &&
-            !(!userId && cartJson.id) && // clear cart if cart is persisted but not logged in
             (!UrlService.isLocalePage() || (cartJson.cntryCd === runConfig.country)) &&
             (!cartJson.userId || cartJson.userId === userId) &&
             (!(isPitchApp ^ cartJson.isPitchCart))) {

package/src/cart/persistentCartService.js

@@ -224,7 +224,7 @@ const getUrl = (path, pathParam, queryParams = {}) => {
     const queryStr = UrlService.toQueryString(queryParams);
     const queryString = queryStr.length > 0 ? `?${queryStr}` : '';
 
-    return `${ConfigService.getMarketConfig().awsUrl}/cart/v2/${path}/${pathParam}${queryString}`;
+    return `${ConfigService.getMarketConfig().awsUrl}/cart/v1/${path}/${pathParam}${queryString}`;
 };
 
 /**
@@ -236,9 +236,8 @@ const getUrl = (path, pathParam, queryParams = {}) => {
 const getPersistedCart = async (user) => {
     const runConfig = RunConfigService.getRunConfig();
     const response = await axios({
-        method: 'GET',
-        // TODO: fix type
-        url: getUrl('getCartByAccountId', user.id, {country: runConfig.country, type: 'market'}),
+        method: 'POST',
+        url: getUrl('getCartByAccountId', user.id, {country: runConfig.country}),
         headers: getHeaders(user.eid)
     });
     return get(response, 'data.cart', null);
@@ -266,19 +265,6 @@ const updatePersistedCart = async (user, cartId, payload) => {
     return {pCart, cartOutdated};
 };
 
-const removePersistedCart = async (user, cartId) => {
-    try {
-        await axios({
-            method: 'DELETE',
-            url: getUrl('deleteCart', cartId,  {accountId: user.id}),
-            headers: getHeaders(user.eid)
-        });
-        CartService.setCartProperties({id: '', version: -1});
-    } catch (err) {
-        console.error('Unable to delete persistent cart', err);
-    }
-};
-
 /**
  * This adds an item from the persisted cart into the local cart.
  *
@@ -295,9 +281,9 @@ const addPersistedItemToLocal = (pItem, userId, country, language) => {
         return;
     }
     return CartService.addSkuToCart({
-        id: pItem.lineId,
+        id: pItem.id,
         agelocme: pItem.agelocme,
-        sku: pItem.sku,
+        sku: get(pItem, 'price.custom.fields.sku', ''),
         userId: userId,
         cntryCd: country,
         language: language,
@@ -405,9 +391,9 @@ const mergeIntoLocalCart = async (userId, 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);
+            let skuArray = skuArrs.find((arr) => get(arr[0], 'price.custom.fields.sku') === get(pItem, 'price.custom.fields.sku'));
 
             if (!skuArray) {
                 skuArray = [pItem];
@@ -425,7 +411,7 @@ const mergeIntoLocalCart = async (userId, pCart) => {
             if (pSkuArray.length === 1) {
                 const pLineItem = pSkuArray[0];
                 // For agelocme the sku will be pLineItem.sku pLineItem.price.custom.fields.sku will be the content sku for agelocme
-                const matchedCartItems = cartItems.filter((cItem) => cItem.sku === pLineItem.sku || cItem.sku === pLineItem.sku);
+                const matchedCartItems = cartItems.filter((cItem) => cItem.sku === pLineItem.sku || cItem.sku === get(pLineItem, 'price.custom.fields.sku'));
 
                 if (matchedCartItems.length > 0) {
                     promises.push(mergeOneToOnePlus(pLineItem, matchedCartItems));
@@ -433,7 +419,7 @@ const mergeIntoLocalCart = async (userId, pCart) => {
                     promises.push(addPersistedItemToLocal(pLineItem, userId, country, language));
                 }
             } else {
-                const pSku = pSkuArray[0].sku;
+                const pSku = get(pSkuArray[0], 'price.custom.fields.sku');
                 const cartSkuItems = cartItems.filter((cItem) => cItem.sku === pSkuArray[0].sku || cItem.sku === pSku);
 
                 if (cartSkuItems.length === 0) {
@@ -449,7 +435,7 @@ const mergeIntoLocalCart = async (userId, pCart) => {
         // Remove local items that do not exist in persisted cart
         cartItems.forEach((cItem) => {
             if (cItem.id) {
-                if (!lineItems.some((pItem) => (pItem.sku === cItem.sku || pItem.sku === cItem.sku) && !!pItem.oneTime === !cItem.isAdr)) {
+                if (!lineItems.some((pItem) => (pItem.sku === cItem.sku || get(pItem, 'price.custom.fields.sku') === cItem.sku) && !!pItem.oneTime === !cItem.isAdr)) {
                     CartService.removeItemByKey(cItem.key);
                 }
             }
@@ -511,8 +497,6 @@ const persistLocalItems = async (cartItems, user) => {
             const payload = {
                 accountId: user.id,
                 country: runConfig.country,
-                // TODO: fix hard coding of type
-                type: 'market',
                 version: cartInfo.version,
                 actions: []
             };
@@ -534,27 +518,18 @@ const persistLocalItems = async (cartItems, user) => {
  * @return {Promise<void>}
  */
 const syncCart = async () => {
-    let user = UserService.getUser();
-    let pCart = null;
+    const user = UserService.getUser();
 
     if (user) {
         try {
-            pCart = await getPersistedCart(user);
+            const pCart = await getPersistedCart(user);
+            const unPersistedItems = CartService.getItemData().filter(i => !i.id && !i.isBusinessPortfolio);
 
-            // there is a chance the user got logged out
-            user = UserService.getUser();
-            if (user) {
-                await mergeIntoLocalCart(user.id, pCart);
-            }
+            await mergeIntoLocalCart(user.id, pCart);
+            await persistLocalItems(unPersistedItems, user);
         } catch (err) {
             console.error('Failed to load the persisted cart!', err && err.response && err.response.data ? err.response.data : err);
         }
-        if (user) {
-            const unPersistedItems = CartService.getItemData().filter(i => !i.id && !i.isBusinessPortfolio);
-            await persistLocalItems(unPersistedItems, user);
-        } else {
-            CartService.clearCart();
-        }
     }
     events.setValue(events.shop.CART_SYNCED_ON_LOAD, [true]);
 };
@@ -568,7 +543,7 @@ const syncCartItems = (pCart) => {
     const syncItems = [];
     const cartItems = CartService.getItemData();
 
-    pCart.order.lineItems.forEach((pItem) => {
+    get(pCart, 'lineItems', []).forEach((pItem) => {
         const pGpid = pItem.gpid;
         const pSku = pItem.sku;
         const pIsAdr = !pItem.oneTime;
@@ -577,7 +552,7 @@ const syncCartItems = (pCart) => {
 
         if (matchedItem) {
             syncItems.push({
-                id: pItem.lineId,
+                id: pItem.id,
                 key: matchedItem.key
             });
         } else {
@@ -595,8 +570,6 @@ const doPersistentUpdates = async (actions, pcId, pcVersion) => {
         const payload = {
             accountId: user.id,
             country: RunConfigService.getRunConfig().country,
-            // TODO: fix hardcoding of type
-            type: 'market',
             actions: actions,
             version: pcVersion
         };
@@ -639,10 +612,16 @@ const persistCartUpdates = async () => {
                 const {type, item, qtyDiff} = info.modify;
 
                 if (type === 'quantity-changed') {
-                    actions.push(getAction(ADD, Object.assign({}, item, {quantity: qtyDiff})));
+                    if (qtyDiff > 0) {
+                        actions.push(getAction(ADD, Object.assign({}, item, {quantity: qtyDiff})));
+                    } else {
+                        if (item.id) {
+                            actions.push(getAction(REMOVE, {id: item.id, quantity: -qtyDiff}));
+                        }
+                    }
                 } else if (type === 'adr-status-changed' || type === 'product-changed') {
                     if (info.modify.removeId) {
-                        actions.push(getAction(ADD, Object.assign({}, item, {quantity: -9999, isAdr: !item.isAdr})));
+                        actions.push(getAction(REMOVE, {id: info.modify.removeId, quantity: item.qty}));
                     }
                     actions.push(getAction(ADD, Object.assign({}, item, {quantity: qtyDiff || item.qty})));
                 }
@@ -650,23 +629,21 @@ const persistCartUpdates = async () => {
                 const item = info.remove.item;
 
                 if (item.id) {
-                    actions.push(getAction(ADD, Object.assign({}, item, {quantity: -item.qty})));
+                    actions.push(getAction(REMOVE, item));
                 }
             } else if (info.removeItems) {
                 const removeItems = info.removeItemInfo || [];
-                removeItems.forEach((item) => actions.push(getAction(ADD, Object.assign({}, item, {quantity: -item.qty}))));
+                removeItems.forEach((item) => actions.push(getAction(REMOVE, item)));
             } else if (info.removeAll) {
                 if (actions.length > 0) {
-                    pcActions.clear(actions.length);
-                    peeked = 0;
+                    pcActions.clear(actions.length)
                 }
-                await removePersistedCart(UserService.getUser(), pcId);
+                await doPersistentUpdates([getAction(REMOVE_CART)], pcId, pcVersion);
                 pcId = pcActions.pcId;
                 pcVersion = pcActions.pcVersion;
                 actions = [];
             }
             info = pcActions.peekNext();
-            peeked += 1;
         }
     }
     pcActions.clear(peeked);

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;
@@ -190,6 +190,7 @@ 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