@nuskin/ns-shop 7.0.5-cx1-13272.5 → 7.0.5-cx1-13272.7

package/package.json

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

package/src/cart/cart.js

@@ -832,11 +832,12 @@ export default function Cart(cartData) {
     };
 
     this.updateProductEventPrice = function(item, activeEvents) {
-        let itemUpdated = false;
+        let eventNameAdded = false;
         const user = UserService.getUser();
         const priceType = ShopContext.getPriceType(item.isAdr(), user);
+        const eventName = item.product.eventName;
         if (item.product.setPriceAndPvFromType(priceType, activeEvents)) {
-            itemUpdated = true;
+            if (!eventName && item.product.eventName) eventNameAdded = true;
             SalesEventService.logAnalyticInfo(
                 'product-price-to-event-price',
                 item.product.eventName,
@@ -850,16 +851,16 @@ export default function Cart(cartData) {
                 }
             });
         }
-        return itemUpdated;
+        return eventNameAdded;
     };
 
     this.updateEventPrices = function(activeEvents) {
-        let cartUpdated = false;
+        let eventNameAdded = false;
         getCartItems({cartItems: true}).forEach(item => {
             if (this.updateProductEventPrice(item, activeEvents))
-                cartUpdated = true;
+                eventNameAdded = true;
         });
-        return cartUpdated;
+        return eventNameAdded;
     };
 
     this.setMissingEventNames = async (order) => {

package/src/cart/cartService.js

@@ -237,9 +237,9 @@ async function checkForMissingEventNames(order) {
     const orderItems = cart.getItems({cartOrderItems: true});
     orderItems.map((item) => {
         const sapItem = order.sapItems.find((sapItem) => (
-            sapItem.product.sku === item.product.sku && sapItem.adr === item.adr
+            sapItem.sku === item.product.sku && sapItem.isAdr === item.adr
         ));
-        if (sapItem && item.eventName && !sapItem.eventName)
+        if (sapItem && item.product.eventName && !sapItem.eventName)
             outOfSync = true;
     });
 
@@ -371,6 +371,7 @@ async function addProductToCart(options) {
     const language = options.product.lang || options.product.language;
     options.product.lang = language;
     options.product.language = language;
+    const eventName = options.product.eventName;
 
     let itemKey = cart.addProduct({
         id: options.id,
@@ -390,6 +391,8 @@ async function addProductToCart(options) {
     });
 
     const item = itemKey ? cart.getItemByKey(itemKey) : null;
+    // eventName would get nulled out if sapItem
+    item.product.eventName = eventName;
     setCart(cart,  item ? !item.isSapLineItem() : true);
     return itemKey;
 }

package/src/order/orderAdapter.js

@@ -530,8 +530,7 @@ 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
-    const savedEventName = product.eventName;
-    const item =  await CartService.addProductToCart({
+    return await CartService.addProductToCart({
         product: product,
         qty: sapItem.LineItem.RequestedQuantity,
         adr: (adr && isAdrItem),
@@ -542,11 +541,6 @@ async function addSapItem(newItem, sapItem, sapSkus, adr, isAdrItem, replace) {
         isBusinessPortfolio: newItem.businessPortfolio,
         replace: replace
     })
-
-    // eventName would have gotten nulled out. Fix it here.
-    if (item && item.product) item.product.eventName = savedEventName;
-
-    return item;
 }
 
 const syncProductItems = async (order, sapProducts, adr, includeSapItems) => {