@nuskin/ns-shop 7.7.0-6056-insider.1 → 7.7.0-cdb-1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-shop",
-  "version": "7.7.0-6056-insider.1",
+  "version": "7.7.0-cdb-1.1",
   "description": "The description that will amaze and astound your audience when they read it",
   "main": "src/shop.js",
   "scripts": {

package/src/cart/cart.js

@@ -1414,11 +1414,7 @@ export default function Cart(cartData) {
         'name': flatItem.title,
         'id': flatItem.sku,
         'price': flatItem.price,
-        'quantity': Math.abs(diffQty),
-        'taxonomy': flatItem.taxonomy,
-        'sales_price': flatItem.salesPrice,
-        'unit_price': flatItem.unitPrice,
-        'product_image_url': flatItem.product_image_url
+        'quantity': Math.abs(diffQty)
     });
 
     function getCartInfo(options) {

package/src/cart/cartItem.js

@@ -293,30 +293,6 @@ export default function CartItem(cartItemData) {
         return this.product.marketAttributes;
     }
 
-    this.unitPrice = function () {
-        if (AccountManager.isCustomer() || AccountManager.isPreferredCustomer()) {
-            return this.product.priceMap.RTL;
-        } else if (AccountManager.isDistributor()) {
-            return this.product.priceMap.WHL;
-        }
-    }
-
-    this.salesPrice = function () {
-        if (AccountManager.isCustomer() || AccountManager.isPreferredCustomer()) {
-            if (this.product.priceType.WADR) {
-                return this.product.priceMap.WADR;
-            } else {
-                return this.product.priceMap.RTL;
-            }
-        } else if (AccountManager.isDistributor()) {
-            if (this.product.priceType.WADR) {
-                return this.product.priceMap.WADW;
-            } else {
-                return this.product.priceMap.WHL;
-            }
-        }
-    }
-
     this.toFlatJson = function() {
         let retVal = {};
 
@@ -376,10 +352,6 @@ export default function CartItem(cartItemData) {
         retVal.size = this.product.size;
         retVal.variants = this.product.variants;
         retVal.marketAttributes = this.product.marketAttributes;
-        retVal.product_image_url = this.product.fullImage;
-        retVal.taxonomy = this.product.title ? this.product.title.split(' ')[0] : '';
-        retVal.salesPrice = AccountManager.isLoggedIn()? this.salesPrice() : null;
-        retVal.unitPrice = AccountManager.isLoggedIn()? this.unitPrice() : null;
 
         return retVal;
     };

package/src/cart/cartService.js

@@ -55,6 +55,7 @@ export default {
     adrHasAgelocMe,
     setSignupMode,
     inSignupMode,
+    currentUserCanAddToCart,
     minAdrPsvMet,
     checkProductLanguages,
     scanQualifiedCnt,
@@ -671,6 +672,50 @@ function inSignupMode() {
     return cart ? cart.inSignup : false;
 }
 
+/**
+ * Determines if the current user has permission to add items to cart based on market restrictions.
+ * Checks if users from markets configured in 'foreignOrderingRestrictedMarkets' are attempting 
+ * to add items in foreign markets.
+ * 
+ * @memberof CartService
+ * @example
+ * const canAdd = await CartService.currentUserCanAddToCart();
+ * if (!canAdd) {
+ *     // Show popup notification to user
+ * }
+ * 
+ * @returns {Promise<boolean>} Promise that resolves to true if current user can add items to cart, false if restricted
+ */
+async function currentUserCanAddToCart() {
+    // If no user is logged in, allow adding to cart (no restrictions for anonymous users)
+    const user = UserService.getUser();
+    if (!user) {
+        return true;
+    }
+    
+    // Get current market and user's home market
+    const runConfig = RunConfigService.getRunConfig();
+    const currentMarket = runConfig ? runConfig.country : null;
+    const userHomeMarket = user.countryCd;
+    
+    // If we can't determine markets, allow adding to cart (fail open)
+    if (!currentMarket || !userHomeMarket) {
+        return true;
+    }
+    
+    // Get Cart configuration to access foreign ordering restrictions
+    const { Cart: cartConfig } = await getConfiguration(['Cart']);
+    const foreignOrderingRestrictedMarkets = (cartConfig && cartConfig.foreignOrderingRestrictedMarkets) || [];
+    
+    // Check if user's home market restricts foreign ordering
+    if (foreignOrderingRestrictedMarkets.includes(userHomeMarket) && currentMarket !== userHomeMarket) {
+        return false;
+    }
+    
+    // All other cases are allowed
+    return true;
+}
+
 function minAdrPsvMet() {
     let retVal = true,
         cart = _getCart(),

package/src/cart/equinoxCartService.js

@@ -395,7 +395,7 @@ function _assembleChildSkus(requestData, options) {
     if (personalOffer !== null) {
         personalOffer = JSON.parse(personalOffer);
         productWithVariant = personalOffer.products.filter((sku) =>
-            sku.type === 'bundle' && sku.variantSelected !== null && sku.sku === productSku
+            sku.type.toLowerCase() === 'bundle' && sku.variantSelected !== null && sku.sku === productSku
         )
     }
 
@@ -411,7 +411,7 @@ function _assembleChildSkus(requestData, options) {
             }
             if (personalOffer != null && selectedVariants && cs.skuId != selectedVariants[cs.productId] && (cs.type !== "BUNDLE" && cs.type !== "OPTIONAL")) return null
             const childSku =
-            (personalOffer != null && selectedVariants && selectedVariants[cs.productId] && config.MySite_graphql_active)
+            (personalOffer != null && selectedVariants && selectedVariants[cs.productId] && config && config.MySite_graphql_active)
                 ? {
                     productId: cs.productId,
                     skuId: selectedVariants[cs.productId],