@nuskin/ns-product-lib 2.7.0-cx24-3682.26 → 2.7.0-cx24-3702.5

package/src/product.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const { isTrue }  = require("@nuskin/ns-common-lib");
+const { isTrue } = require("@nuskin/ns-common-lib");
 
 const ProductUtils = require("./productUtils.js");
 
@@ -8,7 +8,7 @@ const Agelocme = require("./agelocme.js");
 const PriceType = require("./models/priceType.js");
 const ProductStatus = require("./models/productStatus.js");
 
-const Product = function(productData) {
+const Product = function (productData) {
   this.priceMap = {};
   this.pvMap = {};
   this.cvMap = {};
@@ -75,22 +75,16 @@ const Product = function(productData) {
   //equinox inventory / stock label
   //@example "IN STOCK"
   this.inventory = "";
-  
-  // equinox specific properties
   this.equinoxProductId = "";
-  this.equinox = {
-    sku: {
-      exists: true
-    }
-  };
+  this.properties = {};
 
-  this.setMarketAttributes = function(productStatus) {
+  this.setMarketAttributes = function (productStatus) {
     if (productStatus.marketAttributes) {
       this.marketAttributes = productStatus.marketAttributes;
     }
   };
 
-  this.getAgelocmeKeyPart = function() {
+  this.getAgelocmeKeyPart = function () {
     let keyPart = null;
     if (this.agelocme) {
       keyPart =
@@ -104,27 +98,27 @@ const Product = function(productData) {
     return keyPart;
   };
 
-  this.getHighlightedSku = function() {
+  this.getHighlightedSku = function () {
     let rv = this.sku;
     if (this.highlightedSku) rv = this.highlightedSku;
     return rv;
   };
 
-  this.getProductSearchTitle = function() {
+  this.getProductSearchTitle = function () {
     if (this.agelocme && this.agelocme.label) {
       return this.agelocme.label;
     }
     return this.title;
   };
 
-  this.getProductSearchSku = function() {
+  this.getProductSearchSku = function () {
     if (this.agelocme && this.agelocme.code) {
       return this.agelocme.code;
     }
     return this.getHighlightedSku();
   };
 
-  this.getDescription = function() {
+  this.getDescription = function () {
     let description = this.longDescr;
     if (!description || description.length === 0) {
       return this.shortDescr;
@@ -132,7 +126,7 @@ const Product = function(productData) {
     return description;
   };
 
-  this.setFullImage = function(fullImage) {
+  this.setFullImage = function (fullImage) {
     if (fullImage) {
       this.fullImage = fullImage.replace("http:", "https:");
     } else {
@@ -140,19 +134,19 @@ const Product = function(productData) {
     }
   };
 
-  this.getFullImage = function() {
+  this.getFullImage = function () {
     return this.fullImage ? this.fullImage.replace("http:", "https:") : "";
   };
 
-  this.setProductCarouselImages = function(productCarouselImages) {
+  this.setProductCarouselImages = function (productCarouselImages) {
     this.productCarouselImages = productCarouselImages;
   };
 
-  this.getProductCarouselImages = function() {
+  this.getProductCarouselImages = function () {
     return this.productCarouselImages;
   };
 
-  this.setImageAltText = function(altText) {
+  this.setImageAltText = function (altText) {
     if (altText) {
       this.imageAltText = altText;
     } else {
@@ -160,11 +154,11 @@ const Product = function(productData) {
     }
   };
 
-  this.getImageAltText = function() {
+  this.getImageAltText = function () {
     return this.imageAltText || this.title;
   };
 
-  this.setThumbnail = function(thumbnail) {
+  this.setThumbnail = function (thumbnail) {
     if (thumbnail) {
       this.thumbnail = thumbnail.replace("http:", "https:");
     } else {
@@ -172,7 +166,11 @@ const Product = function(productData) {
     }
   };
 
-  this.setThumbnailFromSku = function(sku) {
+  this.setEquinoxProductId = function (equinoxProductId) {
+    return this.equinoxProductId = equinoxProductId;
+  }
+
+  this.setThumbnailFromSku = function (sku) {
     // WARNING: Base URL will need to be handled in the client (call setBaseUrl)
     // eslint-disable-next-line max-len
     // this.thumbnail = `${RunConfigService.getBaseUrl()}/content/products/${ProductUtils.getTokenizedSku(sku)}/jcr:content/fullImage.img.100.100.png`;
@@ -182,43 +180,43 @@ const Product = function(productData) {
     )}/jcr:content/fullImage.img.100.100.png`;
   };
 
-  this.getThumbnail = function() {
+  this.getThumbnail = function () {
     return this.thumbnail ? this.thumbnail.replace("http:", "https:") : "";
   };
 
-  this.hasAvailableQuantity = function(qty = 1) {
+  this.hasAvailableQuantity = function (qty = 1) {
     return Math.min(this.maxQuantity, this.availableQuantity) >= qty;
   };
 
-  this.setPoints = function(points) {
+  this.setPoints = function (points) {
     this.points = ensureFloatVal(points) || "";
   };
 
-  this.getPointsFixed = function() {
+  this.getPointsFixed = function () {
     return parseFloat(this.points).toFixed(2);
   };
 
-  this.setCv = function(cv) {
+  this.setCv = function (cv) {
     this.cv = ensureFloatVal(cv) || "";
   };
 
-  this.getCvFixed = function() {
+  this.getCvFixed = function () {
     return parseFloat(this.cv).toFixed(2);
   };
 
-  this.setPv = function(pv) {
+  this.setPv = function (pv) {
     this.pv = ensureFloatVal(pv) || "";
   };
 
-  this.getPvFixed = function() {
+  this.getPvFixed = function () {
     return parseFloat(this.pv || 0).toFixed(2);
   };
 
-  this.setPrice = function(price) {
+  this.setPrice = function (price) {
     this.price = ensureFloatVal(price, true);
   };
 
-  this.setFormattedPrice = function(formattedPrice) {
+  this.setFormattedPrice = function (formattedPrice) {
     this.formattedPrice = formattedPrice;
   };
 
@@ -227,13 +225,13 @@ const Product = function(productData) {
    * added to the cart the event pricing needs to be remembered if toggling between
    * pricetypes with event pricing and pricetype without event pricing
    */
-  this.lockEventName = function() {
+  this.lockEventName = function () {
     if (!this.savedEventName && this.eventName) {
       this.savedEventName = this.eventName;
     }
   };
 
-  this.setPriceAndPvFromType = function(_priceType, _activeEvents = null, option = {}) {
+  this.setPriceAndPvFromType = function (_priceType, _activeEvents = null, option = {}) {
     // WARNING: priceType needs to be handled client-side
     // const priceType = ConfigService.getMarketConfig().showWholeSalePricing && !AccountManager.isLoggedIn()
     //     ? PriceType.WWHL
@@ -278,11 +276,11 @@ const Product = function(productData) {
     return changed;
   };
 
-  this.getPrice = function() {
+  this.getPrice = function () {
     return this.price ? this.price : 0;
   };
 
-  this.getPriceFixed = function() {
+  this.getPriceFixed = function () {
     if (typeof this.price === "number") {
       return parseFloat(this.price.toFixed(2));
     } else {
@@ -290,15 +288,15 @@ const Product = function(productData) {
     }
   };
 
-  this.getOriginalPrice = function() {
+  this.getOriginalPrice = function () {
     return this.priceType ? this.priceMap[this.priceType] : null;
   };
 
-  this.addPricing = function(type, price) {
+  this.addPricing = function (type, price) {
     this.priceMap[type] = price;
   };
 
-  this.addPricingFromStatus = function(productStatus, priceType, option ={}) {
+  this.addPricingFromStatus = function (productStatus, priceType, option = {}) {
     let modified = false;
 
     if (!priceType) {
@@ -333,7 +331,7 @@ const Product = function(productData) {
         }, this);
       }
       this.orderTypes = ProductUtils.mergeOrderTypes(this.orderTypes, productStatus.orderType);
-      if(productStatus.childSkus) {
+      if (productStatus.childSkus) {
         this.childSkus = productStatus.childSkus;
       }
       this.setPriceAndPvFromType(priceType, null, option);
@@ -353,15 +351,15 @@ const Product = function(productData) {
     return modified;
   };
 
-  this.addPvWithType = function(type, pv) {
+  this.addPvWithType = function (type, pv) {
     this.pvMap[type] = pv;
   };
 
-  this.addCvWithType = function(type, cv) {
+  this.addCvWithType = function (type, cv) {
     this.cvMap[type] = cv;
   };
 
-  this.getPricing = function(type) {
+  this.getPricing = function (type) {
     let retVal = null;
 
     if (type) {
@@ -388,7 +386,7 @@ const Product = function(productData) {
     return eventPriceTypes;
   };
 
-  this.getPvWithType = function(type) {
+  this.getPvWithType = function (type) {
     let rv = this.pvMap[type];
     if (rv == null) {
       // Assumption: we always have WWHL from the service
@@ -398,7 +396,7 @@ const Product = function(productData) {
     return rv;
   };
 
-  this.getCvWithType = function(type) {
+  this.getCvWithType = function (type) {
     let rv = this.cvMap[type];
     if (rv == null) {
       rv = this.cvMap[PriceType.WWHL];
@@ -406,77 +404,77 @@ const Product = function(productData) {
     return rv;
   };
 
-  this.hasAdrOption = function() {
+  this.hasAdrOption = function () {
     return this.orderTypes["adr"];
   };
 
-  this.isAdrOnly = function() {
+  this.isAdrOnly = function () {
     return this.hasAdrOption() && !this.hasOrderOption();
   };
 
-  this.hasMultipleOrderTypes = function() {
+  this.hasMultipleOrderTypes = function () {
     return this.hasOrderOption() && this.hasAdrOption();
   };
 
-  this.hasOrderOption = function() {
+  this.hasOrderOption = function () {
     return this.orderTypes["order"];
   };
 
-  this.isDistributor = function() {
+  this.isDistributor = function () {
     return this.custTypes.includes("10");
   };
 
-  this.isCustomer = function() {
+  this.isCustomer = function () {
     return this.custTypes.includes("20");
   };
 
-  this.isPreferredCustomer = function() {
+  this.isPreferredCustomer = function () {
     return this.custTypes.includes("30");
   };
 
-  this.isBase = function() {
+  this.isBase = function () {
     return this.sku.substring(2, 4) === "55";
   };
 
-  this.isVariant = function() {
+  this.isVariant = function () {
     return this.baseSku.length > 0 && this.variantSkus().length === 0;
   };
 
-  this.setVariant = function(variantProduct) {
+  this.setVariant = function (variantProduct) {
     if (variantProduct && variantProduct.sku) {
       this.variants[variantProduct.sku] = variantProduct;
     }
   };
 
-  this.getVariant = function(sku) {
+  this.getVariant = function (sku) {
     return this.variants[sku];
   };
 
-  this.variantSkus = function() {
+  this.variantSkus = function () {
     return Object.keys(this.variants);
   };
 
-  this.getVariantsList = function() {
+  this.getVariantsList = function () {
     return Object.values(this.variants);
   };
 
-  this.getMinPrice = function() {
+  this.getMinPrice = function () {
     return this.priceMap[`min-${this.priceType}`];
   };
 
-  this.getMaxPrice = function() {
+  this.getMaxPrice = function () {
     return this.priceMap[`max-${this.priceType}`];
   };
 
-  this.getMinPv = function() {
+  this.getMinPv = function () {
     return this.pvMap[`min-${this.priceType}`];
   };
 
-  this.getMaxPv = function() {
+  this.getMaxPv = function () {
     return this.pvMap[`max-${this.priceType}`];
   };
 
-  this.toJSON = function() {
+  this.toJSON = function () {
     let retData = {};
     retData.sku = this.sku;
     retData.globalProductID = this.globalProductID;
@@ -541,20 +539,16 @@ const Product = function(productData) {
     retData.addOns = this.addOns;
     retData.inventory = this.inventory;
     retData.equinoxProductId = this.equinoxProductId;
-    retData.equinox = {
-      sku: {
-        exists: this.equinox.sku.exists
-      }
-    };
+    retData.properties = this.properties;
 
     return retData;
   };
 
-  this.setMeCommerceProductData = function(/*productData*/) {
+  this.setMeCommerceProductData = function (/*productData*/) {
     console.error("setMeCommerceProductData is deprecated!");
   };
 
-  this.setBaseUrl = function(baseUrl) {
+  this.setBaseUrl = function (baseUrl) {
     this.thumbnail = ProductUtils.applyBaseUrl(this.thumbnail, baseUrl);
     this.fullImage = ProductUtils.applyBaseUrl(this.fullImage, baseUrl);
 
@@ -566,7 +560,7 @@ const Product = function(productData) {
     }
   };
 
-  this.setProductData = function(productData) {
+  this.setProductData = function (productData) {
     let data;
 
     if (productData) {
@@ -674,7 +668,7 @@ const Product = function(productData) {
           ? data.pvMap
           : this.pvMap;
       this.orderTypes = ProductUtils.mergeOrderTypes(this.orderTypes, data.orderTypes);
-      if(data.childSkus) {
+      if (data.childSkus) {
         this.childSkus = data.childSkus;
       }
       this.custTypes = data.custTypes || [];
@@ -687,18 +681,11 @@ const Product = function(productData) {
       }
 
       this.equinoxProductId = data.equinoxProductId;
-
-      if (data.equinox && data.equinox.sku) {
-        this.equinox = {
-          sku: {
-            exists: data.equinox.sku.exists
-          }
-        };
-      }
+      this.properties = data.properties;
     }
   };
 
-  this.isEmpty = function() {
+  this.isEmpty = function () {
     return (
       isFieldEmpty(this.sku) &&
       isFieldEmpty(this.title) &&

package/src/productData.js

@@ -6,7 +6,6 @@ const Product = require("./product");
 const CustomerTypes = require('./models/customerTypes');
 const ProductStatus = require("./models/productStatus");
 const { mapAvailableQuantity, mapChildSKU } = require('./equinox-helpers');
-const { productNotFoundInterceptor } = require('./equinox-helpers/interceptors');
 
 const productTypes = {
   kit: 'kit'
@@ -67,11 +66,9 @@ const ProductData = {
     }
 
     const filter = skuFilter.join(" OR ")
-    //axios.defaults.withCredentials = true;
 
     const url = `${config.API_Base_URLs}/orchestrationservices/storefront/catalogs/search/`;
     const href = `${url}?filter='\\\\''${encodeURI(filter)}'\\''`;
-    axios.interceptors.response.use((res) => res, productNotFoundInterceptor);
     const response = await axios.request({
       method: 'get',
       url: href,
@@ -84,7 +81,6 @@ const ProductData = {
       withCredentials: true
     });
 
-    axios.interceptors.response.eject(productNotFoundInterceptor);
     return response;
   },
 
@@ -136,9 +132,11 @@ const ProductData = {
     let thumbnailImage = imageURL ? imageURL + '?width=40' : ''
 
 
-    const { eventName, eventLabels, computedPrice, defaultProductPrice } = this.getEqProductPromotions(eqVariant);
+    const { eventName, eventLabels, computedPrice, defaultProductPrice, CVPrice, PVPrice } = this.getEqProductPromotions(eqVariant);
     const productPrice = eventName ? defaultProductPrice : eqVariant.priceFacets["Regular Price"];
     const discountedPrice = eventName ? computedPrice : eqVariant.priceFacets["Regular Price"];
+    const productCVPrice = eventName ? CVPrice : eqVariant.priceFacets.CV;
+    const productPVPrice = eventName ? PVPrice : eqVariant.priceFacets.PV;
 
     return {
       "sku": eqVariant.identifier,
@@ -245,8 +243,8 @@ const ProductData = {
       "availableQuantity": eqVariant.inventoryProperties.atpQty,
       "maxQuantity": 999,
       "points": "",
-      "cv": (eqVariant.priceFacets.CV) ? eqVariant.priceFacets.CV : '',
-      "pv": eqVariant.priceFacets.PV,
+      "cv": productCVPrice,
+      "pv": productPVPrice,
       "priceType": "WRTL",
       "price": discountedPrice,
       "priceMap": {
@@ -259,14 +257,14 @@ const ProductData = {
         "WHL": eqVariant.priceFacets["Wholesale Price"]
       },
       "cvMap": {
-        "WWHL": (eqVariant.priceFacets.CV) ? eqVariant.priceFacets.CV : '',
-        "WADW": (eqVariant.priceFacets.CV) ? eqVariant.priceFacets.CV : '',
-        "WHL": (eqVariant.priceFacets.CV) ? eqVariant.priceFacets.CV : ''
+        "WWHL": productCVPrice,
+        "WADW": productCVPrice,
+        "WHL": productCVPrice
       },
       "pvMap": {
-        "WWHL": eqVariant.priceFacets.PV,
-        "WADW": eqVariant.priceFacets.PV,
-        "WHL": eqVariant.priceFacets.PV
+        "WWHL": productPVPrice,
+        "WADW": productPVPrice,
+        "WHL": productPVPrice
       },
       "orderTypes": this._setOrderType(eqVariant.properties),
       "custTypes": this.switchCustType(eqVariant.properties.customerTypes),
@@ -278,7 +276,7 @@ const ProductData = {
       "flavor": "",
       "size": eqVariant.properties.size,
       "shade": "",
-      "status": this.switchStatusFromEquinox(eqVariant.properties.status),
+      "status": this.switchStatusFromEquinox(eqVariant.properties.productStatus),
       "variantType": "Other",
       "variantDropdownLabel": eqVariant.properties.variantLabel || "",
       "variantDropdownPlaceholder": "Select Type",
@@ -299,7 +297,8 @@ const ProductData = {
       },
       "restrictedMarkets": [],
       "addOns": [],
-      "equinoxProductId": eqVariant.identifier
+      "equinoxProductId": eqVariant.identifier,
+      "properties": eqVariant.properties
     };
   },
 
@@ -323,6 +322,16 @@ const ProductData = {
     const computedPrice = product.totalValue && product.totalValue.priceAfterDiscount
       ? product.totalValue.priceAfterDiscount
       : 0;
+
+    let CVPrice = 0,
+      PVPrice = 0;
+
+    if (product.totalValue && product.totalValue.priceFacets) {
+      const productPriceFacets = product.totalValue.priceFacets;
+      CVPrice = productPriceFacets.CV && productPriceFacets.CV.CVAfterDiscount ? productPriceFacets.CV.CVAfterDiscount : 0;
+      PVPrice = productPriceFacets.PV && productPriceFacets.PV.PVAfterDiscount ? productPriceFacets.PV.PVAfterDiscount : 0;
+    }
+
     let eventName = "";
     const eventLabels = [];
 
@@ -336,17 +345,19 @@ const ProductData = {
       eventLabels: eventLabels.join(','),
       defaultProductPrice,
       computedPrice,
-      eventName
+      eventName,
+      CVPrice,
+      PVPrice
     }
   },
 
   eqProductMapper: async function (productDataResponse, skus) {
     let count = 0;
-    let variants = {};
     const products = [];
 
     for (const productData of productDataResponse) {
       try {
+        let variants = {};
         let product = (productData.type && productData.type === "kit") ? productData : productData.sku[count];
         let imageURL = product.properties.imageURL ? product.properties.imageURL : '';
         let thumbnailImage = imageURL ? imageURL + '?width=40' : ''
@@ -364,10 +375,14 @@ const ProductData = {
           eventName,
           eventLabels,
           computedPrice,
-          defaultProductPrice
+          defaultProductPrice,
+          CVPrice,
+          PVPrice
         } = this.getEqProductPromotions(product);
         const productPrice = eventName ? defaultProductPrice : product.priceFacets["Regular Price"];
         const discountedPrice = eventName ? computedPrice : product.priceFacets["Regular Price"];
+        const productCVPrice = eventName ? CVPrice : product.priceFacets.CV;
+        const productPVPrice = eventName ? PVPrice : product.priceFacets.PV;
 
         product.childSkus = await this.fetchChildSkus(product);
         product.availableQuantity = mapAvailableQuantity(product);
@@ -406,8 +421,8 @@ const ProductData = {
           "scanQualified": productData.properties.scanQualifiedCount,
           "maxQuantity": 999,
           "points": "",
-          "cv": (product.priceFacets.CV) ? product.priceFacets.CV : '',
-          "pv": product.priceFacets.PV,
+          "cv": productCVPrice,
+          "pv": productPVPrice,
           "priceType": "WRTL",
           "price": discountedPrice,
           "priceMap": {
@@ -420,14 +435,14 @@ const ProductData = {
             "WWHL": product.priceFacets["Wholesale Price"]
           },
           "cvMap": {
-            "WWHL": (product.priceFacets.CV) ? product.priceFacets.CV : '',
-            "WADW": (product.priceFacets.CV) ? product.priceFacets.CV : '',
-            "WHL": (product.priceFacets.CV) ? product.priceFacets.CV : ''
+            "WWHL": productCVPrice,
+            "WADW": productCVPrice,
+            "WHL": productCVPrice
           },
           "pvMap": {
-            "WWHL": product.priceFacets.PV,
-            "WADW": product.priceFacets.PV,
-            "WHL": product.priceFacets.PV
+            "WWHL": productPVPrice,
+            "WADW": productPVPrice,
+            "WHL": productPVPrice
           },
           "orderTypes": this._setOrderType(product.properties),
           "custTypes": this.switchCustType(product.properties.customerTypes),
@@ -443,7 +458,7 @@ const ProductData = {
           "variantType": "Other",
           "variantDropdownLabel": product.properties.variantLabel || "",
           "variantDropdownPlaceholder": "Select Type",
-          "variantsLabel": product.properties.variantLabel || "",
+          "variantsLabel": product.properties.variantSelectLabel || "",
           "groupOffer": false,
           "personalOffer": false,
           "savedEventName": eventName,
@@ -463,11 +478,7 @@ const ProductData = {
           "addOns": [],
           "inventory": product.inventory || "", //inventory label
           "equinoxProductId": productData.identifier,
-          equinox: {
-            sku: {
-              exists: this.mapEquinoxSKUExists(productData.exists)
-            }
-          }
+          "properties": product.properties
         };
 
         products.push(new Product(product));
@@ -491,17 +502,6 @@ const ProductData = {
     };
   },
 
-  mapEquinoxSKUExists: function(exists) {
-    // this could be avoided if only we are using response mapper
-    // for equinox products that exists.
-    // @todo: clean-up
-    if (exists === undefined) {
-      return true;
-    }
-
-    return exists;
-  },
-
   /**
    * fetchChildSkus make requests to Equinox to get the SKUs of a kit.
    * @param {*} product

package/src/equinox-helpers/interceptors/index.js

@@ -1,5 +0,0 @@
-const productNotFoundInterceptor = require('./productNotFound');
-
-module.exports = {
-  productNotFoundInterceptor
-}