@nuskin/ns-shop 7.9.0-mdigi-6056.5 → 7.9.1-td-4379.1

package/package.json

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

package/src/cart/equinoxCartService.js

@@ -31,6 +31,7 @@ export default {
     getEquinoxRequestConfiguration,
     _getEquinoxSession,
     _getCartShoppingContext,
+    _getSessionShoppingContext,
     _equinoxRequest,
     goToCartPage,
     _assembleChildSkus,
@@ -201,15 +202,32 @@ async function addBundleToEquinoxCart(productBundleSkus = [], products = [], ava
 
 }
 
+/**
+ * _getSessionShoppingContext - retrieves shopping context from storage or sessionStorage
+ * @returns { Object|null } - The shopping context object or null if not found
+ */
+function _getSessionShoppingContext() {
+    let shoppingContext = sessionStorage.getItem(storage.keys.SHOPPING_CONTEXT);
+    if (shoppingContext) {
+        try {
+            shoppingContext = JSON.parse(shoppingContext);
+        } catch (e) {
+            shoppingContext = null;
+        }
+    }
+    return shoppingContext;
+}
+
 /**
  * _getCartShoppingContext - set cart type based on storage shopping context
  * @returns { String }
  */
 function _getCartShoppingContext() {
     let cartType = DEFAULT_CART_TYPE;
-
-    const shoppingContext = storage.getItem(storage.keys.SHOPPING_CONTEXT);
-
+    let shoppingContext = storage.getItem(storage.keys.SHOPPING_CONTEXT);
+    if (!shoppingContext) {
+        shoppingContext = _getSessionShoppingContext();
+    }
     if (shoppingContext && shoppingContextCartTypes[shoppingContext.context]) {
         cartType = shoppingContextCartTypes[shoppingContext.context];
     }
@@ -291,13 +309,18 @@ async function getAddToCartQty(product) {
  */
 async function getEquinoxRequestConfiguration() {
     const cartType = _getCartShoppingContext();
+    const shoppingContext = _getSessionShoppingContext();
     const marketLocale = UrlService.getLocale();
     const [, market] = marketLocale.split("_");
     const config = (await getConfiguration(['Equinox_Markets'])).Equinox_Markets;
 
     // Use MySite_API_Base_URLs if it is in MySite or MSCART
     const isMysite = cartType === shoppingContextCartTypes.storefront || window.location.hostname.includes(".mynuskin.com");
-    const baseURL = isMysite ? config.MySite_API_Base_URLs : config.API_Base_URLs;
+    let baseURL = isMysite ? config.MySite_API_Base_URLs : config.API_Base_URLs;
+
+    if(shoppingContext && shoppingContext.context === 'storefront'){
+        baseURL = config.API_Base_URLs;
+    }
 
     let mySiteKongURL = baseURL.includes(isMysite ? "storefront" : "apis")
         ? baseURL
@@ -367,13 +390,36 @@ function goToCartPage() {
     const [locale, market] = UrlService.getLocale().split("_");
     const currentEnvironment = RunConfigService.getEnvironmentCode();
     const env = currentEnvironment !== 'prod' ? 'test.' : '';
-    const shoppingContext = storage.getItem(storage.keys.SHOPPING_CONTEXT);
+    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;
+        }
+    }
 
     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`;
     }
+
+    if (sessionStorefront && sessionStorefront.user.shopUrl && sessionStorefront.user.sapId) {
+        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') {
+            const sapId = sessionStorefront.user.sapId;
+            url = `https://${env}nuskin.com/${market.toLowerCase()}/${locale.toLowerCase()}/personal-offer/${sapId}/viewCart`;
+        }
+    }
    
     window.location = url;
 }