@nuskin/ns-product-lib 2.7.0-cx24-3702.1 → 2.7.0-cx24-3682.7

package/CHANGELOG.md

@@ -1,30 +1,53 @@
-# [2.7.0-cx24-3702.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.2...v2.7.0-cx24-3702.1) (2023-03-25)
+# [2.7.0-cx24-3682.7](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.7.0-cx24-3682.6...v2.7.0-cx24-3682.7) (2023-03-25)
 
 
 ### New
 
-* adding properties variable to equinox product data ([3a4971b](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/3a4971bc3620ac848c0ba6c541bf6906b09169fd))
+* MySite product cards show blank data when users have setup AEM Base SKU's(55) in Admin #CX24-3682 ([a8f0331](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/a8f0331970ed4631ceba029d48e246b83627a046)), closes [#CX24-3682](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3682)
 
-## [2.6.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.1...v2.6.2) (2023-03-24)
+# [2.7.0-cx24-3682.6](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.7.0-cx24-3682.5...v2.7.0-cx24-3682.6) (2023-03-25)
 
 
-### Fix
+### New
 
-* Fix drop down variants Cx24 3377 ([262328e](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/262328e617b87d6dbf44b1393fdffaa10d8de13d))
+* MySite product cards show blank data when users have setup AEM Base SKU's(55) in Admin #CX24-3682 ([13f2b76](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/13f2b76990dd2e4f4226367332212dcc7bd19977)), closes [#CX24-3682](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3682)
 
-# [2.7.0-cx24-337703.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.2-cx24-337703.1...v2.7.0-cx24-337703.1) (2023-03-22)
+# [2.7.0-cx24-3682.5](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.7.0-cx24-3682.4...v2.7.0-cx24-3682.5) (2023-03-25)
 
 
-### Update
+### New
 
-* Merge CX24-3563 changes to CX24-337703 ([9e6ca40](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/9e6ca40c35252c24394351275a234e9847f70bfc))
+* MySite product cards show blank data when users have setup AEM Base SKU's(55) in Admin #CX24-3682 ([588161d](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/588161d54fa2e97f6bee2fe33523f3f1bdcb1ed2)), closes [#CX24-3682](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3682)
 
-## [2.6.2-cx24-337703.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.1...v2.6.2-cx24-337703.1) (2023-03-22)
+# [2.7.0-cx24-3682.4](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.7.0-cx24-3682.3...v2.7.0-cx24-3682.4) (2023-03-24)
 
 
-### Fix
+### New
+
+* MySite product cards show blank data when users have setup AEM Base SKU's(55) in Admin #CX24-3682 ([f55854a](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/f55854ad4abb17dbd373fe5e36a38deb2bb8fc53)), closes [#CX24-3682](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3682)
+
+# [2.7.0-cx24-3682.3](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.7.0-cx24-3682.2...v2.7.0-cx24-3682.3) (2023-03-24)
+
+
+### New
+
+* MySite product cards show blank data when users have setup AEM Base SKU's(55) in Admin #CX24-3682 ([3ce010e](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/3ce010e162034d2cc49619f553baf7b8b7fcd4e0)), closes [#CX24-3682](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3682)
+
+# [2.7.0-cx24-3682.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.7.0-cx24-3682.1...v2.7.0-cx24-3682.2) (2023-03-24)
+
+
+### New
+
+* MySite product cards show blank data when users have setup AEM Base SKU's(55) in Admin #CX24-3682 ([219fbd5](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/219fbd59b96ed9cbbc3ea94a24d886f0e8ca563f)), closes [#CX24-3682](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3682)
+* MySite product cards show blank data when users have setup AEM Base SKU's(55) in Admin #CX24-3682 ([b86a1d2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/b86a1d2610892564c643bd851d873e507efedd49)), closes [#CX24-3682](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3682)
+* MySite product cards show blank data when users have setup AEM Base SKU's(55) in Admin #CX24-3682 ([60d61cc](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/60d61ccd38e9b971b7ac53cf4224a9897a63fef4)), closes [#CX24-3682](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3682)
+
+# [2.7.0-cx24-3682.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.1...v2.7.0-cx24-3682.1) (2023-03-24)
+
+
+### New
 
