@nuskin/ns-shop 7.9.1-td-4379.1 → 7.9.1-td-4379.3

package/package.json

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

package/src/cart/equinoxCartService.js

@@ -34,6 +34,7 @@ export default {
     _getSessionShoppingContext,
     _equinoxRequest,
     goToCartPage,
+    getSessionShopURL,
     _assembleChildSkus,
     _assembleAdrProperties
 }
@@ -390,38 +391,40 @@ function goToCartPage() {
     const [locale, market] = UrlService.getLocale().split("_");
     const currentEnvironment = RunConfigService.getEnvironmentCode();
     const env = currentEnvironment !== 'prod' ? 'test.' : '';
-    let shoppingContext = storage.getItem(storage.keys.SHOPPING_CONTEXT);
-    let sessionStorefront = sessionStorage.getItem(storage.keys.STOREFRONT);
-
-    if (!shoppingContext) {
-        shoppingContext = _getSessionShoppingContext();
-    }
-
-    if (sessionStorefront) {
-        try {
-            sessionStorefront = JSON.parse(sessionStorefront);
-        } catch (e) {
-            sessionStorefront = null;
-        }
-    }
+    const shoppingContext = storage.getItem(storage.keys.SHOPPING_CONTEXT);
 
     let url = `https://${env}nuskin.com/${market.toLowerCase()}/${locale.toLowerCase()}/viewCart`;
 
     if (shoppingContext && shoppingContext.context === "storefront") {
         url = `https://mysite.${env}mynuskin.com/${market.toLowerCase()}/${locale.toLowerCase()}/viewCart`;
+    } else if (!shoppingContext) {
+        const sessionUrl = getSessionShopURL();
+        if (sessionUrl) {
+            url = `https://${env}nuskin.com/${sessionUrl}`;
+        }
     }
+   
+    window.location = url;
+}
+
+//Gets the shop URL and sapId from session storage.
+function getSessionShopURL() {
+    const [locale, market] = UrlService.getLocale().split("_");
+    const shoppingContext = _getSessionShoppingContext();
+    const sessionStorefront = sessionStorage.getItem('storefront') ? JSON.parse(sessionStorage.getItem('storefront')) : null;
+    let url;
 
-    if (sessionStorefront && sessionStorefront.user.shopUrl && sessionStorefront.user.sapId) {
+    if (sessionStorefront && sessionStorefront.user && sessionStorefront.user.shopUrl) {
         if (shoppingContext && shoppingContext.context === "storefront") {
             const shopUrl = sessionStorefront.user.shopUrl;
-            url = `https://${env}nuskin.com/${market.toLowerCase()}/${locale.toLowerCase()}/mysite/${shopUrl}/viewCart`;
-        } else if (shoppingContext && shoppingContext.context === 'personal_offer') {
+            url = `${market.toLowerCase()}/${locale.toLowerCase()}/mysite/${shopUrl}/viewCart`;
+        } else if (shoppingContext && shoppingContext.context === 'personal_offer' && sessionStorefront.user.sapId) {
             const sapId = sessionStorefront.user.sapId;
-            url = `https://${env}nuskin.com/${market.toLowerCase()}/${locale.toLowerCase()}/personal-offer/${sapId}/viewCart`;
+            url = `${market.toLowerCase()}/${locale.toLowerCase()}/personal-offer/${sapId}/viewCart`;
         }
     }
-   
-    window.location = url;
+
+    return url;
 }
 
 /**