@nuskin/ns-shop 7.0.5-cx1-13272.1 → 7.0.5-cx1-13272.3

package/package.json

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

package/src/cart/cart.js

@@ -863,6 +863,7 @@ export default function Cart(cartData) {
     };
 
     this.setMissingEventNames = async (order) => {
+        let cartUpdated = false;
         const orderItems = this.getItems({cartOrderItems: true});
         let nameSet = new Set();
         let itemsChecked = [];
@@ -881,6 +882,7 @@ export default function Cart(cartData) {
                     if (itemEvents.includes(ien)) {
                         // set this items eventName if another item already has it set.
                         item.product.eventName = ien;
+                        cartUpdated = true;
                     }
                     return !!item.product.eventName; // causes loop to stop if true
                 });
@@ -902,6 +904,7 @@ export default function Cart(cartData) {
                 itemEvents.some((ie) => {
                     if (eventStatuses[ie]) {
                         // set the status if event is active.
+                        cartUpdated = true;
                         item.product.eventName == ie;
                         SalesEventService.logAnalyticInfo(
                             'cart-eventname-fixed', ie,
@@ -912,6 +915,7 @@ export default function Cart(cartData) {
                 })
             });
         }
+        return cartUpdated;
     }
 
     this.getCartInfo = function(options) {

package/src/cart/cartService.js

@@ -229,10 +229,21 @@ function updateItemPrices() {
 }
 
 async function checkForMissingEventNames(order) {
+    let outOfSync = false;
     await awaitForConfig();
     const cart = _getCart();
-    await cart.setMissingEventNames(order);
+
+    // check to see if cart item has eventName but sapItem does not.
+    const orderItems = cart.getItems({cartOrderItems: true});
+    orderItems.map((item) => {
+        const sapItem = order.sapItems.find((sapItem) => sapItem.key === item.key);
+        if (sapItem && item.eventName && !sapItem.eventName)
+            outOfSync = true;
+    });
+
+    let updated = await cart.setMissingEventNames(order);
     setCart(cart);
+    return updated || outOfSync;
 }
 
 function getCartProperty(key) {
@@ -1411,7 +1422,7 @@ const cartServiceConfigCallback = async (configs) => {
                 activeEvents = _activeEvents;
                 const cart = _getCart();
                 if (cart.updateEventPrices(activeEvents)) {
-                    events.setValue(events.shop.CART_EVENT_PRICE_UPDATED);
+                    events.setValue(events.shop.CART_EVENT_PRICE_UPDATED, [activeEvents]);
                     setCart(cart);
                 }
             }

package/src/order/orderAdapter.js

@@ -530,7 +530,8 @@ async function addSapItem(newItem, sapItem, sapSkus, adr, isAdrItem, replace) {
     handleRedetermination(product, sapItem, sapSkus, adr, isAdrItem); // removes items from sapSkus
 
     // Only honor the OneTime flag from SAP if we are a ADR order
-    return await CartService.addProductToCart({
+    const savedEventName = product.eventName;
+    const item =  await CartService.addProductToCart({
         product: product,
         qty: sapItem.LineItem.RequestedQuantity,
         adr: (adr && isAdrItem),
@@ -541,6 +542,11 @@ async function addSapItem(newItem, sapItem, sapSkus, adr, isAdrItem, replace) {
         isBusinessPortfolio: newItem.businessPortfolio,
         replace: replace
     })
+
+    // eventName would have gotten nulled out. Fix it here.
+    product.eventName = savedEventName;
+
+    return item;
 }
 
 const syncProductItems = async (order, sapProducts, adr, includeSapItems) => {
@@ -600,6 +606,7 @@ const syncProductItems = async (order, sapProducts, adr, includeSapItems) => {
                 newItem.priceType = ShopContextService.getPriceType(isAdrItem);
                 newItem.pv = sapItem.PSV;
                 newItem.backOrderDate = sapItem.BackorderAvailableDate;
+                newItem.eventName = sapItem.LineItem.Event;
 
                 if (sapItem.LineItem.Custom) {
                     let code = null, name = null, label = null;
@@ -634,7 +641,7 @@ const syncProductItems = async (order, sapProducts, adr, includeSapItems) => {
                     newItem.isBusinessPortfolio = matchedItem.isBusinessPortfolio;
                     newItem.redeem = matchedItem.redeem;
                     newItem.qtyRedeemWithPoints = matchedItem.qtyRedeemWithPoints;
-                    newItem.eventName = matchedItem.eventName;
+                    newItem.eventName = !newItem.eventName ? matchedItem.eventName : newItem.eventName;
                 }
                 if (existingItem) {
                     newItem.thumbnail = existingItem.thumbnail;
@@ -1107,6 +1114,7 @@ const toOrder = async (salesOrderDetail, adr, createResponse) => {
     await syncProductItems(order, salesOrderDetail.LineItemDetails, order.adr ? adr : null);
     syncOrderTotals(salesOrderDetail.OrderTotals, order.orderTotals);
     syncPayment(salesOrderDetail.Payment, order.selectedPayment);
+    OrderManager.saveOrders();
     return order;
 };
 

package/src/salesEventService.js

@@ -297,7 +297,7 @@ function _checkStatus(eventTicketInfo, useServerWaitTime) {
                     [ticket.eventName, eventTicketInfo.paused, {fromServer: useServerWaitTime, waitTime: actualWait}]
                 );
 
-                eventInfo.timerId = setTimeout(() => _timerCallback(ticket.eventName), timerWait);
+                eventInfo.timerId = setTimeout(_timerCallback(ticket.eventName), timerWait);
                 if (useServerWaitTime && timerWait < 30000) {
                     // if the wait time is base off of what the server passed back then
                     //  don't call the server to update the ticket at the end of this timer
@@ -317,7 +317,7 @@ function _checkStatus(eventTicketInfo, useServerWaitTime) {
                         [ticket.eventName, eventTicketInfo.paused, {fromServer: useServerWaitTime, waitTime: actualWait}]
                     );
                     logAnalyticInfo('in-event', ticket.eventName);
-                    eventInfo.timerId = setTimeout(() => _timerCallback(ticket.eventName), timerWait);
+                    eventInfo.timerId = setTimeout(_timerCallback(ticket.eventName), timerWait);
                 } else {
                     _changeStatus(eventTicketInfo, POST_EVENT);
                     _checkStatus(eventTicketInfo, false); // to send post event and clear ticket.
@@ -686,6 +686,15 @@ function _getHeaders() {
     };
 }
 
+async function _getActiveEvents() {
+    let response = await axios({
+        method: 'GET',
+        url: `${_getAwsUrl()}?activeWithin=${ACTIVE_EVENT_WITHIN}`,
+        headers: _getHeaders()
+    });
+    return response.data.salesEventResponse
+}
+
 //=========================================================================================================//
 //
 //  Misc functions
@@ -815,17 +824,18 @@ async function _initializePolling() {
             intervalCnt = 1;
 
         intervalId = setInterval(async () => {
-            let now = Date.now();
+            const now = Date.now();
+            const slept = now > (lastTime + TIMEOUT + 3000)
 
             // if polling market config, only reload it every 30 seconds
-            if (pollMarketConfig && intervalCnt % 3 === 0) {
+            if (slept || pollMarketConfig && intervalCnt % 3 === 0) {
                 await _loadMarketEventConfig(true);
                 _marketStatusCheck();
             }
             intervalCnt++;
 
             // if been to sleep for more then 3 seconds then check all ticket statuses.
-            if (now > (lastTime + TIMEOUT + 3000)) {
+            if (slept) {
                 // Went to sleep for 3 seconds or more
                 Object.values(eventTicketInfoMap).forEach(eventTicketInfo => {
                     // A new timer needs to be set, clear current one if exists
@@ -838,7 +848,17 @@ async function _initializePolling() {
                 _checkStatus(eventTicketInfo, false);
             });
 
-            lastTime = now;
+            // check for missing tickets
+            if (slept) {
+                const activeEvents = await _getActiveEvents();
+                for (const eventInfo of activeEvents) {
+                    if (mktEventConfigMap[eventInfo.eventName] && !eventTicketInfoMap[eventInfo.eventName]) {
+                        await _initEventTicketInfo(eventInfo.eventName);
+                    }
+                }
+            }
+
+            lastTime = Date.now();
         }, TIMEOUT);
     }
 }
@@ -989,12 +1009,7 @@ async function _loadAwsActiveEvents(country) {
         storageObj = {events: []};
         storage.setItem(activeEventsName, storageObj, {ttl: 250}); // to prevent multiple calls.
         try {
-            let response = await axios({
-                method: 'GET',
-                url: `${_getAwsUrl()}?activeWithin=${ACTIVE_EVENT_WITHIN}`,
-                headers: _getHeaders()
-            });
-            addEvents(response.data.salesEventResponse);
+            addEvents(await _getActiveEvents());
         } catch (e) {
             // an error occurred with the call, clear active events
             //  so it won't wait 30 minutes to try again