-* Show dropdown for variants ([85cdf69](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/85cdf69cc2bbf6700ec5c9bcacc7222cf2ddf674))
+* MySite product cards show blank data when users have setup AEM Base SKU's(55) in Admin #CX24-3682 ([99cc11a](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/99cc11a7a274d97c03efc0a4bcdd0e03eb7b552a)), closes [#CX24-3682](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3682)
 
 ## [2.6.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.0...v2.6.1) (2023-03-16)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-product-lib",
-  "version": "2.7.0-cx24-3702.1",
+  "version": "2.7.0-cx24-3682.7",
   "description": "This project contains shared Product models and code between the backend and frontend.",
   "main": "src/index.js",
   "scripts": {
@@ -33,7 +33,7 @@
   "dependencies": {
     "@nuskin/configuration-sdk": "2.2.3",
     "@nuskin/ns-common-lib": "1.4.5",
-    "@nuskin/ns-util": "4.2.7",
+    "@nuskin/ns-util": "4.2.5",
     "axios": "0.27.2",
     "qs": "6.11.0"
   },

package/src/equinox-helpers/index.js

@@ -4,7 +4,9 @@
  * @type {object}
  * @property {ProductChildSku[]} childSkus
  * @property {Inventory} [inventoryProperties]
- *
+ */
+
+/**
  * @typedef ProductChildSku
  * @type {object}
  * @property {string} productId
@@ -13,43 +15,170 @@
  * @property {number} skuQuantity
  * @property {string} availableChannels
  * @property {Inventory} [inventory]
- *
- * ---
- *
+ */
+
+/**
+ * Types common to Product model and Equinox Product model
+ * @typedef Inventory
+ * @type {object}
+ * @property {number} atpQty
+ * @property {boolean} backOrdered
+ */
+
+/**
+ * @description This model represents the error response.
+ * @typedef EquinoxErrorResponse
+ * @type {object}
+ * @property {string} code e.g., SFOSER002
+ * @property {string} message e.g., No Results Found dot Search Term  null
+ * @property {number} timestamp e.g., 1679715447962
+ */
+
+/**
+ * @description This model represents the response.
+ * @typedef EquinoxResponse
+ * @type {object}
+ * @property {EquinoxProduct[]} product
+ */
+
+/**
  * @description This model represents a product within an Equinox response.
  * @typedef EquinoxProduct
  * @type {object}
- * @property {string} identifier
- * @property {EquinoxProductSKU[]} sku
- * @property {"kit"|"bundle"} [type]
- *
- * @typedef EquinoxProductSKU
+ * @property {string} identifier E.g., Normal - "blt8b757df6dcaa199c" | Kit - "02001076"
+ * @property {EquinoxProductProperties} properties
+ * @property {EquinoxProductVariant[]} [sku] or varaints - available only when product is a normal product.
+ * @property {"kit"|"bundle"} [type] available only when product is type of kit.
+ */
+
+/**
+ * @typedef {(
+ *  EquinoxProductCommonProperties & EquinoxNormalProductProperties
+ * )} EquinoxProductProperties
+ */
+
+/**
+ * @description These are the properties unique to Normal product type.
+ * @typedef EquinoxNormalProductProperties
+ * @type {object}
+ * @property {string} ingredients
+ * @property {string} benefits
+ * @property {string} usage
+ * @property {string} resources
+ * @property {string} scanQualifiedCount E.g., "0"
+ * @property {string} status E.g., "active"
+ * @property {string} size E.g., "30 mL / 1 fl.oz"
+ * @property {string} productDetailsDescription E.g., "[]"
+ */
+
+/**
+ * @description These are the properties unique to Kit product type.
+ * @typedef EquinoxKitProductProperties
+ * @type {object}
+ * @property {string} skukits E.g., "02002145~1,02002146~1,02002147~1,02002148~1,02002142~1,02002143~1"
+ * @property {string} productStatus E.g., "Sellable"
+ * @property {string} availableChannels E.g., "subscription,arsPhone,kiosk,mobile,web"
+ */
+
+/**
+ * @description These are the common properties between Normal and Kit product types
+ * @typedef EquinoxProductCommonProperties
+ * @type {object}
+ * @property {string} name E.g., "180° Cell Renewal Fluid"
+ * @property {string} imageURL E.g., "https://nuskin.com/content/dam/global/...ule-refreshed.jpg"
+ * @property {string} market E.g., "CA"
+ * @property {string} description E.g., "180° Ampoule"
+ * @property {string} customerTypes E.g., "BrandAffiliate,Preferred,Retail"
+ * @property {string} division E.g., "Nu Skin"
+ */
+
+/**
+ * @typedef EquinoxProductVariant
  * @type {object}
- * @property {boolean} default
- *  For multi-variant products, this indicates that this is the searched SKU
+ * @property {string} identifier E.g., "02002145"
+ * @property {string} inventory E.g., "IN STOCK"
+ * @property {EquinoxProductVariantProperties} properties
+ * @property {any[]} promotion E.g., ???
+ * @property {EquinoxProductPriceFacets} priceFacets
+ * @property {EquinoxProductInventoryProperties} inventoryProperties
+ * @property {EquinxProductTotalValue} totalValue
+ * @property {boolean} [default] For multi-variant products, this indicates that this is the searched SKU
  *  when using catalogs/search endpoint.
- * @property {string} identifier
- * @property {Inventory} inventoryProperties
- * @property {EquinoxProductProperties} properties
- *
- * @typedef EquinoxProductProperties
+ */
+
+/**
+ * @typedef EquinoxProductVariantProperties
  * @type {object}
- * @property {string} availableChannels
- *
- * ---
- *
- * Types common to Product model and Equinox Product model
- * 
- * @typedef Inventory
+ * @property {string} availableChannels E.g., "subscription,arsPhone,kiosk,mobile,web"
+ * @property {string} imageURL E.g., "https://nuskin.com/cont...21/ca-180-Ampoule-refreshed.jpg"
+ * @property {string} name E.g., "180° Cell Renewal Fluid"
+ * @property {string} market E.g., "CA"
+ * @property {string} description E.g., "180° Ampoule"
+ * @property {string} ingredients
+ * @property {string} benefits
+ * @property {string} usage
+ * @property {string} resources
+ * @property {string} scanQualifiedCount E.g., "0"
+ * @property {string} customerTypes E.g., "BrandAffiliate,Preferred,Retail"
+ * @property {string} division E.g., "Nu Skin"
+ * @property {string} status E.g., "active"
+ * @property {string} size E.g., "30 mL / 1 fl.oz"
+ * @property {string} [variantLabel]
+ * @property {string} [isExclusive] E.g., "false" - Why is this a string??
+ */
+
+/**
+ * @description Why are properties not camelCase and type of string instead of number? Super weird!
+ * @typedef EquinoxProductPriceFacets
  * @type {object}
- * @property {number} atpQty
- * @property {boolean} backOrdered
- *
- * ---
- *
+ * @property {string} CV E.g., "76.0"
+ * @property {string} Regular Price E.g., "76.0"
+ * @property {string} PV E.g., "54.15"
+ * @property {string} Wholesale Price E.g., "88.0"
+ * @property {string} SB E.g., "4.25"
+ */
+
+/**
+ * @description
+ * @typedef EquinoxProductInventoryProperties
+ * @type {object}
+ * @property {boolean} available E.g., true
+ * @property {boolean} lowStock E.g., false
+ * @property {string} binName E.g., "1046_CA01"
+ * @property {boolean} backOrdered E.g., false
+ * @property {number} expectedBackOrderAvailabilityDate E.g., 0
+ * @property {boolean} preOrdered E.g., false
+ * @property {number} expectedPreOrderAvailabilityDate E.g., 0
+ * @property {number} atpQty E.g., 49882
+ * @property {number} preOrderedQty E.g., 0
+ * @property {number} backOrderedQty E.g., 0
+ * @property {number|null} lowStockThreshold E.g., null
+ * @property {number|null} outOfStockThreshold E.g., null
+ */
+
+/**
+ * @description
+ * @typedef EquinxProductTotalValue
+ * @type {object}
+ * @property {number} priceAfterDiscount E.g., 2
+ * @property {number} originalPrice E.g., 2
+ * @property {number} totaldiscount E.g., 0
+ * @property {{
+ *  CV: { CV: number },
+ *  "Regular Price": {
+ *    "Regular Price": number
+ *  },
+ *  PV: { PV: number },
+ *  "Wholesale Price": {
+ *    "Wholesale Price": number
+ *  },
+ *  SB: { SB: number },
+ * }} priceFacets
+ */
+
+/**
  * Standalone types. These are types not related to Product
  * and Equinox Product models.
- *
  * @typedef KitSKUQuantity
  * @type {object}
  * @property {string} sku

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

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

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

@@ -0,0 +1,71 @@
+const { productNotFound } = require('../models');
+
+// httpStatus codes
+const httpStatus = { notFound: 404 };
+
+/**
+ * productNotFoundInterceptor returns a model "ProductNotFound" when the status code is Not Found.
+ * Note: Do not polute this file. Create a new file for new interceptor.
+ * 
+ * @param {import('axios').AxiosError} error 
+ * @returns {import('axios').AxiosError<import('../').EquinoxResponse>}
+*/
+function productNotFoundInterceptor(error) {
+  const segments = 'catalogs/search';
+  const { config, response } = error;
+
+  if (response.status === httpStatus.notFound && config.url.includes(segments)) {
+    const params = new URLSearchParams(config.url);
+    const filterParam = Array.from(params.values())[0];
+    const sku = getSKU(filterParam);
+
+    if (sku !== null) {
+      return {
+        ...error,
+        response: {
+          ...error.response,
+          data: {
+            product: [
+              productNotFound(sku)
+            ]
+          },
+          statusText: getStatusText(error.response)
+        }
+      }
+    }
+
+    console.error('Unable to detect SKU from the given parameter', filterParam);
+  }
+
+  return Promise.reject(error);
+}
+
+/**
+ * getSKU returns the SKU from the given parameter.
+ * @param {string} param '\\''index_key_productId="02010489" OR index_key_skuId="02010489"'''
+ * @returns {string|null} SKU 
+ */
+function getSKU(param) {
+  const result = param.match(/\d{8}/);
+
+  if (result === null) {
+    return null;
+  }
+
+  return result[0];
+}
+
+/**
+ * @param {import('axios').AxiosResponse<import('../').EquinoxErrorResponse>} [response] 
+ * @returns {string}
+ */
+function getStatusText(response) {
+  if (response) {
+    const { code, message, timestamp } = response.data;
+    return `Floating product found -- ${timestamp} ${code}: ${message}`;
+  }
+
+  return '';
+}
+
+module.exports = productNotFoundInterceptor;

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

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

package/src/equinox-helpers/mappers/properties.js

@@ -0,0 +1,182 @@
+// @ts-check
+/**
+ * mapProperties maps the properties of a product.
+ * @param {import('../').EquinoxProductProperties} props
+ */
+function mapProperties(props) {
+  /** @type {import('../').EquinoxProductProperties} */
+  const properties = {};
+  properties.name = mapName(props.name);
+  properties.description = mapDescription(props.description);
+  properties.productDetailsDescription = mapProductDetailsDescription(props.productDetailsDescription);
+  properties.ingredients = mapIngredients(props.ingredients);
+  properties.benefits = mapBenefits(props.benefits);
+  properties.usage = mapUsage(props.usage);
+  properties.scanQualifiedCount = mapScanQualifiedCount(props.scanQualifiedCount);
+  properties.division = mapDivision(props.division);
+  properties.imageURL = mapImageURL(props.imageURL);
+  properties.market = mapMarket(props.market);
+  properties.resources = mapResources(props.resources);
+  properties.customerTypes = mapCustomerTypes(props.customerTypes);
+  properties.size = mapSize(props.size);
+
+  return properties;
+}
+
+/**
+ * @param {string|undefined} name 
+ * @returns {string}
+ */
+function mapName(name) {
+  if (name) {
+    return name;
+  }
+
+  return '';
+}
+
+/**
+ * @param {string|undefined} description 
+ * @returns {string}
+ */
+function mapDescription(description) {
+  if (description) {
+    return description;
+  }
+
+  return '';
+}
+
+/**
+ * @param {string} productDetailsDescription 
+ * @returns {string}
+ */
+function mapProductDetailsDescription(productDetailsDescription) {
+  if (productDetailsDescription) {
+    return productDetailsDescription;
+  }
+
+  return '';
+}
+
+/**
+ * @param {string|undefined} ingredients 
+ * @returns {string}
+ */
+function mapIngredients(ingredients) {
+  if (ingredients) {
+    return ingredients;
+  }
+
+  return '';
+}
+
+/**
+ * @param {string|undefined} benefits 
+ * @returns {string}
+ */
+function mapBenefits(benefits) {
+  if (benefits) {
+    return benefits;
+  }
+
+  return '';
+}
+
+/**
+ * @param {string|undefined} usage 
+ * @returns {string}
+ */
+function mapUsage(usage) {
+  if (usage) {
+    return usage;
+  }
+
+  return '';
+}
+
+/**
+ * @param {string|undefined} scanQualifiedCount 
+ * @returns {string}
+ */
+function mapScanQualifiedCount(scanQualifiedCount) {
+  if (scanQualifiedCount) {
+    return scanQualifiedCount;
+  }
+
+  return '';
+}
+
+/**
+ * @param {string|undefined} division 
+ * @returns {string}
+ */
+function mapDivision(division) {
+  if (division) {
+    return division;
+  }
+
+  return '';
+}
+
+/**
+ * @param {string|undefined} imageURL 
+ * @returns {string}
+ */
+function mapImageURL(imageURL) {
+  if (imageURL) {
+    return imageURL;
+  }
+
+  return '';
+}
+
+/**
+ * @param {string|undefined} market 
+ * @returns {string}
+ */
+function mapMarket(market) {
+  if (market) {
+    return market;
+  }
+
+  return '';
+}
+
+/**
+ * @param {string|undefined} resources 
+ * @returns {string}
+ */
+function mapResources(resources) {
+  if (resources) {
+    return resources;
+  }
+
+  return '';
+}
+
+/**
+ * @param {string|undefined} customerTypes 
+ * @returns {string}
+ */
+function mapCustomerTypes(customerTypes) {
+  if (customerTypes) {
+    return customerTypes;
+  }
+
+  return '';
+}
+
+/**
+ * @param {string|undefined} size 
+ * @returns {string}
+ */
+function mapSize(size) {
+  if (size) {
+    return size;
+  }
+
+  return '';
+}
+
+module.exports = mapProperties;

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

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

package/src/equinox-helpers/models/productNotFound.js

@@ -0,0 +1,32 @@
+// @ts-check
+const { mapProperties } = require('../mappers');
+
+/**
+ * @param {string} sku 
+ * @returns {import('../').EquinoxProduct}
+ */
+function productNotFound(sku) {
+  /** @type {import('../').EquinoxProduct} */
+  const model = {};
+  model.identifier = sku || '';
+  model.properties = mapProperties({
+    name: '',
+    imageURL: '',
+    market: '',
+    description: '',
+    customerTypes: '',
+    division: '',
+    ingredients: '',
+    benefits: '',
+    usage: '',
+    resources: '',
+    scanQualifiedCount: '',
+    status: '',
+    size: '',
+    productDetailsDescription: ''
+  });
+
+  return model;
+}
+
+module.exports = productNotFound;

package/src/productData.js

@@ -6,6 +6,7 @@ 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'
@@ -66,9 +67,11 @@ 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,
@@ -81,6 +84,7 @@ const ProductData = {
       withCredentials: true
     });
 
