@nuskin/ns-shop 7.7.0 → 7.8.0-pa-902.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-shop",
-  "version": "7.7.0",
+  "version": "7.8.0-pa-902.2",
   "description": "The description that will amaze and astound your audience when they read it",
   "main": "src/shop.js",
   "scripts": {
@@ -42,7 +42,7 @@
     "@nuskin/ns-account": "5.13.0",
     "@nuskin/ns-jsanalyzer": "1.0.1",
     "@nuskin/ns-product": "3.51.0",
-    "@nuskin/ns-util": "4.7.2",
+    "@nuskin/ns-util": "4.8.0",
     "axios-mock-adapter": "1.22.0",
     "axios": "1.9.0",
     "babel-cli": "6.26.0",

package/src/cart/cartService.js

@@ -57,6 +57,7 @@ export default {
     adrHasAgelocMe,
     setSignupMode,
     inSignupMode,
+    canUserAddToCart,
     minAdrPsvMet,
     checkProductLanguages,
     scanQualifiedCnt,
@@ -371,6 +372,10 @@ function itemIsAvailable(product) {
  */
 async function addProductToCart(options) {
     await awaitForConfig();
+    if (!await canUserAddToCart()) {
+        events.setValue(events.shop.HOME_MARKET_ONLY_RESTRICTED, !(await canUserAddToCart()));
+        return;
+    }
     let cart = _getCart();
 
     if (!options.sapLineId && !itemIsAvailable(options.product)) {
@@ -439,6 +444,11 @@ async function addProductToCart(options) {
  *  }
  */
 async function addSkuToCart(options) {
+    if (!await canUserAddToCart()) {
+        events.setValue(events.shop.HOME_MARKET_ONLY_RESTRICTED, !(await canUserAddToCart()));
+        return;
+    }
+
     let retVal,
         response = await ProductService.getProductBySku(options),
         product = response.success && response.product;
@@ -688,6 +698,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.canUserAddToCart();
+ * 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 canUserAddToCart() {
+    // 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.homeMarketPurchasingOnly) || [];
+
+    // 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/persistentCartService.js

@@ -439,11 +439,13 @@ const updateAnonymousPersistedCart = async (cartId, payload) => {
  */
 const removePersistedCart = async (cartId) => {
     const user = UserService.getUser();
+    const {country} = RunConfigService.getRunConfig();
+
     try {
         if (user && cartId) {
             await axios({
                 method: 'DELETE',
-                url: getUrl('deleteCart', cartId,  {accountId: user.id}),
+                url: getUrl('deleteCart', cartId,  {accountId: user.id, country}),
                 headers: getHeaders(user.eid)
             });
             CartService.setCartProperties({id: '', version: -1});

package/src/order/orderAdapter.js

@@ -171,7 +171,7 @@ const getDefaultShipCode = (osmc) => {
     if (useShipMethodsApi) {
         const csDefaultCode = getCachedConfigField('defaultShipMethod');
         const shipMethods = PickupUtil.getStoredShipMethods();
-        if (shipMethods?.length > 0) {
+        if (shipMethods.length > 0) {
             const firstSm = shipMethods[0].Code;
             const defaultShipMethod = shipMethods.find((sm) => sm.Code === osmc);
             if (!defaultShipMethod) {