@nuskin/ns-shop 7.0.9-cx24-7079.1 → 7.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-shop",
-  "version": "7.0.9-cx24-7079.1",
+  "version": "7.0.9",
   "description": "The description that will amaze and astound your audience when they read it",
   "main": "src/shop.js",
   "scripts": {
@@ -26,7 +26,7 @@
     "@nuskin/ns-common-lib": "1.4.7",
     "@nuskin/ns-feature-flags": "1.4.7",
     "@nuskin/ns-loyalty-web": "1.5.6",
-    "@nuskin/ns-product-lib": "2.17.5",
+    "@nuskin/ns-product-lib": "2.17.6",
     "@nuskin/nuskinjquery": "2.3.1",
     "axios": "1.6.5",
     "decimal.js": "10.4.3",

package/src/cart/equinoxCartService.js

@@ -20,8 +20,7 @@ const shoppingContextCartTypes = {
 
 const DEFAULT_CART_TYPE = 'USER';
 
-let requestStatus = 'idle';
-let promise = null;
+let cartContents = null;
 
 export default {
     addProductToEquinoxCart,
@@ -224,25 +223,22 @@ function _getCartShoppingContext() {
 async function getEquinoxCart() {
 
     const cartType = _getCartShoppingContext();
-    
+
     const equinoxRequestOptions = {
         method: 'GET',
         endpoint: `carts/${cartType}`
     }
-    if(requestStatus === 'pending'){
-        return resolvePromise(promise);
-    }
-    if (requestStatus === 'idle'){
-        requestStatus = 'pending';
-        promise = _equinoxRequest(equinoxRequestOptions);
-        return resolvePromise(promise);
+    if (!cartContents){
+        cartContents = _equinoxRequest(equinoxRequestOptions).then(result => {
+            cartContents = result;
+        });
     }
-}
 
-async function resolvePromise (promise) {
-    const response = await promise;
-    requestStatus = 'idle';
-    return response;
+    await cartContents
+
+    // if this is a promise, this will resolve it
+    // otherwise, it won't do anything
+    return cartContents;
 }
 
 /**
@@ -471,6 +467,7 @@ const runConfigCallback = async (runConfig) => {
         const publishEquinoxCartCount = (options) => {
             getEquinoxCart().then((response) => {
                 const cart = response.data;
+                cartContents = null;
                 events.publish(events.shop.CART_UPDATED, { cartInfo: { qty: cart.value.count }, ...options });
             });
         }