+    axios.interceptors.response.eject(productNotFoundInterceptor);
     return response;
   },
 
@@ -132,11 +136,9 @@ const ProductData = {
     let thumbnailImage = imageURL ? imageURL + '?width=40' : ''
 
 
-    const { eventName, eventLabels, computedPrice, defaultProductPrice, CVPrice, PVPrice } = this.getEqProductPromotions(eqVariant);
+    const { eventName, eventLabels, computedPrice, defaultProductPrice } = 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,
@@ -243,8 +245,8 @@ const ProductData = {
       "availableQuantity": eqVariant.inventoryProperties.atpQty,
       "maxQuantity": 999,
       "points": "",
-      "cv": productCVPrice,
-      "pv": productPVPrice,
+      "cv": (eqVariant.priceFacets.CV) ? eqVariant.priceFacets.CV : '',
+      "pv": eqVariant.priceFacets.PV,
       "priceType": "WRTL",
       "price": discountedPrice,
       "priceMap": {
@@ -257,14 +259,14 @@ const ProductData = {
         "WHL": eqVariant.priceFacets["Wholesale Price"]
       },
       "cvMap": {
-        "WWHL": productCVPrice,
-        "WADW": productCVPrice,
-        "WHL": productCVPrice
+        "WWHL": (eqVariant.priceFacets.CV) ? eqVariant.priceFacets.CV : '',
+        "WADW": (eqVariant.priceFacets.CV) ? eqVariant.priceFacets.CV : '',
+        "WHL": (eqVariant.priceFacets.CV) ? eqVariant.priceFacets.CV : ''
       },
       "pvMap": {
-        "WWHL": productPVPrice,
-        "WADW": productPVPrice,
-        "WHL": productPVPrice
+        "WWHL": eqVariant.priceFacets.PV,
+        "WADW": eqVariant.priceFacets.PV,
+        "WHL": eqVariant.priceFacets.PV
       },
       "orderTypes": this._setOrderType(eqVariant.properties),
       "custTypes": this.switchCustType(eqVariant.properties.customerTypes),
@@ -297,8 +299,7 @@ const ProductData = {
       },
       "restrictedMarkets": [],
       "addOns": [],
-      "equinoxProductId": eqVariant.identifier,
-      "properties": eqVariant.properties
+      "equinoxProductId": eqVariant.identifier
     };
   },
 
@@ -322,16 +323,6 @@ 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 = [];
 
@@ -345,19 +336,17 @@ const ProductData = {
       eventLabels: eventLabels.join(','),
       defaultProductPrice,
       computedPrice,
-      eventName,
-      CVPrice,
-      PVPrice
+      eventName
     }
   },
 
   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' : ''
