@nuskin/ns-shop 7.9.0-6056-insider.1 → 7.9.0-mdigi-6056.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-shop",
-  "version": "7.9.0-6056-insider.1",
+  "version": "7.9.0-mdigi-6056.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.22.0-mdigi-6056.1",
     "@nuskin/nuskinjquery": "2.3.1",
     "@nuskin/order-model": "3.1.3",
     "@nuskin/product-lib": "2.4.0",

package/src/cart/cart.js

@@ -281,6 +281,8 @@ export default function Cart(cartData) {
             if (cartItem.isAgelocme()) {
                 product.agelocme = cartItem.product.agelocme;
             }
+            const eventNames = cartItem.product.eventName ? [cartItem.product.eventName] : null;
+            product.setPriceAndPvFromType(cartItem.product.priceType, eventNames);
             cartItem.product = product;
             publish(events.shop.CART_UPDATED, {
                 modify: {

package/src/cart/cartItem.js

@@ -377,7 +377,7 @@ export default function CartItem(cartItemData) {
         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.taxonomy = this.product.categories?.[0]?.displayName || 'Nu Skin';
         retVal.salesPrice = AccountManager.isLoggedIn()? this.salesPrice() : null;
         retVal.unitPrice = AccountManager.isLoggedIn()? this.unitPrice() : null;
 

package/src/cart/cartService.js

@@ -320,7 +320,7 @@ function getCartWeight(orderType) {
     let retVal = 0.0;
 
     _getItemsByOrderType(orderType).forEach((item) => {
-        retVal += item.qty * (item.product.grossWeight || 0.0);
+        retVal += Math.round((item.qty * (item.product.grossWeight || 0.0) * 1000)) / 1000;
     });
     return retVal;
 }
@@ -762,7 +762,13 @@ async function checkProductLanguages() {
     const promises = [];
     const changeditems = []
     _getCart().getItems({cartItems: true}).forEach((cartItem) => {
-        if (runConfig.language !== cartItem.product.lang) {
+        // if there is no language (lang) set on the product this is a variant and variants
+        // do not have this set. It likely has the correct language used for product data.
+        if (!cartItem.product.lang) {
+            cartItem.product.lang = runConfig.language;
+            promises.push(Promise.resolve({product: cartItem.product}));
+            changeditems.push(cartItem);
+        } else if (runConfig.language !== cartItem.product.lang) {
             promises.push(ProductService.getProductBySku({
                 cntryCd: runConfig.country,
                 language: runConfig.language,

package/src/order/orderAdapter.js

@@ -503,7 +503,8 @@ const populateCategory = (salesOrder) => {
     } else if (util.getSponsorId()) {
         // affiliates don't use a subdomain.  So if we have a sponsor and it isn't a pitch then we consider it a storefront
         salesOrder.Category = "STOREFRONT";
-    } else if (utmMedium && utmMedium.toLowerCase().includes('paidsearch')) {
+    } else if (utmMedium &&
+        (utmMedium.toLowerCase().includes('cpc') || utmMedium.toLowerCase().includes('paidsearch'))) {
         salesOrder.Category = 'PAIDSEARCH';
     } else if (utmMedium && utmMedium.toLowerCase().includes('paidsocial')) {
         salesOrder.Category = 'PAIDAD';

package/src/shipping/pickupUtil.js

@@ -186,9 +186,11 @@ let PickupUtil = function() {
             const storedShipData = getShipToData(storedPayload.order);
             same = payload.country === storedPayload.country &&
                 payload.dangerousGoods === storedPayload.dangerousGoods &&
+                payload.weight === storedPayload.weight &&
                 shipData.country === storedShipData.country &&
                 shipData.postalCode === storedShipData.postalCode &&
                 shipData.line1 === storedShipData.line1 &&
+                shipData.line2 === storedShipData.line2 &&
                 shipData.city === storedShipData.city
         }
         return same