@nuskin/ns-shop 7.1.1-pur-813.2 → 7.1.1-pur-813.4

package/package.json

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

package/src/cart/cartService.js

@@ -682,30 +682,30 @@ function minAdrPsvMet() {
     return retVal;
 }
 
-function checkProductLanguages() {
-    let runConfig = RunConfigService.getRunConfig(null),
-        options = {
-            cntryCd: runConfig.country,
-            language: runConfig.language
-        };
-
-    _getCart().getItems({cartItems: true}).forEach(_cartItem => {
-        let cartItem = _cartItem;
-
+async function checkProductLanguages() {
+    const runConfig = RunConfigService.getRunConfig(null);
+    const promises = [];
+    const changeditems = []
+    _getCart().getItems({cartItems: true}).forEach((cartItem) => {
         if (runConfig.language !== cartItem.product.lang) {
-            options.sku = cartItem.product.sku;
-            options.priceType = cartItem.product.priceType;
-            ProductService.getProductBySku(options)
-                .then((response) => {
-                    if (response.success && response.product) {
-                        let cart = _getCart();
-
-                        cart.changeProduct(cartItem.key, response.product);
-                        setCart(cart);
-                    }
-                });
+            promises.push(ProductService.getProductBySku({
+                cntryCd: runConfig.country,
+                language: runConfig.language,
+                sku: cartItem.product.sku,
+                priceType: cartItem.product.priceType
+            }));
+            changeditems.push(cartItem);
         }
     });
+
+    if (promises.length > 0) {
+        const results = await Promise.all(promises);
+        let cart = _getCart();
+        results.forEach((result, i) => {
+            cart.changeProduct(changeditems[i].key, result.product);
+        });
+        setCart(cart);
+    }
 }
 
 function scanQualifiedCnt() {

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;