@nuskin/ns-shop 7.5.4-td-1017.2.1 → 7.5.5-pa-64.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-shop",
-  "version": "7.5.4-td-1017.2.1",
+  "version": "7.5.5-pa-64.1",
   "description": "The description that will amaze and astound your audience when they read it",
   "main": "src/shop.js",
   "scripts": {
@@ -26,10 +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.20.1-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.1-td-1017.1",
+    "@nuskin/product-lib": "2.4.0",
     "axios": "1.8.3",
     "decimal.js": "10.4.3",
     "jp-conversion": "0.0.7",
@@ -40,9 +40,9 @@
     "@babel/preset-env": "^7.23.8",
     "@nuskin/configuration-sdk": "3.0.0",
     "@nuskin/exclusive-offer-sdk": "1.4.1",
-    "@nuskin/ns-account": "5.13.1-td-1017.1",
+    "@nuskin/ns-account": "5.13.0",
     "@nuskin/ns-jsanalyzer": "1.0.1",
-    "@nuskin/ns-product": "3.51.1-td-1017.1",
+    "@nuskin/ns-product": "3.51.0",
     "@nuskin/ns-util": "4.7.2",
     "axios-mock-adapter": "1.22.0",
     "babel-cli": "6.26.0",

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/shipping/pickupUtil.js

@@ -4,9 +4,6 @@ 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',
@@ -168,42 +165,80 @@ let PickupUtil = function() {
         }
     }
 
+    function getShipToData(order) {
+        const shippingParties = (order && order.shipping && order.shipping.shippingParties) || [];
+        const shipTo = shippingParties.find((sp) => sp.type === 'SHIP_TO');
+        return shipTo ? {
+            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();
-            promise = axios.post(
-                getUrl(),
-                {
-                    order,
-                    orderValue: getOrderValue(),
-                    dangerousGoods: CartService.hasDangerousGoods(),
-                    language: runConfig.language,
-                    country: runConfig.country
-                },
-                {
-                    headers: {
-                        'Content-Type': 'application/json; charset=UTF-8'
+            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'
+                        },
+                        timeout: 29000
                     }
-                }
-            ).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([]));
-            });
+                ).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: []}));
+                });
+            }
         }
     }
 
     // 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 shipMethods = sessionStorage.getItem(SHIP_METHODS);
-        return shipMethods ? JSON.parse(shipMethods) : [];
+        const shipping = sessionStorage.getItem('shipping');
+        return shipping ? JSON.parse(shipping).shipMethods : [];
     }
 
     async function getShipMethods() {
@@ -215,8 +250,8 @@ let PickupUtil = function() {
     async function getPickupPoints() {
         await promise;
 
-        const pups = sessionStorage.getItem(PICK_UP_POINTS);
-        return pups ? JSON.parse(pups) : [];
+        const shipping = sessionStorage.getItem('shipping');
+        return shipping ? JSON.parse(shipping).pickUpPoints : [];
     }
 
     return {