@nuskin/ns-shop 7.3.0-mdigi-897.2 → 7.3.0-mdigi-897.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-shop",
-  "version": "7.3.0-mdigi-897.2",
+  "version": "7.3.0-mdigi-897.4",
   "description": "The description that will amaze and astound your audience when they read it",
   "main": "src/shop.js",
   "scripts": {
@@ -44,7 +44,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.0",
     "axios-mock-adapter": "1.22.0",
     "babel-cli": "6.26.0",
     "babel-core": "6.26.3",

package/src/order/order.js

@@ -29,6 +29,7 @@ newShop.Order = function(orderData){
 
     let selectedAddress;
     let selectedShippingMethod;
+    let simulatedShippingMethod = {};
     let shippingAvailableMethods;
     let availableAddressTypes;
     let selectedPayment;
@@ -110,6 +111,7 @@ newShop.Order = function(orderData){
         simulateWithoutShipping = orderData.simulateWithoutShipping;
         externalPayment = orderData.externalPayment;
         selectedShippingMethod = orderData.selectedShippingMethod;
+        simulatedShippingMethod = orderData.simulatedShippingMethod || {};
         shippingAvailableMethods = orderData.shippingAvailableMethods;
         availableAddressTypes = orderData.availableAddressTypes;
         errorResponseInfo = orderData.errorResponseInfo;
@@ -263,6 +265,7 @@ newShop.Order = function(orderData){
         order.simulateWithoutShipping = simulateWithoutShipping;
         order.externalPayment = externalPayment;
         order.selectedShippingMethod = selectedShippingMethod;
+        order.simulatedShippingMethod = simulatedShippingMethod || {};
         order.shippingAvailableMethods = shippingAvailableMethods;
         order.availableAddressTypes = availableAddressTypes;
         order.errorResponseInfo = errorResponseInfo;
@@ -468,6 +471,14 @@ newShop.Order = function(orderData){
                 selectedShippingMethod = _selectedShippingMethod;
             }
         },
+        simulatedShippingMethod: {
+            get: function() {
+                return simulatedShippingMethod;
+            },
+            set: function(_simulatedShippingMethod) {
+                simulatedShippingMethod = _simulatedShippingMethod;
+            }
+        },
         shippingAvailableMethods: {
             get: function() {
                 return shippingAvailableMethods;

package/src/order/orderAdapter.js

@@ -137,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) {
@@ -164,12 +164,29 @@ const populateAttribution = (salesOrder) => {
     }
 }
 
+const getDefaultShipCode = (osmc) => {
+    let defaultCode = osmc;
+    const useShipMethodsApi = getCachedConfigField('useShipMethodsApi')
+    if (useShipMethodsApi) {
+        const csDefaultCode = getCachedConfigField('defaultShipMethod');
+        const shipMethods = PickupUtil.getStoredShipMethods();
+        const firstSm = shipMethods.length > 0 ? shipMethods[0].Code : '';
+        const defaultShipMethod = shipMethods.find((sm) => sm.Code === osmc);
+        if (!defaultShipMethod) {
+            defaultCode = shipMethods.find((sm) => sm.Code === csDefaultCode) ? csDefaultCode : firstSm;
+        } else {
+            defaultCode = defaultShipMethod.Code;
+        }
+    }
+
+    return defaultCode;
+};
+
 const populateShipping = (order, salesOrder) => {
     const user = UserService.getUser();
-    const useShipMethodsApi = getCachedConfigField('useShipMethodsApi')
-    const defaultCode = useShipMethodsApi ? getCachedConfigField('defaultShipMethod') : '';
-    const method = order.selectedShippingMethod;
-    const code = method ? method.Code : defaultCode;
+    const orderShipMethod = order.selectedShippingMethod;
+    const orderShipMethodCode = orderShipMethod ? orderShipMethod.Code : null;
+    const code = getDefaultShipCode(orderShipMethodCode);
 
     //code = (util.countryCode === 'ZA') ? (order.selectedAddress.addressType == "home" ? "ZH" : "ST") : code;
 
@@ -311,8 +328,8 @@ const populateShipping = (order, salesOrder) => {
         salesOrder.Shipping.ShippingParty.push(billTo);
     }
 
-    if (method && method.PickUpLocation) {
-        salesOrder.Shipping.ShippingMethod.PickUpLocation = method.PickUpLocation;
+    if (orderShipMethod && orderShipMethod.PickUpLocation) {
+        salesOrder.Shipping.ShippingMethod.PickUpLocation = orderShipMethod.PickUpLocation;
     }
     if (order.selectedDeliveryTimeSlot) {
         salesOrder.timeSlotId = order.selectedDeliveryTimeSlot.id;
@@ -1126,6 +1143,11 @@ const toOrder = async (salesOrderDetail, adr, createResponse) => {
     if (useShipMethodsApi || salesOrderDetail.ShippingAvailableMethods && salesOrderDetail.ShippingAvailableMethods.length > 0) {
         const shipMethods = useShipMethodsApi ? await pickupUtil.getShipMethods() : salesOrderDetail.ShippingAvailableMethods;
         order.shippingAvailableMethods = sortShippingAvailableMethods(shipMethods);
+        order.simulatedShippingMethod =
+            order.shippingAvailableMethods.find(
+                (sam) => sam.Code === salesOrderDetail.Shipping.ShippingMethod.Code
+            ) || order.shippingAvailableMethods[0];
+
         setShippingAvailableMethodsPickupInfo(order.shippingAvailableMethods);
         setSelectedShipMethod(order, salesOrderDetail.Shipping.ShippingMethod);
         // When an order or ADR is created.  The response from the create call is missing the list of pickup locations

package/src/shipping/pickupUtil.js

@@ -5,7 +5,7 @@ import {OrderManager, CartService, OrderType, OrderAdapter} from '../shop';
 import axios from 'axios';
 
 const SHIP_METHODS = 'shipMethods';
-const Pick_UP_POINTS = 'pickUpPoints';
+const PICK_UP_POINTS = 'pickUpPoints';
 
 let PickupUtil = function() {
     'use strict';
@@ -192,25 +192,33 @@ let PickupUtil = function() {
                 }
             ).then((results) => {
                 sessionStorage.setItem(SHIP_METHODS, JSON.stringify(results.data.shipMethods))
-                sessionStorage.setItem(Pick_UP_POINTS, JSON.stringify(results.data.pickupPoints))
+                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([]));
+                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 shipMethods = sessionStorage.getItem(SHIP_METHODS);
+        return shipMethods ? JSON.parse(shipMethods) : [];
+    }
+
     async function getShipMethods() {
         await promise;
 
-        return JSON.parse((sessionStorage.getItem(SHIP_METHODS) || []));
+        return getStoredShipMethods();
     }
 
     async function getPickupPoints() {
         await promise;
 
-        return JSON.parse(sessionStorage.getItem(Pick_UP_POINTS) || []);
+        const pups = sessionStorage.getItem(PICK_UP_POINTS);
+        return pups ? JSON.parse(pups) : [];
     }
 
     return {
@@ -221,6 +229,7 @@ let PickupUtil = function() {
         markers: generateMarkers,
         loadShipMethods,
         getShipMethods,
+        getStoredShipMethods,
         getPickupPoints
     }
 }();