@nuskin/ns-shop 6.4.2 → 6.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-shop",
-  "version": "6.4.2",
+  "version": "6.4.3",
   "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.5",
     "@nuskin/ns-feature-flags": "1.4.2",
     "@nuskin/ns-loyalty-web": "1.5.6",
-    "@nuskin/ns-product-lib": "2.6.1",
+    "@nuskin/ns-product-lib": "2.6.2",
     "@nuskin/nuskinjquery": "2.3.1",
     "axios": "0.21.1",
     "decimal.js": "10.2.1",
@@ -38,8 +38,8 @@
     "@nuskin/ns-account": "5.7.1",
     "@nuskin/configuration-sdk": "2.2.3",
     "@nuskin/ns-jsanalyzer": "1.0.1",
-    "@nuskin/ns-product": "3.39.1",
-    "@nuskin/ns-util": "4.2.5",
+    "@nuskin/ns-product": "3.40.0",
+    "@nuskin/ns-util": "4.2.7",
     "axios-mock-adapter": "1.18.2",
     "babel-cli": "6.26.0",
     "babel-core": "6.26.3",

package/src/cart/cartService.js

@@ -1310,18 +1310,10 @@ function checkContext(params){
 }
 
 function getCartPage(params = {}) {
-    let page;
     const queryParams = typeof params.queryParams === 'object' ? UrlService.toQueryString(params.queryParams) : '';
     const hashParams = params.hashParams ? `#${params.hashParams}` : '';
-
     const mySitePart = checkContext(params) ? '/mysite' : '';
-    page = `/static/cart/cart.html${queryParams ? '?' + queryParams : ''}#/${UrlService.getLocale()}${mySitePart}/cart${hashParams}`;
-
-    if(equinoxLocalStorage.isEquinoxEnabled()) {
-        const [locale, market] = UrlService.getLocale().split("_")
-        const currentEnvironment = RunConfigService.getEnvironmentCode();
-        page = `https:/mysite.${currentEnvironment !== 'prod' ? currentEnvironment + '.' : '' }mynuskin.com/${market}/${locale}/viewCart`
-    }
+    const page = `/static/cart/cart.html${queryParams ? '?' + queryParams : ''}#/${UrlService.getLocale()}${mySitePart}/cart${hashParams}`;
 
     return page;
 }

package/src/cart/equinoxCartService.js

@@ -66,9 +66,9 @@ async function addProductToEquinoxCart(options) {
         }],
         "properties": options.product.properties ? options.product.properties : { "categoryId": "antiaging" }
     };
-    
-    if (options.product.childSkus 
-        && Array.isArray(options.product.childSkus) 
+
+    if (options.product.childSkus
+        && Array.isArray(options.product.childSkus)
         && options.product.childSkus.length > 0) {
         requestData.skus = options.product.childSkus.map(child => {
             const childSku = {
@@ -266,16 +266,16 @@ async function _equinoxRequest(options) {
 function goToCartPage() {
     // Extract locale and market from the URL
     const [locale, market] = UrlService.getLocale().split("_");
-  
+
     // Get the current environment code
     const currentEnvironment = RunConfigService.getEnvironmentCode();
-  
+
     // Set the environment based on the current environment code
     const env = currentEnvironment !== 'prod' ? 'test.' : '';
-  
+
     // Get the shopping context from the storage
     const shoppingContext = storage.getItem(storage.keys.SHOPPING_CONTEXT);
-  
+
     // Set the URL based on the shopping context
     let url;
     if (shoppingContext && shoppingContext.context === "storefront") {
@@ -286,7 +286,7 @@ function goToCartPage() {
         console.error("Invalid shoppingContext", shoppingContext);
         return;
     }
-  
+
     // Navigate to the URL
     window.location = url;
 }

package/src/favorites/FavoritesService.js

@@ -107,15 +107,14 @@ async function addToFavorites(sku) {
 
     let body = {'sku': sku};
 
-    if (equinoxLocalStorage.isEquinoxEnabled()) {
-        if (await isMarketEquinoxEnabled()) {
-            await EquinoxService.addItemToEquinoxList(sku)
-            const equinoxFavoriteResponse = await EquinoxService.getEquinoxFavorite();
-            const response = EquinoxService.equinoxFavoritesMapper(equinoxFavoriteResponse);
-            return handleFavoritesListResponse(response);
-        }
-    }
 
+    if (await isMarketEquinoxEnabled()) {
+        await EquinoxService.addItemToEquinoxList(sku)
+        const equinoxFavoriteResponse = await EquinoxService.getEquinoxFavorite();
+        const response = EquinoxService.equinoxFavoritesMapper(equinoxFavoriteResponse);
+        return handleFavoritesListResponse(response);
+    }
+    
     const response = await fetch(url, {
         method: 'POST',
         headers: headers,
@@ -326,6 +325,5 @@ function getHeaders() {
 async function isMarketEquinoxEnabled() {
 
     const equinoxMarket = (await getConfiguration(["Equinox_Markets"])).Equinox_Markets;
-
-    return equinoxMarket.active;
+    return equinoxMarket.active && equinoxLocalStorage.isEquinoxEnabled();
 }