@nuskin/ns-shop 6.4.4 → 6.4.5

package/package.json

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

package/src/order/orderAdapter.js

@@ -480,7 +480,7 @@ function handleRedetermination(product, sapItem, sapSkus, adr, isAdrItem) {
     }
 }
 
-function addSapItem(newItem, sapItem, sapSkus, adr, isAdrItem, replace) {
+async function addSapItem(newItem, sapItem, sapSkus, adr, isAdrItem, replace) {
     let product;
 
     product = new Product(newItem);
@@ -516,7 +516,7 @@ function addSapItem(newItem, sapItem, sapSkus, adr, isAdrItem, replace) {
     handleRedetermination(product, sapItem, sapSkus, adr, isAdrItem); // removes items from sapSkus
 
     // Only honor the OneTime flag from SAP if we are a ADR order
-    CartService.addProductToCart({
+    await CartService.addProductToCart({
         product: product,
         qty: sapItem.LineItem.RequestedQuantity,
         adr: (adr && isAdrItem),
@@ -526,13 +526,12 @@ function addSapItem(newItem, sapItem, sapSkus, adr, isAdrItem, replace) {
         loyaltyPointsUsed: newItem.loyaltyPointsUsed,
         isBusinessPortfolio: newItem.businessPortfolio,
         replace: replace
-    }).finally(() => {});
+    })
 }
 
-const syncProductItems = (order, sapProducts, adr, includeSapItems) => {
+const syncProductItems = async (order, sapProducts, adr, includeSapItems) => {
     let sapSkus = [],
         cartItems,
-        productPromises = [],
         runConfig = RunConfigService.getRunConfig();
 
     order.clearOutOfStock();
@@ -561,7 +560,7 @@ const syncProductItems = (order, sapProducts, adr, includeSapItems) => {
     }
 
     // first loop thru sapProducts to add new ones into the localProducts
-    sapProducts.forEach(sapItem => {
+    for (const sapItem of sapProducts) {
         order.productDiscountAmount += sapItem.ProductPromoSavings;
         order.shippingDiscountAmount += sapItem.FreightPromoSavings;
         // We need to make sure it is not a BOM item
@@ -625,42 +624,30 @@ const syncProductItems = (order, sapProducts, adr, includeSapItems) => {
                     newItem.thumbnail = existingItem.thumbnail;
                     newItem.title = existingItem.title;
                     newItem.marketAttributes = existingItem.marketAttributes;
-                    addSapItem(newItem, sapItem, sapSkus, adr, isAdrItem, !!includeSapItems);
+                    await addSapItem(newItem, sapItem, sapSkus, adr, isAdrItem, !!includeSapItems);
                 } else {
                     //order.getItem returns objects of type nuskin.newShop.cartItem
-                    productPromises.push(ProductService.getProductData(newItemSku, runConfig.country, runConfig.language)
-                        .then(resp => {
-                            if (resp && resp.title) {
-                                if (runConfig.assessmentApp && newItem.thumbnail.search(/^http/g) === -1) {
-                                    newItem.thumbnail =  UrlService.getSiteUrl() + '/' + newItem.thumbnail;
-                                }
-                                newItem.title = resp.title; // overwrite with the localized title
-                                addSapItem(newItem, sapItem, sapSkus, adr, isAdrItem, !!includeSapItems);
+                    try {
+                        const data = await ProductService.getProductData(newItemSku, runConfig.country, runConfig.language);
+                        if (data.title) {
+                            if (runConfig.assessmentApp && newItem.thumbnail.search(/^http/g) === -1) {
+                                newItem.thumbnail =  UrlService.getSiteUrl() + '/' + newItem.thumbnail;
                             }
-                        })
-                        .catch(err => {
-                            console.error(`Failed to get the product name for ${newItemSku} \n${err}`);
-                            // If the call to get the title fails then still add the item
-                            addSapItem(newItem,sapItem, sapSkus, adr, isAdrItem, !!includeSapItems);
-                        }));
+                            newItem.title = data.title; // overwrite with the localized title
+                        }
+                    } catch (err) {
+                        console.error(`Failed to get the product name for ${newItemSku} \n${err}`);
+                    }
+                    await addSapItem(newItem, sapItem, sapSkus, adr, isAdrItem, !!includeSapItems);
                 }
             }
         }
-    });
-
-    if (productPromises.length > 0) {
-        Promise.all(productPromises).then(function () {
-            removeItems(cartItems, sapSkus);
-            // this needs to be called here because of the async call to get product info for the
-            //  added items to be displayed in the order details section.
-            events.publish(events.shop.SIMULATE_COMPLETE);
-        }).catch(() => {
-            // same comment as above.
-            events.publish(events.shop.SIMULATE_COMPLETE);
-        });
-    } else {
-        removeItems(cartItems, sapSkus);
     }
+
+    removeItems(cartItems, sapSkus);
+    // this needs to be called here because of the async call to get product info for the
+    //  added items to be displayed in the order details section.
+    events.publish(events.shop.SIMULATE_COMPLETE);
 };
 
 const syncOrderTotals = (sapOrderTotals, orderTotals) => {
@@ -1071,7 +1058,7 @@ const populateSalesOrder = (action, adr) => {
  * @param {Object} adr - Adr object created during checkout.  Needed to syncProductItems
  * @param {boolean} createResponse - Indicates that the salesOrderDetail object is from a createResponse
  */
-const toOrder = (salesOrderDetail, adr, createResponse) => {
+const toOrder = async (salesOrderDetail, adr, createResponse) => {
     let order = OrderManager.getOrder();
     order.currencyCode = salesOrderDetail.Currency;
     order.orderId = salesOrderDetail.OrderID;
@@ -1100,7 +1087,7 @@ const toOrder = (salesOrderDetail, adr, createResponse) => {
         syncShipping(salesOrderDetail.Shipping, order);
     }
 
-    syncProductItems(order, salesOrderDetail.LineItemDetails, order.adr ? adr : null);
+    await syncProductItems(order, salesOrderDetail.LineItemDetails, order.adr ? adr : null);
     syncOrderTotals(salesOrderDetail.OrderTotals, order.orderTotals);
     syncPayment(salesOrderDetail.Payment, order.selectedPayment);
     return order;

package/src/order/orderService.js

@@ -212,28 +212,28 @@ const adrShipImmediateSimulate = (adr) => {
             headers: _getHeaders(),
             timeout: SERVICE_TIMEOUT
         })
-            .then((response) => {
+            .then(async (response) => {
                 let data = response.data;
                 if (data && data.messages) {
                     order.messages = data.messages;
                 }
                 if (data && data.SalesOrderResponse && data.SalesOrderResponse.SalesOrderDetail) {
                     syncSalesOrderResponse(data.SalesOrderResponse, order);
-                    OrderAdapter.toOrder(data.SalesOrderResponse.SalesOrderDetail, adr);
+                    await OrderAdapter.toOrder(data.SalesOrderResponse.SalesOrderDetail, adr);
                 } else {
                     console.log("SAP Error while calling simulate...");
                     events.publishError(events.errors.SAP, {messageString: "SAP Error while calling simulate..."});
                 }
                 resolve(response);
             })
-            .catch((err) => {
+            .catch(async (err) => {
                 console.log(err);
                 let data;
                 if (err && err.response) data = err.response.data;
                 if (data && data.messages) {
                     if ((data.messages[0].type === 'OrderException') && data.SalesOrderResponse && data.SalesOrderResponse.SalesOrderDetail) {
                         syncSalesOrderResponse(data.SalesOrderResponse, order);
-                        OrderAdapter.toOrder(data.SalesOrderResponse.SalesOrderDetail, adr);
+                        await OrderAdapter.toOrder(data.SalesOrderResponse.SalesOrderDetail, adr);
                     } else if (data.messages[0].type === 'ProductDiscontinuedException') {
                         handleDiscontinuedSku(order, adr, data.messages);
                     }
@@ -281,7 +281,7 @@ const adrShipImmediateCreate = (adr) => {
             headers: _getHeaders(),
             timeout: SERVICE_TIMEOUT
         })
-            .then((response) => {
+            .then(async (response) => {
                 let data = response.data;
                 if (data && data.AdrShipImmediateResponse && data.AdrShipImmediateResponse.salesOrderResponse) {
                     let salesOrderDetail = data.AdrShipImmediateResponse.salesOrderResponse.SalesOrderDetail;
@@ -297,7 +297,7 @@ const adrShipImmediateCreate = (adr) => {
                     }
 
                     if (salesOrderDetail) {
-                        OrderAdapter.toOrder(salesOrderDetail, adr, true);
+                        await OrderAdapter.toOrder(salesOrderDetail, adr, true);
                         order.adrOverrideNumber = salesOrderDetail.ADROverrideNumber;
                     }
                     // Clear locally-cached ADR List
@@ -347,28 +347,28 @@ const adrSimulate = (adr) => {
             headers: _getHeaders(),
             timeout: SERVICE_TIMEOUT
         })
-            .then((response) => {
+            .then(async (response) => {
                 let data = response.data;
                 if (data && data.messages) {
                     order.messages = data.messages;
                 }
                 if (data && data.AdrResponse && data.AdrResponse.ADRDetail && data.AdrResponse.ADRDetail.SalesOrderDetail) {
                     syncSalesOrderResponse(data.AdrResponse, order);
-                    OrderAdapter.toOrder(data.AdrResponse.ADRDetail.SalesOrderDetail, adr);
+                    await OrderAdapter.toOrder(data.AdrResponse.ADRDetail.SalesOrderDetail, adr);
                 } else {
                     console.log("SAP Error while calling simulate...");
                     events.publishError(events.errors.SAP, {messageString: "SAP Error while calling simulate..."});
                 }
                 resolve(response);
             })
-            .catch((err) => {
+            .catch(async (err) => {
                 console.log(err);
                 let data;
                 if (err && err.response) data = err.response.data;
                 if (data && data.messages) {
                     if ((data.messages[0].type === 'OrderException') && data.AdrResponse.ADRDetail && data.AdrResponse.ADRDetail.SalesOrderDetail) {
                         syncSalesOrderResponse(data.AdrResponse, order);
-                        OrderAdapter.toOrder(data.AdrResponse.ADRDetail.SalesOrderDetail, adr);
+                        await OrderAdapter.toOrder(data.AdrResponse.ADRDetail.SalesOrderDetail, adr);
                     } else if (data.messages[0].type === 'ProductDiscontinuedException') {
                         handleDiscontinuedSku(order, adr, data.messages);
                     }
@@ -410,10 +410,10 @@ const adrCreate = (adr) => {
             headers: _getHeaders(),
             timeout: SERVICE_TIMEOUT
         })
-            .then((response) => {
+            .then(async (response) => {
                 let data = response.data;
                 if (data && data.AdrResponse && data.AdrResponse.ADRDetail && data.AdrResponse.ADRDetail.SalesOrderDetail) {
-                    OrderAdapter.toOrder(data.AdrResponse.ADRDetail.SalesOrderDetail, adr, true);
+                    await OrderAdapter.toOrder(data.AdrResponse.ADRDetail.SalesOrderDetail, adr, true);
                     if (data.AdrResponse.redirectUrl) {
                         syncRedirectUrls(data.AdrResponse, order);
                         order.externalPayment = true;
@@ -460,28 +460,28 @@ const orderSimulate = () => {
             headers: _getHeaders(),
             timeout: SERVICE_TIMEOUT
         })
-            .then((response) => {
+            .then(async (response) => {
                 let data = response.data;
                 if (data && data.messages) {
                     order.messages = data.messages;
                 }
                 if (data && data.SalesOrderResponse && data.SalesOrderResponse.SalesOrderDetail) {
                     syncSalesOrderResponse(data.SalesOrderResponse, order);
-                    OrderAdapter.toOrder(data.SalesOrderResponse.SalesOrderDetail);
+                    await OrderAdapter.toOrder(data.SalesOrderResponse.SalesOrderDetail);
                 } else {
                     console.log("SAP Error while calling simulate...");
                     events.publishError(events.errors.SAP, {messageString: "SAP Error while calling simulate..."});
                 }
                 resolve(response);
             })
-            .catch((err) => {
+            .catch(async (err) => {
                 let data;
                 console.log(err);
                 if (err && err.response) data = err.response.data;
                 if (data && data.messages) {
                     if ((data.messages[0].type === 'OrderException') && data.SalesOrderResponse && data.SalesOrderResponse.SalesOrderDetail) {
                         syncSalesOrderResponse(data.SalesOrderResponse, order);
-                        OrderAdapter.toOrder(data.SalesOrderResponse.SalesOrderDetail);
+                        await OrderAdapter.toOrder(data.SalesOrderResponse.SalesOrderDetail);
                     } else if (data.messages[0].type === 'ProductDiscontinuedException') {
                         handleDiscontinuedSku(order, null, data.messages);
                     }
@@ -533,7 +533,7 @@ const orderCreate = async () => {
             order.paymentAuthorizationObject = data.SalesOrderResponse.paymentAuthorizationObject || null;
             syncRedirectUrls(data.SalesOrderResponse, order);
             if (data.SalesOrderResponse.SalesOrderDetail) {
-                OrderAdapter.toOrder(data.SalesOrderResponse.SalesOrderDetail, null, true);
+                await OrderAdapter.toOrder(data.SalesOrderResponse.SalesOrderDetail, null, true);
             }
         } else {
             console.log("SAP Error while calling create...");

package/src/payment/externalPaymentService.js

@@ -223,7 +223,7 @@ const _readOrderStatus = async (order, tdc, sections, adr) => {
         _paymentErrorCallback(sections);
     } else {
         doingRedirect = true;
-        _handleSuccess(OrderAdapter.toOrder(salesOrderResponse.SalesOrderDetail, adr, true));
+        _handleSuccess(await OrderAdapter.toOrder(salesOrderResponse.SalesOrderDetail, adr, true));
     }
     return doingRedirect;
 }
@@ -269,7 +269,7 @@ const _checkExternalPaymentStatus = async (order, tdc, sections, adr) => {
                     doingRedirect = true;
                     // look for SalesOrderResponse here
                     if (status.salesOrderResponse) {
-                        order = OrderAdapter.toOrder(status.salesOrderResponse.SalesOrderDetail, adr, true);
+                        order = await OrderAdapter.toOrder(status.salesOrderResponse.SalesOrderDetail, adr, true);
                     }
                     _handleSuccess(order);
                     break;