@nuskin/ns-shop 7.1.1-pur-813.1 → 7.1.1-pur-813.3

package/package.json

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

package/src/order/orderAdapter.js

@@ -153,12 +153,10 @@ const populateAttribution = (salesOrder) => {
 }
 
 const populateShipping = (order, salesOrder) => {
-    let user = UserService.getUser();
-    let code;
-    let method = order.selectedShippingMethod;
-    if (method) {
-        code = method.Code;
-    }
+    const user = UserService.getUser();
+    const defaultCode = getCachedConfigField('defaultShipMethod');
+    const method = order.selectedShippingMethod;
+    const code = method ? method.Code : defaultCode;
 
     //code = (util.countryCode === 'ZA') ? (order.selectedAddress.addressType == "home" ? "ZH" : "ST") : code;
 
@@ -1091,8 +1089,8 @@ const toOrder = async (salesOrderDetail, adr, createResponse) => {
         order.shippingPayWithPoints = salesOrderDetail.Custom.map(item => item.Key).indexOf('ZZUSE_PTS') > -1;
     }
 
-    if (salesOrderDetail.ShippingAvailableMethods && salesOrderDetail.ShippingAvailableMethods.length > 0) {
-        const useShipMethodsApi = getCachedConfigField('useShipMethodsApi');
+    const useShipMethodsApi = getCachedConfigField('useShipMethodsApi');
+    if (useShipMethodsApi || salesOrderDetail.ShippingAvailableMethods && salesOrderDetail.ShippingAvailableMethods.length > 0) {
         const shipMethods = useShipMethodsApi ? await pickupUtil.getShipMethods() : salesOrderDetail.ShippingAvailableMethods;
         order.shippingAvailableMethods = sortShippingAvailableMethods(shipMethods);
         setShippingAvailableMethodsPickupInfo(order.shippingAvailableMethods);