@nuskin/ns-shop 5.14.10 → 5.14.12

package/package.json

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

package/src/cart/cart.js

@@ -150,13 +150,25 @@ export default function Cart(cartData) {
     this.addCartItem = function(cartItem, replace, referrer) {
         if (cartItem instanceof CartItem && cartItem.product) {
             cartItem.key = getItemKey(cartItem);
+            const origItem = itemTable.get(cartItem.key);
             itemTable.add(cartItem, replace);
             if (cartItem.isSapLineItem()) {
                 updateSapTotals();
             } else {
                 updateCartTotals();
             }
-            publish(events.shop.CART_UPDATED, {add: {item: cartItem.toFlatJson()}}, referrer);
+            if (replace && origItem) {
+                publish(events.shop.CART_UPDATED, {
+                    modify: {
+                        type: 'quantity-changed',
+                        key: cartItem.key,
+                        item: cartItem.toFlatJson(),
+                        qtyDiff: cartItem.qty - origItem.qty
+                    }
+                }, referrer);
+            } else {
+                publish(events.shop.CART_UPDATED, {add: {item: cartItem.toFlatJson()}}, referrer);
+            }
         }
     };
 

package/src/cart/persistentCartService.js

@@ -690,24 +690,32 @@ const persistCartUpdates = async () => {
     let loadCartType = null;
 
     if (pcActions.hasItems()) {
-        removeCart = pcActions.hasRemoveCartItem();
-        loadCartType = pcActions.hasLoadCartItem();
+        // removeCart = pcActions.hasRemoveCartItem();
+        // loadCartType = pcActions.hasLoadCartItem();
 
         // even though there is no need to process the queue if there is a removeCart
         // or a loadCart action they still need to get marked as processed so they will
         // get removed.
         let info = pcActions.peek();
         while (info) {
-            if (info.add && info.add.item.qty > 0) {
-                handleAddAction(info.add, actions);
-            } else if (info.modify) {
-                handleModifyAction(info.modify, actions);
-            } else if (info.remove) {
-                handleRemoveAction(info.remove, actions);
-            } else if (info.removeItems) {
-                handleRemoveItemsAction(info.removeItems, actions);
+            if (info.removeCart) {
+                removeCart = true;
+                info = null;
+            } else if (info.loadCart) {
+                loadCartType = info.loadCart.type;
+                info = null;
+            } else {
+                if (info.add && info.add.item.qty > 0) {
+                    handleAddAction(info.add, actions);
+                } else if (info.modify) {
+                    handleModifyAction(info.modify, actions);
+                } else if (info.remove) {
+                    handleRemoveAction(info.remove, actions);
+                } else if (info.removeItems) {
+                    handleRemoveItemsAction(info.removeItems, actions);
+                }
+                info = pcActions.peekNext();
             }
-            info = pcActions.peekNext();
         }
     }
 
@@ -717,10 +725,10 @@ const persistCartUpdates = async () => {
     if (loadCartType) {
         await syncCart(loadCartType);
     }
+    pcActions.clear();
     if (!(removeCart || loadCartType) && actions.length > 0) {
         await doPersistentUpdates(actions, pcId, pcVersion, pcType);
     }
-    pcActions.clear();
     if (pcActions.hasItems()) {
         clearTimeout(timerId);
         timerId = setTimeout(timerCallback, 200);
@@ -765,7 +773,7 @@ const addAction = (info) => {
             clearTimeout(timerId);
             timerId = 0;
             if (!persistingCart) {
-                if (info.removeCart) {
+                if (info.removeCart || pcActions.hasRemoveCartItem()) {
                     // Likely a page refresh coming, wait for it to happen.
                     // The cart actions will be picked up there.
                     timerId = setTimeout(timerCallback, 1000);

package/src/order/orderAdapter.js

@@ -117,7 +117,6 @@ const populateItem = (order, salesOrder, shipImmediate, includeSapItems) => {
         }
     });
 };
-
 /*
 const populateAttribution = (salesOrder) => {
     const sponsorId = util.getSponsorId();
@@ -131,8 +130,7 @@ const populateAttribution = (salesOrder) => {
         });
     }
 }
-*/
-
+ */
 const populateShipping = (order, salesOrder) => {
     let nsConfig = ConfigService.getMarketConfig();
     let user = UserService.getUser();