@@ -375,14 +364,10 @@ const ProductData = {
           eventName,
           eventLabels,
           computedPrice,
-          defaultProductPrice,
-          CVPrice,
-          PVPrice
+          defaultProductPrice
         } = 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);
@@ -421,8 +406,8 @@ const ProductData = {
           "scanQualified": productData.properties.scanQualifiedCount,
           "maxQuantity": 999,
           "points": "",
-          "cv": productCVPrice,
-          "pv": productPVPrice,
+          "cv": (product.priceFacets.CV) ? product.priceFacets.CV : '',
+          "pv": product.priceFacets.PV,
           "priceType": "WRTL",
           "price": discountedPrice,
           "priceMap": {
@@ -435,14 +420,14 @@ const ProductData = {
             "WWHL": product.priceFacets["Wholesale Price"]
           },
           "cvMap": {
-            "WWHL": productCVPrice,
-            "WADW": productCVPrice,
-            "WHL": productCVPrice
+            "WWHL": (product.priceFacets.CV) ? product.priceFacets.CV : '',
+            "WADW": (product.priceFacets.CV) ? product.priceFacets.CV : '',
+            "WHL": (product.priceFacets.CV) ? product.priceFacets.CV : ''
           },
           "pvMap": {
-            "WWHL": productPVPrice,
-            "WADW": productPVPrice,
-            "WHL": productPVPrice
+            "WWHL": product.priceFacets.PV,
+            "WADW": product.priceFacets.PV,
+            "WHL": product.priceFacets.PV
           },
           "orderTypes": this._setOrderType(product.properties),
           "custTypes": this.switchCustType(product.properties.customerTypes),
@@ -477,8 +462,7 @@ const ProductData = {
           "restrictedMarkets": [],
           "addOns": [],
           "inventory": product.inventory || "", //inventory label
-          "equinoxProductId": productData.identifier,
-          "properties": product.properties
+          "equinoxProductId": productData.identifier
         };
 
         products.push(new Product(product));