@nuskin/ns-shop 7.2.3-td-1017.1 → 7.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-shop",
-  "version": "7.2.3-td-1017.1",
+  "version": "7.2.3",
   "description": "The description that will amaze and astound your audience when they read it",
   "main": "src/shop.js",
   "scripts": {
@@ -26,12 +26,12 @@
     "@nuskin/ns-common-lib": "1.4.7",
     "@nuskin/ns-feature-flags": "1.4.7",
     "@nuskin/ns-loyalty-web": "1.5.6",
-    "@nuskin/ns-product-lib": "2.19.7-td-1017.1",
+    "@nuskin/ns-product-lib": "2.19.2",
     "@nuskin/nuskinjquery": "2.3.1",
     "@nuskin/order-model": "3.1.3",
-    "@nuskin/product-lib": "2.3.1-td-1017.1",
+    "@nuskin/product-lib": "2.2.1",
     "@nuskin/ns-util": "4.7.0",
-    "axios": "1.6.5",
+    "axios": "1.7.9",
     "decimal.js": "10.4.3",
     "jp-conversion": "0.0.7",
     "lodash": "4.17.21",
@@ -91,7 +91,7 @@
     "moment": "2.29.4",
     "json5": "2.2.3",
     "ip": "2.0.1",
-    "axios": "1.6.8",
+    "axios": "1.7.9",
     "merge": "2.1.1",
     "glob-parent": "6.0.2",
     "follow-redirects": "1.15.5",

package/src/cart/cart.js

@@ -1329,8 +1329,16 @@ export default function Cart(cartData) {
         const customPayloadMetadata = storage.metadata.CUSTOM_EVENT_PAYLOAD;
         let customPayload = storage.getItem(customPayloadMetadata);
         if (customPayload) {
-            if (customPayload.constructor === {}.constructor) {
-                Object.assign(json, customPayload);
+            if (customPayload.catalogAddToCart) {
+                delete customPayload.catalogAddToCart;
+                const product = json.ecommerce.add && json.ecommerce.add.products && json.ecommerce.add.products[0];
+                if (product) {
+                    Object.assign(product, customPayload);
+                }
+            } else {
+                if (customPayload.constructor === {}.constructor) {
+                    Object.assign(json, customPayload);
+                }
             }
             storage.removeItem(customPayloadMetadata);
         }

package/src/order/orderAdapter.js

@@ -9,7 +9,7 @@ import pickupUtil from '../shipping/pickupUtil';
 import { storage } from "@nuskin/ns-util";
 
 let splitLineItems = [];
-const utmInfo = storage.getItem(storage.metadata.UTM_INFO);
+const utmInfo = storage.getItem(storage.metadata.UTM_INFO) || {};
 const addToCustomList = (customList, type, key, value) => {
     if (value) {
         let found = false;
@@ -497,14 +497,10 @@ const populateCategory = (salesOrder) => {
     } else if (util.getSponsorId()) {
         // affiliates don't use a subdomain.  So if we have a sponsor and it isn't a pitch then we consider it a storefront
         salesOrder.Category = "STOREFRONT";
-    } else if(utmInfo?.utm_medium){
-        if (utmInfo?.utm_medium.includes('paidsearch')) {
-            salesOrder.Category = 'PAIDSEARCH';
-        } else if (utmInfo?.utm_medium.includes('paidsocial')) {
-            salesOrder.Category = 'PAIDAD';
-        } else {
-            salesOrder.Category = 'WEB';
-        }
+    }  else if (utmInfo.utm_medium && utmInfo.utm_medium.includes('paidsearch')) {
+        salesOrder.Category = 'PAIDSEARCH';
+    } else if (utmInfo.utm_medium && utmInfo.utm_medium.includes('paidsocial')) {
+        salesOrder.Category = 'PAIDAD'; 
     } else {
         salesOrder.Category = 'WEB';
     }
@@ -1040,12 +1036,12 @@ const populateSalesOrder = (action, adr) => {
     if (user && user.isGuest) {
         addToCustomList(salesOrder.Custom, "FLAG", "GUEST", "TRUE");
     }
-    addToCustomList(salesOrder.Custom, "FLAG", "UTM_SOURCE", utmInfo?.utm_source);
-    addToCustomList(salesOrder.Custom, "FLAG", "UTM_MEDIUM", utmInfo?.utm_medium);
-    addToCustomList(salesOrder.Custom, "FLAG", "UTM_CAMPAIGN", utmInfo?.utm_campaign);
-    addToCustomList(salesOrder.Custom, "FLAG", "UTM_CAMPAIGN_ID", utmInfo?.utm_id);
-    addToCustomList(salesOrder.Custom, "FLAG", "UTM_CONTENT", utmInfo?.utm_content);
-    addToCustomList(salesOrder.Custom, "FLAG", "UTM_TERM", utmInfo?.utm_term);
+    addToCustomList(salesOrder.Custom, "FLAG", "UTM_SOURCE", utmInfo.utm_source);
+    addToCustomList(salesOrder.Custom, "FLAG", "UTM_MEDIUM", utmInfo.utm_medium);
+    addToCustomList(salesOrder.Custom, "FLAG", "UTM_CAMPAIGN", utmInfo.utm_campaign);
+    addToCustomList(salesOrder.Custom, "FLAG", "UTM_CAMPAIGN_ID", utmInfo.utm_id);
+    addToCustomList(salesOrder.Custom, "FLAG", "UTM_CONTENT", utmInfo.utm_content);
+    addToCustomList(salesOrder.Custom, "FLAG", "UTM_TERM", utmInfo.utm_term);
     const microsite = getCachedConfigField('microsite');
     if (microsite) {
         salesOrder.Reason = "CUSTOM";