@nuskin/ns-shop 7.0.11-pur-813.2 → 7.0.11-pur-813.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-shop",
-  "version": "7.0.11-pur-813.2",
+  "version": "7.0.11-pur-813.3",
   "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.7",
     "@nuskin/ns-feature-flags": "1.4.7",
     "@nuskin/ns-loyalty-web": "1.5.6",
-    "@nuskin/ns-product-lib": "2.19.1-pur-816.1",
+    "@nuskin/ns-product-lib": "2.19.1",
     "@nuskin/nuskinjquery": "2.3.1",
     "@nuskin/order-model": "3.1.3",
     "@nuskin/product-lib": "2.2.1",

package/src/cart/cartService.js

@@ -34,6 +34,7 @@ export default {
     hasItems,
     hasEventItems,
     hasPreviewItems,
+    hasDanerousGoods,
     getItemCnt,
     addProductToCart,
     addSkuToCart,
@@ -298,6 +299,14 @@ function hasPreviewItems() {
     return _getCart().hasPreviewItems();
 }
 
+function hasDanerousGoods(options = {cartOrderItems: true}) {
+    let retVal = false;
+    _getCart().getItems(options).forEach((item) => {
+        retVal = retVal || item.product.dangerousGoods;
+    });
+    return retVal;
+}
+
 function getItemCnt(options) {
     return _getCart().getItemCnt(options);
 }

package/src/cart/csProductHelper.js

@@ -9,6 +9,7 @@ const extractProductData = (data, sku) => {
 
     if (Array.isArray(data.variants) && data.variants.length > 0) {
         retVal = data.variants.find((variant) => variant.sku === sku);
+        retVal.variantSelectLabel = data.variantSelectLabel;
     } else if (data.bundle) {
         retVal = data.bundle;
         retVal.title = data.title;
@@ -118,26 +119,56 @@ const createDataFromSkuSearch = (searchData, options) => {
     if (!searchData) {
         return new Product();
     }
-    let product = new Product(),
-        langObj = null, //getLangObj(searchData['contents']['language'], options.language),
-        marketObj = null; //searchData['market'];
-    // if (Array.isArray(marketObj)) {
-    //     marketObj = getMarketObj(searchData['market'], options.country);
-    // }
-    let {orderType: mktOrderTypes, custType: mktCustTypes, restrictedMarket: restrictedMarkets, addOns} = {}; //marketObj;
+    let product = new Product();
 
     if (searchData) {
         product.sku = options.sku;
+        product.country = options.country;
         product.lang = options.language;
         product.isExclusive = searchData.isExclusive;
         if (Array.isArray(searchData.productImages) && searchData.productImages.length > 0) {
             product.setFullImage(searchData.productImages[0].url);
             product.setThumbnail(searchData.productImages[0].thumbnail);
+            product.setImageAltText(searchData.productImages[0].altText);
             // product.setProductCarouselImages(???searchData.contents.imageCarousel);
         }
         // product.productLabels = ???
         product.title = searchData.title;
         product.shortDescr = searchData.description;
+        // product.longDescr = langObj['longDescription']; looks like it is deprecated
+        product.dangerousGoods = searchData.dangerousGoods === true;
+        product.ingredients = searchData.ingredients;
+        product.benefits = searchData.benefits;
+        product.usage = searchData.usage;
+        product.resources = searchData.resources;
+        // product.videos = searchData.???;
+        // product.contentSection =searchData.???;
+        // product.sizeWeight = ???;
+        product.size = searchData.size;
+        product.nettoWeight = searchData.nettoWeight;
+        product.salesLabel = searchData.salesLabel;
+        // product.movie = searchData.???;
+        // product.youtube = searchData.???;
+        product.salesEventText = searchData.salesText;
+        product.scanQualified = searchData.scanQualifiedCount;
+        // product.division = searchData.???
+        product.custTypes = Array.isArray(searchData.customerTypes) && searchData.customerTypes.map((ct) => {
+            if (ct === 'Preferred') return '30';
+            else if (ct === 'Retail') return '20';
+            else if (ct === '') return '10';
+        });
+        product.restrictedMarkets = searchData.restrictedMarkets;
+        // if (addOns) {
+        //     product.addOns = addOns;
+        // } else {
+        //     product.addOns = [];
+        // }
+        if (options.isGroupOffer) product.isGroupOffer = options.isGroupOffer;
+        if (options.isPersonalOffer) product.isPersonalOffer = options.isPersonalOffer;
+
+        product.variantsLabel = searchData.variantLabel;
+        product.variantDropdownLabel = searchData.variantSelectLabel;
+        product.shade = searchData.variantColor;
 
         const pricing = JSON.parse(searchData.pricingJson);
         const orderTypes = [];
@@ -158,92 +189,10 @@ const createDataFromSkuSearch = (searchData, options) => {
         product.addPricingFromStatus(status);
     }
 
-
-    if (marketObj !== null) {
-        // product.sku = searchData.sku;
-        // product.isExclusive = Object.hasOwn(searchData, 'isExclusive') ? searchData.isExclusive : false;
-        if (Object.hasOwn(searchData, 'contents')) {
-            // product.setFullImage(searchData.contents.fullImage);
-            // product.setThumbnail(searchData.contents.fullImage.replace(/\.img\.[0-9]+\.[0-9]+\.png/i, '.img.160.160.png'));
-            // if (Object.hasOwn(searchData.contents, 'imageCarousel')) {
-            //     product.setProductCarouselImages(searchData.contents.imageCarousel);
-            // }
-        }
-        // AEM-8320 - it returns two BP (08007070 and 08129080), 08129080 does not have any translation yet.
-        // Note that langObj can be null (have a BP that does not have any translation)
-
-        // product.productLabels = marketObj['populateProductLabels'];
-        if (langObj) {
-            // product.lang = langObj['languageCode'];
-            // product.title = langObj['name'];
-            // product.shortDescr = langObj['shortDescription'];
-            product.longDescr = langObj['longDescription'];
-            product.ingredients = langObj['ingredients'];
-            product.benefits = langObj['benefits'];
-            product.usage = langObj['usage'];
-            product.resources = langObj['resources'];
-            product.videos = langObj['videos'];
-            product.contentSection = langObj['contentSection'];
-            product.sizeWeight = langObj['size_weight'];
-            product.nettoWeight = langObj['netto_weight'];
-            product.salesLabel = langObj['salesLabel'];
-            product.movie = langObj['movie'];
-            product.youtube = langObj['youtube'];
-            product.salesEventText = langObj['tdc_salesEventText'];
-            if (langObj.variantInfo) {
-                if (langObj.variantInfo.tdc_dropdownLabel) {
-                    product.variantDropdownLabel = langObj.variantInfo.tdc_dropdownLabel
-                }
-                if (langObj.variantInfo.tdc_dropdownPlaceholder) {
-                    product.variantDropdownPlaceholder = langObj.variantInfo.tdc_dropdownPlaceholder;
-                }
-                if (langObj.variantInfo.tdc_variantsLabel) {
-                    product.variantsLabel = langObj.variantInfo.tdc_variantsLabel;
-                }
-            }
-        }
-        product.setImageAltText(searchData['contents']['altText']);
-        product.country = marketObj['countryCode'];
-        product.scanQualified = marketObj['scanQualified'];
-        product.division = searchData['division'];
-
-        if (mktOrderTypes) {
-            product.orderTypes = mktOrderTypes;
-        }
-        if (mktCustTypes) {
-            product.custTypes = mktCustTypes;
-        }
-        if (restrictedMarkets) {
-            product.restrictedMarkets = restrictedMarkets;
-        }
-        if (addOns) {
-            product.addOns = addOns;
-        } else {
-            product.addOns = [];
-        }
-
-        if (options.isGroupOffer)
-            product.isGroupOffer = options.isGroupOffer;
-        if (options.isPersonalOffer)
-            product.isPersonalOffer = options.isPersonalOffer;
-    }
-
-    if (searchData.variantConfig) {
-        if (searchData.variantConfig.variantType) {
-            product.variantType = searchData.variantConfig.variantType;
-        }
-        if (searchData.variantConfig.variants) {
-            searchData.variantConfig.variants.forEach((variant) => {
-                product.setVariant(createDataFromSkuSearch(variant, options));
-            });
-        }
-        if (searchData.variantConfig.swatchColor) {
-            product.shade = searchData.variantConfig.swatchColor;
-        }
-        if (searchData.variantConfig.baseSku) {
-            product.baseSku = searchData.variantConfig.baseSku;
-        }
-    }
+    // Note: this mapping was originally created for the product data in AEM. This product
+    // data comes from content stack and is not identical to what is in AEM. There may
+    // need to be some tweaks in here. ESPECIALLY when the data gets moved to the
+    // bundle field (vs variants) in the product data.
 
     return product;
 }

package/src/shipping/pickupUtil.js

@@ -1,10 +1,8 @@
-import OrderAdapter from '../order/orderAdapter';
 import {getCachedConfiguration} from '@nuskin/configuration-sdk';
 import {Order} from '@nuskin/order-model';
 import {RunConfigService} from '@nuskin/ns-util';
-// import {CartService} from '@nuskin/ns-shop';
+import {OrderManager, CartService, OrderType, OrderAdapter} from '../shop';
 import axios from 'axios';
-import { OrderManager } from '../shop';
 
 let PickupUtil = function() {
     'use strict';
@@ -142,6 +140,20 @@ let PickupUtil = function() {
         return markers;
     }
 
+    function getOrderValue() {
+        let value = 0;
+        const orderType = OrderManager.getOrder().orderType;
+        const cartInfo = CartService.getCartInfo();
+
+        if (orderType === OrderType.SINGLE_ORDER) {
+            value = cartInfo.totalOrderPrice;
+        } else {
+            value = cartInfo.totalOrderPrice + cartInfo.totalAdrPrice;
+        }
+
+        return value;
+    }
+
     function getUrl() {
         switch (RunConfigService.getEnvironmentCode()) {
             case 'dev':
@@ -164,7 +176,6 @@ let PickupUtil = function() {
         const {metapackMarket, metapackZipExclusions} = getCachedConfiguration('Checkout');
 
         if (metapackMarket) {
-            const order = OrderManager.getOrder();
             let includePickupPoints = true;
             for (const zipRegEx of metapackZipExclusions || []) {
                 const regEx = new RegExp(zipRegEx);
@@ -176,7 +187,8 @@ let PickupUtil = function() {
                 {
                     order,
                     pudo: includePickupPoints,
-                    orderValue: order && order.orderTotals && order.orderTotals.grandTotal || 0.0
+                    orderValue: getOrderValue(),
+                    dangerousGoods: CartService.hasDangerousGoods()
                 },
                 {
                     headers: {