@nuskin/ns-shop 7.1.9 → 7.2.1-mdigi-2049.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-shop",
-  "version": "7.1.9",
+  "version": "7.2.1-mdigi-2049.1",
   "description": "The description that will amaze and astound your audience when they read it",
   "main": "src/shop.js",
   "scripts": {
@@ -30,6 +30,7 @@
     "@nuskin/nuskinjquery": "2.3.1",
     "@nuskin/order-model": "3.1.3",
     "@nuskin/product-lib": "2.2.1",
+    "@nuskin/ns-util": "4.7.0",
     "axios": "1.6.5",
     "decimal.js": "10.4.3",
     "jp-conversion": "0.0.7",

package/src/order/orderAdapter.js

@@ -6,9 +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;
@@ -136,7 +137,7 @@ const populateItem = (order, salesOrder, shipImmediate, includeSapItems) => {
 };
 
 const populateAttribution = (salesOrder) => {
-    const sponsorId = util.getSponsorId(); 
+    const sponsorId = util.getSponsorId();
     const enableGuestCheckout = getCachedConfigField('enableGuestCheckout');
 
     if (sponsorId) {
@@ -163,10 +164,22 @@ const populateAttribution = (salesOrder) => {
     }
 }
 
+const getDefaultShipCode = () => {
+    let defaultCode = '';
+    const useShipMethodsApi = getCachedConfigField('useShipMethodsApi')
+    if (useShipMethodsApi) {
+        const csDefaultCode = getCachedConfigField('defaultShipMethod');
+        const shipMethods = PickupUtil.getStoredShipMethods();
+        const firstSm = shipMethods.length > 0 ? shipMethods[0].Code : '';
+        defaultCode = shipMethods.find((sm) => sm.Code === csDefaultCode) ? csDefaultCode : firstSm;
+    }
+
+    return defaultCode;
+};
+
 const populateShipping = (order, salesOrder) => {
     const user = UserService.getUser();
-    const useShipMethodsApi = getCachedConfigField('useShipMethodsApi')
-    const defaultCode = useShipMethodsApi ? getCachedConfigField('defaultShipMethod') : '';
+    const defaultCode = getDefaultShipCode();
     const method = order.selectedShippingMethod;
     const code = method ? method.Code : defaultCode;
 
@@ -479,6 +492,14 @@ 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 {
         salesOrder.Category = 'WEB';
     }
@@ -1014,6 +1035,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);
     const microsite = getCachedConfigField('microsite');
     if (microsite) {
         salesOrder.Reason = "CUSTOM";

package/src/shipping/pickupUtil.js

@@ -201,10 +201,16 @@ let PickupUtil = function() {
         }
     }
 
+    // if the calling code knows that loadShipMethods has finished then this
+    // function can be called directly if the calling function is not async.
+    function getStoredShipMethods() {
+        return JSON.parse((sessionStorage.getItem(SHIP_METHODS) || []));
+    }
+
     async function getShipMethods() {
         await promise;
 
-        return JSON.parse((sessionStorage.getItem(SHIP_METHODS) || []));
+        return getStoredShipMethods();
     }
 
     async function getPickupPoints() {
@@ -221,6 +227,7 @@ let PickupUtil = function() {
         markers: generateMarkers,
         loadShipMethods,
         getShipMethods,
+        getStoredShipMethods,
         getPickupPoints
     }
 }();