@nuskin/ns-shop 7.3.0-pa-1.2 → 7.3.0-pa-1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-shop",
-  "version": "7.3.0-pa-1.2",
+  "version": "7.3.0-pa-1.4",
   "description": "The description that will amaze and astound your audience when they read it",
   "main": "src/shop.js",
   "scripts": {
@@ -30,7 +30,6 @@
     "@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.7.9",
     "decimal.js": "10.4.3",
     "jp-conversion": "0.0.7",
@@ -44,7 +43,7 @@
     "@nuskin/ns-account": "5.9.2",
     "@nuskin/ns-jsanalyzer": "1.0.1",
     "@nuskin/ns-product": "3.50.8",
-    "@nuskin/ns-util": "4.6.1",
+    "@nuskin/ns-util": "4.7.2",
     "axios-mock-adapter": "1.22.0",
     "babel-cli": "6.26.0",
     "babel-core": "6.26.3",

package/src/account/agreementService.js

@@ -1,12 +1,12 @@
 import {UrlService} from "@nuskin/ns-util";
 import axios from 'axios'
 
-const hasAgreedToTerms = async (sapId) => {
+const downConvertAgreedToTerms = async (sapId) => {
     let retVal = false;
 
     try {
-        const result = await axios.get(`${UrlService.getAwsUrl()}/account-renroll/agreement-terms/${sapId}`)
-        retVal = result.agreedTerms;
+        const result = await axios.get(`${UrlService.getApisUrl()}/account-enrollment/agreement-terms/${sapId}`)
+        retVal = result.data.agreedTerms;
     } catch (e) {
         console.error('agreement-terms check failed', e)
     }
@@ -14,18 +14,21 @@ const hasAgreedToTerms = async (sapId) => {
     return retVal
 }
 
-const setAgreedToTerms = async (sapId) => {
+const setDownConvertAgreedToTerms = async (sapId) => {
+    let succeeded = true
     try {
-        await axios.post(`${UrlService.getAwsUrl()}/account-renroll/agreement-terms`, {
+        await axios.post(`${UrlService.getApisUrl()}/account-enrollment/agreement-terms`, {
             agreedTerms: true,
             sapId
         })
     } catch (e) {
         console.error('Failed setting agreement to terms', e);
+        succeeded = false;
     }
+    return succeeded;
 }
 
 export default {
-    hasAgreedToTerms,
-    setAgreedToTerms
+    downConvertAgreedToTerms,
+    setDownConvertAgreedToTerms
 };

package/src/order/orderAdapter.js

@@ -6,10 +6,8 @@ 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;
@@ -497,10 +495,6 @@ 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 && 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';
     }
@@ -1036,12 +1030,6 @@ 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

@@ -158,15 +158,13 @@ let PickupUtil = function() {
     function getUrl() {
         switch (RunConfigService.getEnvironmentCode()) {
             case 'dev':
-                return 'https://ship-methods.api.dev.nuskin.com/v1';
+                return 'https://apis.dev.nuskin.com/ship-methods/v1';
             case 'test':
-                return 'https://ship-methods.api.test.nuskin.com/v1';
-            case 'stage':
-                return 'https://ship-methods.api.dev.nuskin.com/v1';
+                return 'https://apis.test.nuskin.com/ship-methods/v1';
             case 'prod':
-                return 'https://ship-methods.api.nuskin.com/v1';
+                return 'https://apis.nuskin.com/ship-methods/v1';
             default:
-                return 'https://ship-methods.api.test.nuskin.com/v1';
+                return 'https://apis.test.nuskin.com/ship-methods/v1';
         }
     }