@nuskin/ns-shop 5.14.1-4867-type.3 → 5.14.2

package/package.json

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

package/src/cart/cart.js

@@ -857,7 +857,7 @@ export default function Cart(cartData) {
 
         if (eventNames.length > 0) {
             // make service call to get status of events on items
-            const eventStatuses = await SalesEventService.getEventStatus(eventNames)
+            const eventStatuses = await SalesEventService.getEventStatus(eventNames, order.externalId);
             itemsChecked.forEach((item) => {
                 const itemEvents = item.product.getEventPriceTypes();
                 itemEvents.some((ie) => {

package/src/cart/persistentCartService.js

@@ -238,7 +238,7 @@ const getUrl = (path, pathParam, queryParams = {}) => {
     const queryStr = UrlService.toQueryString(queryParams);
     const queryString = queryStr.length > 0 ? `?${queryStr}` : '';
 
-    return `https://devapi.cloud.nuskin.com/cart/v2/${path}/${pathParam}${queryString}`;
+    return `${ConfigService.getMarketConfig().awsUrl}/cart/v2/${path}/${pathParam}${queryString}`;
 };
 
 /**
@@ -562,7 +562,7 @@ const syncCart = async (type) => {
     let user = UserService.getUser();
     let pCart = null;
 
-    if (user) {
+    if (user && type) {
         try {
             pCart = await getPersistedCart(user, type);
 
@@ -731,7 +731,10 @@ const timerCallback = () => {
 const addAction = (info) => {
     const user = UserService.getUser();
 
-    if (!mergingIntoLocalCart && user) {
+    // If the code is currently merging the persistent cart into the local cart, cart update
+    // actions are being generated and those need to be ignored.  A loadCart action is not is
+    // generated elsewhere and should be let through.
+    if (user && (info.loadCart || !mergingIntoLocalCart)) {
         if (info.add && info.add.item && !info.add.item.isBusinessPortfolio ||
             info.modify || info.remove || info.removeItems || info.removeCart || info.loadCart) {
             pcActions.push(info);
@@ -756,6 +759,7 @@ const loadPersistedCart = (type) => {
     const lsType = CartService.getCartProperty('type');
     if (type != lsType) {
         if (!documentReady) {
+            CartService.clearCart();
             CartService.setCartProperties({type: type});
         } else {
             addAction({loadCart: {type: type}});

package/src/salesEventService.js

@@ -140,12 +140,12 @@ function getActiveTicketEvents() {
     return events;
 }
 
-async function getEventStatus(eventsToCheck = []) {
+async function getEventStatus(eventsToCheck = [], externalId = 'none') {
     const eventStatus = {};
     const promises = [];
 
     eventsToCheck.forEach((toCheck) => {
-        promises.push(_getTempTicket(toCheck));
+        promises.push(_getTempTicket(toCheck, externalId));
     });
 
     const responses = await Promise.allSettled(promises);
@@ -173,15 +173,15 @@ async function getEventStatus(eventsToCheck = []) {
  * @returns {Promise<*>} a new or updated ticket for the specified event
  * @private
  */
-async function _getTempTicket(eventName) {
+async function _getTempTicket(eventName, externalId) {
     let ticket;
 
     try {
         let method = 'POST',
-            seParams = _getSeParams(eventName),
+            seParams = _getSeParams(eventName, false),
             response = await axios({
                 method: method,
-                url: `${_getAwsUrl(eventName, null)}${seParams}`,
+                url: `${_getAwsUrl(eventName, null)}?orderEventCheck=${externalId}${seParams}`,
                 headers: _getHeaders(),
                 timeout: 7000
             });