@nuskin/ns-shop 7.6.0-td-1017.2.1 → 7.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-shop",
-  "version": "7.6.0-td-1017.2.1",
+  "version": "7.6.0",
   "description": "The description that will amaze and astound your audience when they read it",
   "main": "src/shop.js",
   "scripts": {
@@ -26,11 +26,10 @@
     "@nuskin/ns-common-lib": "1.4.8",
     "@nuskin/ns-feature-flags": "1.5.0",
     "@nuskin/ns-loyalty-web": "1.5.7",
-    "@nuskin/ns-product-lib": "2.21.0-td-1017.1",
+    "@nuskin/ns-product-lib": "2.20.0",
     "@nuskin/nuskinjquery": "2.3.1",
     "@nuskin/order-model": "3.1.3",
-    "@nuskin/product-lib": "2.4.2-td-1017.1",
-    "axios": "1.8.3",
+    "@nuskin/product-lib": "2.4.0",
     "decimal.js": "10.4.3",
     "jp-conversion": "0.0.7",
     "lodash": "4.17.21",
@@ -40,11 +39,12 @@
     "@babel/preset-env": "^7.23.8",
     "@nuskin/configuration-sdk": "3.0.0",
     "@nuskin/exclusive-offer-sdk": "1.4.1",
-    "@nuskin/ns-account": "5.14.0-td-1017.1",
+    "@nuskin/ns-account": "5.13.0",
     "@nuskin/ns-jsanalyzer": "1.0.1",
-    "@nuskin/ns-product": "3.52.0-td-1017.1",
+    "@nuskin/ns-product": "3.51.0",
     "@nuskin/ns-util": "4.7.2",
     "axios-mock-adapter": "1.22.0",
+    "axios": "1.9.0",
     "babel-cli": "6.26.0",
     "babel-core": "6.26.3",
     "babel-jest": "29.7.0",
@@ -83,20 +83,7 @@
     "@nuskin/ns-account": "5.x",
     "@nuskin/ns-loyalty": "2.x",
     "@nuskin/ns-product": "3.x",
-    "@nuskin/ns-util": "4.x"
-  },
-  "resolutions": {
-    "lodash": "4.17.21",
-    "moment": "2.30.1",
-    "json5": "2.2.3",
-    "ip": "2.0.1",
-    "axios": "1.8.3",
-    "merge": "2.1.1",
-    "glob-parent": "6.0.2",
-    "follow-redirects": "1.15.5",
-    "execa": "0.7.0",
-    "tough-cookie": "4.1.3",
-    "y18n": "4.0.1",
-    "kind-of": "6.0.3"
+    "@nuskin/ns-util": "4.x",
+    "axios": "1.x"
   }
 }

package/src/cart/equinoxCartService.js

@@ -461,8 +461,7 @@ function _assembleAdrProperties(requestData, options) {
             isBackOrdered: requestData.skus && requestData.skus[requestData.skus.length - 1].backOrdered || false,
             imageURL: options.product.fullImage || '',
             name: options.product.title,
-            productId: options.product.equinoxProductId || '',
-            productionBom: options.product && options.product.properties && options.product.properties.productionBom || false
+            productId: options.product.equinoxProductId || ''
         };
     }
 

package/src/order/orderAdapter.js

@@ -6,8 +6,10 @@ import {getCachedConfigField} from '@nuskin/configuration-sdk';
 import {UserService} from "@nuskin/ns-account";
 import PaymentAdapter from '../payment/PaymentAdapter';
 import pickupUtil from '../shipping/pickupUtil';
+import { storage } from "@nuskin/ns-util";
 
 let splitLineItems = [];
+const utmInfo = storage.getItem(storage.metadata.UTM_INFO) || {};
 const addToCustomList = (customList, type, key, value) => {
     if (value) {
         let found = false;
@@ -484,6 +486,7 @@ function removeItems(cartItems, sapSkus) {
 }
 
 const populateCategory = (salesOrder) => {
+    const utmMedium = utmInfo.utm_medium;
     if (ShoppingContext.isContext(ShoppingContext.MOBILE_AFFILIATE)) {
         salesOrder.Category = "MOBILE AFFILIATE";
     } else if (ShoppingContext.isContext(ShoppingContext.MOBILE_CONSUMER)) {
@@ -495,6 +498,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 (utmMedium && utmMedium.toLowerCase().includes('paidsearch')) {
+        salesOrder.Category = 'PAIDSEARCH';
+    } else if (utmMedium && utmMedium.toLowerCase().includes('paidsocial')) {
+        salesOrder.Category = 'PAIDAD'; 
     } else {
         salesOrder.Category = 'WEB';
     }
@@ -1033,6 +1040,12 @@ const populateSalesOrder = (action, adr) => {
     if (user && user.isGuest) {
         addToCustomList(salesOrder.Custom, "FLAG", "GUEST", "TRUE");
     }
+    addToCustomList(salesOrder.Custom, "UTM", "SOURCE", utmInfo.utm_source);
+    addToCustomList(salesOrder.Custom, "UTM", "MEDIUM", utmInfo.utm_medium);
+    addToCustomList(salesOrder.Custom, "UTM", "CAMPAIGN", utmInfo.utm_campaign);
+    addToCustomList(salesOrder.Custom, "UTM", "CAMPAIGN_ID", utmInfo.utm_id);
+    addToCustomList(salesOrder.Custom, "UTM", "CONTENT", utmInfo.utm_content);
+    addToCustomList(salesOrder.Custom, "UTM", "TERM", utmInfo.utm_term);
     const microsite = getCachedConfigField('microsite');
     if (microsite) {
         salesOrder.Reason = "CUSTOM";