@nuskin/ns-shop 7.5.1-pa-64.1 → 7.5.2

package/package.json

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

package/src/shipping/ShippingService.js

@@ -13,9 +13,14 @@ let eid = '';
 let id = '';
 
 const ZZIP_URLS = {
-    dev: 'https://zzip.api.dev.nuskin.com/v2/:country/:code',
-    test: 'https://zzip.api.test.nuskin.com/v2/:country/:code',
-    prod: 'https://zzip.api.nuskin.com/v2/:country/:code'
+    dev: 'https://apis.dev.nuskin.com/zzip/v2/:country/:code',
+    test: 'https://apis.test.nuskin.com/zzip/v2/:country/:code',
+    prod: 'https://apis.nuskin.com/zzip/v2/:country/:code'
+};
+const STREET_ADDRESS_VALIDATOR_URLS = {
+    dev: 'https://apis.dev.nuskin.com/street-address/v1/',
+    test: 'https://apis.test.nuskin.com/street-address/v1/',
+    prod: 'https://apis.nuskin.com/street-address/v1/'
 };
 
 const zzipCache = {}
@@ -173,8 +178,7 @@ async function getListOfCitiesFromPostalCode (country, zip) {
 
         zzipCache[cacheKey] = fetch(url, {
             method: 'GET',
-            credentials: 'omit',
-            headers: ServiceUtils.getHeaders()
+            credentials: 'omit'
         })
             .then(ServiceUtils.transformFetchResponse)
             .then(result => zzipCache[cacheKey] = result.zzipRecords);
@@ -230,8 +234,8 @@ function getHeaders(eid) {
  */
 async function useAddressValidationService(address) {
     const country = RunConfigService.getRunConfig().country;
-    const awsUrl = UrlService.getAwsUrl();
-    const url = `${awsUrl}/street-address-validator/v1/${country}`;
+    const env = RunConfigService.getEnvironmentCode();
+    const url = STREET_ADDRESS_VALIDATOR_URLS[env] + country;
     let response = await fetch(url, {
         method: 'POST',
         headers: getHeaders(),

package/src/shipping/pickupUtil.js

@@ -4,6 +4,9 @@ import {RunConfigService} from '@nuskin/ns-util';
 import {OrderManager, CartService, OrderType, OrderAdapter} from '../shop';
 import axios from 'axios';
 
+const SHIP_METHODS = 'shipMethods';
+const PICK_UP_POINTS = 'pickUpPoints';
+
 let PickupUtil = function() {
     'use strict';
     const SERVICE_GROUP = 'SERVICE_GROUP',
@@ -165,79 +168,42 @@ let PickupUtil = function() {
         }
     }
 
-    function getShipToData(order) {
-        const shippingParties = order.shipping.shippingParties || [];
-        const shipTo = shippingParties.find((sp) => sp.type === 'SHIP_TO') || {};
-        return {
-            country: shipTo.shippingAddress.address.countryCode,
-            postalCode: shipTo.shippingAddress.address.postalCode,
-            line1: `${shipTo.shippingAddress.address.street1}, ${shipTo.shippingAddress.address.city}`,
-            line2: shipTo.shippingAddress.address.street2,
-            city: shipTo.shippingAddress.address.city
-        };
-    }
-
-    function samePayload(payload) {
-        let same = false;
-        const shipping = sessionStorage.getItem('shipping');
-
-        if (shipping) {
-            const storedPayload = JSON.parse(shipping).payload;
-            const shipData = getShipToData(payload.order);
-            const storedShipData = getShipToData(storedPayload.order);
-            same = payload.country === storedPayload.country &&
-                payload.dangerousGoods === storedPayload.dangerousGoods &&
-                payload.orderValue === storedPayload.orderValue &&
-                shipData.country === storedShipData.country &&
-                shipData.postalCode === storedShipData.postalCode &&
-                shipData.line1 === storedShipData.line1 &&
-                shipData.line2 === storedShipData.line2 &&
-                shipData.city === storedShipData.city
-        }
-        return same
-    }
-
     function loadShipMethods() {
         const order = Order.fromSalesOrderRequest(OrderAdapter.populateSalesOrder('SIMULATE'));
         const {metapackMarket} = getCachedConfiguration('Checkout');
 
         if (metapackMarket) {
             const runConfig = RunConfigService.getRunConfig();
-            const payload = {
-                order,
-                orderValue: getOrderValue(),
-                dangerousGoods: CartService.hasDangerousGoods(),
-                language: runConfig.language,
-                country: runConfig.country
-            };
-            if (!samePayload(payload)) {
-                promise = axios.post(
-                    getUrl(),
-                    payload,
-                    {
-                        headers: {
-                            'Content-Type': 'application/json; charset=UTF-8'
-                        }
+            promise = axios.post(
+                getUrl(),
+                {
+                    order,
+                    orderValue: getOrderValue(),
+                    dangerousGoods: CartService.hasDangerousGoods(),
+                    language: runConfig.language,
+                    country: runConfig.country
+                },
+                {
+                    headers: {
+                        'Content-Type': 'application/json; charset=UTF-8'
                     }
-                ).then((results) => {
-                    sessionStorage.setItem('shipping', JSON.stringify({
-                        payload,
-                        shipMethods: results.data.shipMethods,
-                        pickUpPoints: results.data.pickupPoints
-                    }))
-                }).catch((err) => {
-                    console.log(err);
-                    sessionStorage.setItem('shipping', JSON.stringify({payload: {}, shipMethods: [], pickUpPoints: []}));
-                });
-            }
+                }
+            ).then((results) => {
+                sessionStorage.setItem(SHIP_METHODS, JSON.stringify(results.data.shipMethods))
+                sessionStorage.setItem(PICK_UP_POINTS, JSON.stringify(results.data.pickupPoints))
+            }).catch((err) => {
+                console.log(err);
+                sessionStorage.setItem(SHIP_METHODS, JSON.stringify([]));
+                sessionStorage.setItem(PICK_UP_POINTS, JSON.stringify([]));
+            });
         }
     }
 
     // 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() {
-        const shipping = sessionStorage.getItem('shipping');
-        return shipping ? JSON.parse(shipping).shipMethods : [];
+        const shipMethods = sessionStorage.getItem(SHIP_METHODS);
+        return shipMethods ? JSON.parse(shipMethods) : [];
     }
 
     async function getShipMethods() {
@@ -249,8 +215,8 @@ let PickupUtil = function() {
     async function getPickupPoints() {
         await promise;
 
-        const shipping = sessionStorage.getItem('shipping');
-        return shipping ? JSON.parse(shipping).pickUpPoints : [];
+        const pups = sessionStorage.getItem(PICK_UP_POINTS);
+        return pups ? JSON.parse(pups) : [];
     }
 
     return {