@nuskin/ns-shop 7.7.0-mdigi-6056.5 → 7.7.0-pa-87.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-shop",
-  "version": "7.7.0-mdigi-6056.5",
+  "version": "7.7.0-pa-87.2",
   "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.20.0",
+    "@nuskin/ns-product-lib": "2.21.0",
     "@nuskin/nuskinjquery": "2.3.1",
     "@nuskin/order-model": "3.1.3",
     "@nuskin/product-lib": "2.4.0",

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

@@ -35,6 +35,7 @@ export default {
     hasEventItems,
     hasPreviewItems,
     hasDangerousGoods,
+    getCartWeight,
     getItemCnt,
     addProductToCart,
     addSkuToCart,
@@ -307,6 +308,14 @@ function hasDangerousGoods(options = {cartItems: true}) {
     return retVal;
 }
 
+function getCartWeight() {
+    let retVal = 0.0;
+    _getCart().getItems({cartItems: true}).forEach((item) => {
+        retVal += item.qty * (item.product.grossWeight || 0.0);
+    });
+    return retVal;
+}
+
 function getItemCnt(options) {
     return _getCart().getItemCnt(options);
 }
@@ -820,6 +829,8 @@ 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/cart/csProductHelper.js

@@ -115,7 +115,32 @@ const convertPricing = (pricing, productData) => {
     }
 }
 
-const createDataFromSkuSearch = (searchData, options) => {
+const checkMaxQuantity = async (status) => {
+    const {Basic: basicCfg} = await getConfiguration(['Basic'])
+    let configMaxes
+
+    try {
+        configMaxes = basicCfg.skuMaxQty
+            .map((cm) => JSON.parse(cm))
+            .reduce((map, cmItem) => {
+                map[cmItem.sku] = cmItem.maxQty;
+                return map;
+            }, {});
+    } catch (err) {
+        console.log('Error parsing skuMaxQty from config', err);
+        configMaxes = {};
+    }
+    status.maxQuantity = status.availableQuantity < 999 ? status.availableQuantity : 999;
+    if (configMaxes && Object.keys(configMaxes).length > 0) {
+        if (Object.hasOwn(configMaxes, status.sku)) {
+            if (configMaxes[status.sku] < status.availableQuantity) {
+                status.maxQuantity = configMaxes[status.sku];
+            }
+        }
+    }
+}
+
+const createDataFromSkuSearch = async (searchData, options) => {
     if (!searchData) {
         return new Product();
     }
@@ -185,6 +210,7 @@ const createDataFromSkuSearch = (searchData, options) => {
             orderType: orderTypes,  // searchData.channels.map((channel) => channel.toLowerCase()),
             childSkus: null // ???
         };
+        await checkMaxQuantity(status);
         convertPricing(pricing, status);
         product.addPricingFromStatus(status);
     }
@@ -199,7 +225,7 @@ const createDataFromSkuSearch = (searchData, options) => {
 
 const handleDetailResponse = async (responseData, options) => {
     let retVal = {success: true},
-        dataForProduct = createDataFromSkuSearch(responseData, options);
+        dataForProduct = await createDataFromSkuSearch(responseData, options);
 
     if (dataForProduct.sku) {
         retVal.product = new Product(dataForProduct);
@@ -268,7 +294,7 @@ const getProductBySku = async (options) => {
 const getProductData = async (options) => {
     const data = await getProductDetail(options);
 
-    return createDataFromSkuSearch(data, options);
+    return await createDataFromSkuSearch(data, options);
 }
 
 export {

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],

package/src/order/order.js

@@ -29,7 +29,6 @@ newShop.Order = function(orderData){
 
     let selectedAddress;
     let selectedShippingMethod;
-    let simulatedShippingMethod = {};
     let shippingAvailableMethods;
     let availableAddressTypes;
     let selectedPayment;
@@ -112,7 +111,6 @@ 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;
@@ -267,7 +265,6 @@ 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;
@@ -474,14 +471,6 @@ 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,12 +1,13 @@
 import $ from '@nuskin/nuskinjquery';
 import {Agelocme, CartService, ShippingAddress, ShopContextService, OrderManager, SalesOrder,
-    PickupUtil, Product, ProductService, ExternalPaymentService, ProcessorCode} from "../shop.js";
+    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 { storage } from "@nuskin/ns-util";
+import PickupUtil from '../shipping/pickupUtil';
+import {Order} from '@nuskin/order-model';
+import {storage} from "@nuskin/ns-util";
 
 let splitLineItems = [];
 const utmInfo = storage.getItem(storage.metadata.UTM_INFO) || {};
@@ -170,12 +171,16 @@ const getDefaultShipCode = (osmc) => {
     if (useShipMethodsApi) {
         const csDefaultCode = getCachedConfigField('defaultShipMethod');
         const shipMethods = PickupUtil.getStoredShipMethods();
-        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;
+        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;
+            }
         } else {
-            defaultCode = defaultShipMethod.Code;
+            defaultCode = csDefaultCode;
         }
     }
 
@@ -501,7 +506,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';
     }
@@ -650,6 +655,10 @@ 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) {
@@ -1120,6 +1129,18 @@ const populateSalesOrder = (action, adr) => {
     return salesOrder;
 };
 
+const getShipMethods = async (salesOrderDetail) => {
+    let shipMethods;
+    const useShipMethodsApi = getCachedConfigField('useShipMethodsApi');
+    if (useShipMethodsApi) {
+        await PickupUtil.loadShipMethods(Order.fromSalesOrderRequest(populateSalesOrder('SIMULATE')));
+        shipMethods = await PickupUtil.getShipMethods();
+    } else {
+        shipMethods = salesOrderDetail.ShippingAvailableMethods
+    }
+    return shipMethods
+}
+
 /**
  * Maps Sales order detail object to the order object
  * @param {Object} salesOrderDetail
@@ -1139,14 +1160,12 @@ 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 = useShipMethodsApi ? await pickupUtil.getShipMethods() : salesOrderDetail.ShippingAvailableMethods;
+        const shipMethods = await getShipMethods(salesOrderDetail);
         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);
@@ -1156,7 +1175,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);
         }
     }
@@ -1166,7 +1185,6 @@ 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,6 +5,7 @@ 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,
@@ -73,6 +74,14 @@ 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,7 +1,6 @@
 import {getCachedConfiguration} from '@nuskin/configuration-sdk';
-import {Order} from '@nuskin/order-model';
 import {RunConfigService} from '@nuskin/ns-util';
-import {OrderManager, CartService, OrderType, OrderAdapter} from '../shop';
+import {OrderManager, CartService, OrderType} from '../shop';
 import axios from 'axios';
 
 let PickupUtil = function() {
@@ -197,8 +196,7 @@ let PickupUtil = function() {
         return same
     }
 
-    function loadShipMethods() {
-        const order = Order.fromSalesOrderRequest(OrderAdapter.populateSalesOrder('SIMULATE'));
+    function loadShipMethods(order) {
         const {metapackMarket} = getCachedConfiguration('Checkout');
 
         if (metapackMarket) {
@@ -207,6 +205,7 @@ let PickupUtil = function() {
                 order,
                 orderValue: getOrderValue(),
                 dangerousGoods: CartService.hasDangerousGoods(),
+                weight: CartService.getCartWeight(),
                 language: runConfig.language,
                 country: runConfig.country
             };