@nuskin/ns-shop 7.7.0-pa-87.4 → 7.7.0-pa-902.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-shop",
-  "version": "7.7.0-pa-87.4",
+  "version": "7.7.0-pa-902.1",
   "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.8",
     "@nuskin/ns-feature-flags": "1.5.0",
     "@nuskin/ns-loyalty-web": "1.5.7",
-    "@nuskin/ns-product-lib": "2.21.0",
+    "@nuskin/ns-product-lib": "2.20.0",
     "@nuskin/nuskinjquery": "2.3.1",
     "@nuskin/order-model": "3.1.3",
     "@nuskin/product-lib": "2.4.0",

package/src/cart/cartService.js

@@ -6,7 +6,6 @@ import {AdrService, Product, ScanCard, CurrencyService} from '@nuskin/ns-shop';
 import {UserService, AccountManager}  from '@nuskin/ns-account';
 import ProductService from './productService';
 import Cart from './cart.js';
-import {OrderType} from '../order/orderType.js';
 import AdrEditService from '../adr/AdrEditService.js';
 import QualificationService from '@nuskin/exclusive-offer-sdk'
 import {ProductStatus} from '@nuskin/ns-product-lib';
@@ -36,7 +35,6 @@ export default {
     hasEventItems,
     hasPreviewItems,
     hasDangerousGoods,
-    getCartWeight,
     getItemCnt,
     addProductToCart,
     addSkuToCart,
@@ -57,6 +55,7 @@ export default {
     adrHasAgelocMe,
     setSignupMode,
     inSignupMode,
+    canUserAddToCart,
     minAdrPsvMet,
     checkProductLanguages,
     scanQualifiedCnt,
@@ -301,29 +300,14 @@ function hasPreviewItems() {
     return _getCart().hasPreviewItems();
 }
 
-function _getItemsByOrderType(orderType) {
-    if (orderType == OrderType.SHIP_IMMEDIATE) return _getCart().getItems({cartItems: true});
-    else if (orderType == OrderType.ADR_CREATE) return _getCart().getItems({cartAdrItems: true});
-    else return _getCart().getItems({cartOrderItems: true});
-}
-
-function hasDangerousGoods(orderType) {
+function hasDangerousGoods(options = {cartItems: true}) {
     let retVal = false;
-    _getItemsByOrderType(orderType).forEach((item) => {
+    _getCart().getItems(options).forEach((item) => {
         retVal = retVal || item.product.dangerousGoods;
     });
     return retVal;
 }
 
-function getCartWeight(orderType) {
-    let retVal = 0.0;
-
-    _getItemsByOrderType(orderType).forEach((item) => {
-        retVal += item.qty * (item.product.grossWeight || 0.0);
-    });
-    return retVal;
-}
-
 function getItemCnt(options) {
     return _getCart().getItemCnt(options);
 }
@@ -688,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.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(),
@@ -837,8 +865,6 @@ function syncCartItemToSapItem(sapItemKey, cartItemKey = null) {
         cartItem.redeem = sapItem.redeem;
         cartItem.qtyRedeemWithPoints = sapItem.qtyRedeemWithPoints;
         cartItem.product.subPriceFlag = sapItem.product.subPriceFlag;
-        cartItem.product.grossWeight = sapItem.product.grossWeight;
-        cartItem.product.weightUnit = sapItem.product.weightUnit;
         cart.addCartItem(cartItem, true);
         setCart(cart, false);
     }

package/src/order/order.js

@@ -29,6 +29,7 @@ newShop.Order = function(orderData){
 
     let selectedAddress;
     let selectedShippingMethod;
+    let simulatedShippingMethod = {};
     let shippingAvailableMethods;
     let availableAddressTypes;
     let selectedPayment;
@@ -111,6 +112,7 @@ newShop.Order = function(orderData){
         simulateWithoutShipping = orderData.simulateWithoutShipping;
         externalPayment = orderData.externalPayment;
         selectedShippingMethod = orderData.selectedShippingMethod;
+        simulatedShippingMethod = orderData.simulatedShippingMethod || {};
         shippingAvailableMethods = orderData.shippingAvailableMethods;
         availableAddressTypes = orderData.availableAddressTypes;
         errorResponseInfo = orderData.errorResponseInfo;
@@ -265,6 +267,7 @@ newShop.Order = function(orderData){
         order.simulateWithoutShipping = simulateWithoutShipping;
         order.externalPayment = externalPayment;
         order.selectedShippingMethod = selectedShippingMethod;
+        order.simulatedShippingMethod = simulatedShippingMethod || {};
         order.shippingAvailableMethods = shippingAvailableMethods;
         order.availableAddressTypes = availableAddressTypes;
         order.errorResponseInfo = errorResponseInfo;
@@ -471,6 +474,14 @@ newShop.Order = function(orderData){
                 selectedShippingMethod = _selectedShippingMethod;
             }
         },
+        simulatedShippingMethod: {
+            get: function() {
+                return simulatedShippingMethod;
+            },
+            set: function(_simulatedShippingMethod) {
+                simulatedShippingMethod = _simulatedShippingMethod;
+            }
+        },
         shippingAvailableMethods: {
             get: function() {
                 return shippingAvailableMethods;

package/src/order/orderAdapter.js

@@ -1,13 +1,12 @@
 import $ from '@nuskin/nuskinjquery';
 import {Agelocme, CartService, ShippingAddress, ShopContextService, OrderManager, SalesOrder,
-    Product, ProductService, ExternalPaymentService, ProcessorCode} from "../shop.js";
+    PickupUtil, Product, ProductService, ExternalPaymentService, ProcessorCode} from "../shop.js";
 import {RunConfigService, events, util, PersonalOfferStorageService, BrowserDetection, ShoppingContext, UrlService} from "@nuskin/ns-util";
 import {getCachedConfigField} from '@nuskin/configuration-sdk';
 import {UserService} from "@nuskin/ns-account";
 import PaymentAdapter from '../payment/PaymentAdapter';
-import PickupUtil from '../shipping/pickupUtil';
-import {Order} from '@nuskin/order-model';
-import {storage} from "@nuskin/ns-util";
+import pickupUtil from '../shipping/pickupUtil';
+import { storage } from "@nuskin/ns-util";
 
 let splitLineItems = [];
 const utmInfo = storage.getItem(storage.metadata.UTM_INFO) || {};
@@ -171,16 +170,12 @@ const getDefaultShipCode = (osmc) => {
     if (useShipMethodsApi) {
         const csDefaultCode = getCachedConfigField('defaultShipMethod');
         const shipMethods = PickupUtil.getStoredShipMethods();
-        if (shipMethods?.length > 0) {
-            const firstSm = shipMethods[0].Code;
-            const defaultShipMethod = shipMethods.find((sm) => sm.Code === osmc);
-            if (!defaultShipMethod) {
-                defaultCode = shipMethods.find((sm) => sm.Code === csDefaultCode) ? csDefaultCode : firstSm;
-            } else {
-                defaultCode = defaultShipMethod.Code;
-            }
+        const firstSm = shipMethods.length > 0 ? shipMethods[0].Code : '';
+        const defaultShipMethod = shipMethods.find((sm) => sm.Code === osmc);
+        if (!defaultShipMethod) {
+            defaultCode = shipMethods.find((sm) => sm.Code === csDefaultCode) ? csDefaultCode : firstSm;
         } else {
-            defaultCode = csDefaultCode;
+            defaultCode = defaultShipMethod.Code;
         }
     }
 
@@ -506,7 +501,7 @@ const populateCategory = (salesOrder) => {
     } else if (utmMedium && utmMedium.toLowerCase().includes('paidsearch')) {
         salesOrder.Category = 'PAIDSEARCH';
     } else if (utmMedium && utmMedium.toLowerCase().includes('paidsocial')) {
-        salesOrder.Category = 'PAIDAD';
+        salesOrder.Category = 'PAIDAD'; 
     } else {
         salesOrder.Category = 'WEB';
     }
@@ -655,10 +650,6 @@ const syncProductItems = async (order, sapProducts, adr, includeSapItems) => {
                             label = custom.Value;
                         } else if (custom.Key === 'SUB_PRICE') {
                             newItem.subPriceFlag = true;
-                        } else if (custom.Key === 'GROSSWEIGHT') {
-                            newItem.grossWeight = parseFloat(custom.Value);
-                        } else if (custom.Key === 'WEIGHTUNIT') {
-                            newItem.weightUnit = custom.Value;
                         }
                     });
                     if (code != null || name !== null || label != null) {
@@ -1129,18 +1120,6 @@ const populateSalesOrder = (action, adr) => {
     return salesOrder;
 };
 
-const getShipMethods = async (salesOrderDetail, orderType) => {
-    let shipMethods;
-    const useShipMethodsApi = getCachedConfigField('useShipMethodsApi');
-    if (useShipMethodsApi) {
-        await PickupUtil.loadShipMethods(Order.fromSalesOrderRequest(populateSalesOrder('SIMULATE')), orderType);
-        shipMethods = await PickupUtil.getShipMethods();
-    } else {
-        shipMethods = salesOrderDetail.ShippingAvailableMethods
-    }
-    return shipMethods
-}
-
 /**
  * Maps Sales order detail object to the order object
  * @param {Object} salesOrderDetail
@@ -1160,12 +1139,14 @@ const toOrder = async (salesOrderDetail, adr, createResponse) => {
         order.shippingPayWithPoints = salesOrderDetail.Custom.map(item => item.Key).indexOf('ZZUSE_PTS') > -1;
     }
 
-    await syncProductItems(order, salesOrderDetail.LineItemDetails, order.adr ? adr : null);
-
     const useShipMethodsApi = getCachedConfigField('useShipMethodsApi');
     if (useShipMethodsApi || salesOrderDetail.ShippingAvailableMethods && salesOrderDetail.ShippingAvailableMethods.length > 0) {
-        const shipMethods = await getShipMethods(salesOrderDetail, order.orderType);
+        const shipMethods = useShipMethodsApi ? await pickupUtil.getShipMethods() : salesOrderDetail.ShippingAvailableMethods;
         order.shippingAvailableMethods = sortShippingAvailableMethods(shipMethods);
+        order.simulatedShippingMethod =
+            order.shippingAvailableMethods.find(
+                (sam) => sam.Code === salesOrderDetail.Shipping.ShippingMethod.Code
+            ) || order.shippingAvailableMethods[0];
 
         setShippingAvailableMethodsPickupInfo(order.shippingAvailableMethods);
         setSelectedShipMethod(order, salesOrderDetail.Shipping.ShippingMethod);
@@ -1175,7 +1156,7 @@ const toOrder = async (salesOrderDetail, adr, createResponse) => {
             let oldPup = null;
             if (!useShipMethodsApi) oldPup = salesOrderDetail.Custom;
             let newPup = null;
-            if (useShipMethodsApi) newPup = await PickupUtil.getPickupPoints();
+            if (useShipMethodsApi) newPup = await pickupUtil.getPickupPoints();
             setPickupPoints(oldPup, newPup, order);
         }
     }
@@ -1185,6 +1166,7 @@ const toOrder = async (salesOrderDetail, adr, createResponse) => {
         syncShipping(salesOrderDetail.Shipping, order);
     }
 
+    await syncProductItems(order, salesOrderDetail.LineItemDetails, order.adr ? adr : null);
     syncOrderTotals(salesOrderDetail.OrderTotals, order.orderTotals);
     syncPayment(salesOrderDetail.Payment, order.selectedPayment);
     OrderManager.saveOrders();

package/src/order/orderManager.js

@@ -5,7 +5,6 @@ import {OrderType} from './orderType.js';
 import {storage, events, RunConfigService} from "@nuskin/ns-util";
 import {UserService} from "@nuskin/ns-account";
 import {AdrService, CartService, CheckoutModeService} from "../shop";
-import {getCachedConfigField} from '@nuskin/configuration-sdk';
 
 const ORDER_STORAGE_KEY = storage.metadata.ORDER_STORAGE_KEY,
     ORDER_PREFS_STORAGE_KEY = storage.metadata.ORDER_PREFS_STORAGE_KEY,
@@ -74,14 +73,6 @@ const _initOrder = () => {
             result.selectedAddress = orderPreferences.selectedAddress;
         }
     }
-    if (!result.selectedShippingMethod) {
-        if (getCachedConfigField('useShipMethodsApi')) {
-            const csDefaultCode = getCachedConfigField('defaultShipMethod');
-            if (csDefaultCode) {
-                result.selectedShippingMethod = {Code: csDefaultCode, PickUpLocation: ''};
-            }
-        }
-    }
 
     return new Order(result);
 };

package/src/shipping/pickupUtil.js

@@ -1,6 +1,7 @@
 import {getCachedConfiguration} from '@nuskin/configuration-sdk';
+import {Order} from '@nuskin/order-model';
 import {RunConfigService} from '@nuskin/ns-util';
-import {OrderManager, CartService, OrderType} from '../shop';
+import {OrderManager, CartService, OrderType, OrderAdapter} from '../shop';
 import axios from 'axios';
 
 let PickupUtil = function() {
@@ -196,7 +197,8 @@ let PickupUtil = function() {
         return same
     }
 
-    function loadShipMethods(order, orderType) {
+    function loadShipMethods() {
+        const order = Order.fromSalesOrderRequest(OrderAdapter.populateSalesOrder('SIMULATE'));
         const {metapackMarket} = getCachedConfiguration('Checkout');
 
         if (metapackMarket) {
@@ -204,8 +206,7 @@ let PickupUtil = function() {
             const payload = {
                 order,
                 orderValue: getOrderValue(),
-                dangerousGoods: CartService.hasDangerousGoods(orderType),
-                weight: CartService.getCartWeight(orderType),
+                dangerousGoods: CartService.hasDangerousGoods(),
                 language: runConfig.language,
                 country: runConfig.country
             };