@nuskin/ns-shop 7.2.0 → 7.2.1-mdigi-2049.2

package/package.json

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

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,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;
 

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
     }
 }();