@nuskin/ns-product-lib 2.5.0-cx24-3175.2 → 2.5.0-cx24-2179.2.13

package/CHANGELOG.md

@@ -1,18 +1,130 @@
-# [2.5.0-cx24-3175.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.0-cx24-3175.1...v2.5.0-cx24-3175.2) (2023-01-20)
+# [2.5.0-cx24-2179.2.13](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.0-cx24-2179.2.12...v2.5.0-cx24-2179.2.13) (2023-01-23)
+
+
+### Fix
+
+* undefined value of the URL (CX24-3122,CX24-3234) ([1ea65a7](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/1ea65a7cf8249dfa4a378a66e74823aca76f5566))
+
+# [2.5.0-cx24-2179.2.12](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.0-cx24-2179.2.11...v2.5.0-cx24-2179.2.12) (2023-01-23)
+
+
+### Fix
+
+* undefined value of the URL (CX24-3122,CX24-3234) ([f4c1837](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/f4c1837d44da364711cc65b0c7c7a0c02f225f2e))
+
+# [2.5.0-cx24-2179.2.11](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.0-cx24-2179.2.10...v2.5.0-cx24-2179.2.11) (2023-01-16)
+
+
+### Fix
+
+* Equinox API called for non equinox market ([50eaa48](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/50eaa48a41a9e00d48ff79de35b955b817c4c0ea))
+
+# [2.5.0-cx24-2179.2.10](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.0-cx24-2179.2.9...v2.5.0-cx24-2179.2.10) (2023-01-16)
+
+
+### Fix
+
+* Equinox API called for non equinox market (CX24-3168) ([399e615](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/399e6150914dcafd5bd9fcd7ca0e0a95b65656d7))
+
+# [2.5.0-cx24-2179.2.9](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.0-cx24-2179.2.8...v2.5.0-cx24-2179.2.9) (2022-12-20)
+
+
+### Fix
+
+* eq market  event pricing and name (#CX24-2179) ([213b59a](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/213b59a33a208ffad0a6726521ce7f365d34d36e)), closes [#CX24-2179](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2179)
+* Slow response of add-to-cart button function for Equinox Cart ([14394b2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/14394b299afbd53254a3ec053ad41e68ed526dfe))
+* Unit Tests ([ace52c6](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/ace52c6418991d0263a1e1f8d99901e724abf923))
+
+### Release
+
+* Automated changes by GitLab pipeline [skip ci] ([eb755fa](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/eb755fae1e1f1f221a34d92f5ff4e64787a4132d))
+* Automated changes by GitLab pipeline [skip ci] ([6a75f7a](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/6a75f7a5f8b2f3b17e4d7387af37cad4f367b45c))
+
+### Update
+
+* use configuration-sdk to pull the configurations (CX24-2931) ([6934570](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/69345701e6b44754ffeb648ead56f0288aadeb16))
+
+# [2.5.0-CX24.3.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.4.2-CX24.2.1...v2.5.0-CX24.3.1) (2022-12-06)
+
+* added eq promoion bypass for setPriceAndPvFromType v5  (#CX24-2179) ([f5b62e5](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/f5b62e5e82f1830d4105ffc965b64e9a7fc88d9b)), closes [#CX24-2179](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2179)
+
+# [2.5.0-cx24-2179.2.6](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.0-cx24-2179.2.5...v2.5.0-cx24-2179.2.6) (2022-12-05)
+
+
+### New
+
+* added eq promoion bypass for setPriceAndPvFromType v4  (#CX24-2179) ([abcdd30](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/abcdd30223107786c0c2f9d1a8946053ef6dcef5)), closes [#CX24-2179](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2179)
+
+# [2.5.0-cx24-2179.2.5](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.0-cx24-2179.2.4...v2.5.0-cx24-2179.2.5) (2022-12-05)
+
+
+### New
+
+* added eq promoion bypass for setPriceAndPvFromType v3  (#CX24-2179) ([79fe156](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/79fe1562d0cafc44f8945e57c316c8ba0b55a88b)), closes [#CX24-2179](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2179)
+
+# [2.5.0-cx24-2179.2.4](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.0-cx24-2179.2.3...v2.5.0-cx24-2179.2.4) (2022-12-05)
+
+
+### New
+
+* added eq promoion bypass for setPriceAndPvFromType v2  (#CX24-2179) ([25bde9a](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/25bde9a8e19b1e4e44e37457dfb087e0a6212ee1)), closes [#CX24-2179](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2179)
+
+# [2.5.0-cx24-2179.2.3](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.0-cx24-2179.2.2...v2.5.0-cx24-2179.2.3) (2022-12-05)
+
+
+### New
+
+* added eq promoion bypass for setPriceAndPvFromType  (#CX24-2179) ([716cefc](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/716cefc2a2522287e017709a8b2cfef5a7ce5e07)), closes [#CX24-2179](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2179)
+
+# [2.5.0-cx24-2179.2.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.0-cx24-2179.2.1...v2.5.0-cx24-2179.2.2) (2022-12-05)
+
+
+### New
+
+* added eq promotion support- debug sales event  (#CX24-2179) ([992a2cf](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/992a2cfb178b3e12a6b8a0229ae5f6f607fb41d3)), closes [#CX24-2179](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2179)
+
+# [2.5.0-cx24-2179.2.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.4.2-CX24.2.1...v2.5.0-cx24-2179.2.1) (2022-12-02)
+>>>>>>> CX24.2
+
+
+### Fix
+
+* [Equinox market] Admin > Move up/down/top/bottom of featured products and edit bundle is not working ([a89af4a](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/a89af4a5d00c6a68fcaeff22f128554270add21e))
+
+### Release
+
+* Automated changes by GitLab pipeline [skip ci] ([07bfa40](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/07bfa404c552c05637c2c8a537c4ff298536874e))
+* Automated changes by GitLab pipeline [skip ci] ([fa1c0d9](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/fa1c0d9d5853482e3ac49cea4e99599e7192f85b))
+* Automated changes by GitLab pipeline [skip ci] ([2d20787](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/2d2078763b2d57edb8a24f438ac90dd37c3ff41b))
+
+### Update
+
+* set ADR pricing from equinox (CX24-2862) ([65d04d2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/65d04d2e9ff4018edfe99e5a7412bee985d3def2))
+* set ADR pricing from equinox (CX24-2862) ([54a5693](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/54a56932e5df36c9c30ce6358d8597c98be3d20d))
+* set ADR pricing from equinox (CX24-2862) ([bbd135f](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/bbd135f1ed0395c578be2274c84ba136ceed9376))
+* set ADR pricing from equinox (CX24-2862) ([197003e](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/197003e1629bd394c547a118d332b5e8574dfc7d))
+
+# [2.5.0-cx24-2862.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.0-cx24-2862.1...v2.5.0-cx24-2862.2) (2022-11-11)
 
 
 ### Update
 
-* remapped custType field in variant   (#CX24-3175) ([2e4c70a](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/2e4c70aa2bf8d2f386a4d083e74f47ae141cdf54)), closes [#CX24-3175](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3175)
+* set ADR pricing from equinox (CX24-2862) ([b64dcea](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/b64dcea4dd3374be992c667db5c0b2604aacc029))
 
-# [2.5.0-cx24-3175.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.4.1...v2.5.0-cx24-3175.1) (2023-01-20)
+# [2.5.0-cx24-2862.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.4.2-cx24-2612.1.1...v2.5.0-cx24-2862.1) (2022-11-10)
 
 
 ### Update
 
-* remapped equinox isExclusive field  (#CX24-3175) ([6adcee1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/6adcee103ca720697152d253c135546af7393739)), closes [#CX24-3175](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3175)
-* remapped equinox properties after migration (#CX24-3175) ([cd1e3f6](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/cd1e3f6894b764283b026197412a6d1859b35a91)), closes [#CX24-3175](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3175)
-* remapped equinox variant label property  (#CX24-3175) ([3c2a7dc](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/3c2a7dc4c9543577ae6a90f3f5df0f092707e2b6)), closes [#CX24-3175](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3175)
+* set ADR pricing from equinox (CX24-2862) ([9f6dfb7](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/9f6dfb726f40b1335411318629a2ebdf1b4dac96))
+* set ADR pricing from equinox (CX24-2862) ([61f550a](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/61f550a21c5cc9d062549ec2aaf2758aebccf2be))
+
+## [2.4.2-cx24-2612.1.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.4.1...v2.4.2-cx24-2612.1.1) (2022-11-07)
+
+
+### Fix
+
+* [Equinox market] Admin > Move up/down/top/bottom of featured products and edit bundle is not working ([9d9d106](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/9d9d10667477b4c7ef7bf8ec013aab322d3cdbcc))
 
 ## [2.4.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.4.0...v2.4.1) (2022-11-06)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-product-lib",
-  "version": "2.5.0-cx24-3175.2",
+  "version": "2.5.0-cx24-2179.2.13",
   "description": "This project contains shared Product models and code between the backend and frontend.",
   "main": "src/index.js",
   "scripts": {
@@ -31,6 +31,7 @@
     "prettier": "1.19.1"
   },
   "dependencies": {
+    "@nuskin/configuration-sdk": "1.0.1",
     "@nuskin/ns-common-lib": "1.4.5",
     "@nuskin/ns-util": "3.107.0",
     "axios": "0.27.2",

package/src/contentstack/contentstack.js

@@ -98,7 +98,7 @@ function getCachedData(key) {
  * @property {string} checkout_client_secret
  *
  * @export
- * @return {Promise<null|MarketConfig>}
+ * @return {Promise<null|MarketConfig>} 
  */
 async function getAEMConfig() {
   try {
@@ -137,7 +137,7 @@ async function getAEMConfig() {
  * @property {string} market_name
  * @property {string} country_code
  * @property {string} store_id
- *
+ * 
  * @typedef EquinoxEnabledMarkets
  * @property {EquinoxEnabledMarket[]} [dev_markets]
  * @property {EquinoxEnabledMarket[]} [test_markets]
@@ -145,7 +145,7 @@ async function getAEMConfig() {
  * @property {EquinoxEnabledMarket[]} [prod_markets]
  *
  * @export
- * @return {Promise<EquinoxEnabledMarkets>}
+ * @return {Promise<EquinoxEnabledMarkets>} 
  */
 async function getEquinoxMarkets() {
   try {
@@ -176,8 +176,8 @@ async function getEquinoxMarkets() {
   }
 }
 
-/**getKongUrl gets the URL for Kong in contentstack
- *
+/**getKongUrl gets the URL for Kong in contentstack 
+ * 
  * @returns {string}
 */
 async function getKongUrl() {

package/src/index.js

@@ -7,10 +7,10 @@
 
 const Agelocme = require("./agelocme.js");
 const Contentstack = require('./contentstack/contentstack');
-const PriceType = require("./models/priceType.js");
+const PriceType = require("./priceType.js");
 const Product = require("./product.js");
 const ProductContentMapper = require("./productContentMapper.js");
-const ProductStatus = require("./models/productStatus.js");
+const ProductStatus = require("./productStatus.js");
 const ProductStatusMapper = require("./productStatusMapper.js");
 const ProductUtils = require("./productUtils.js");
 const ProductData = require("./productData.js");

package/src/product.js

@@ -5,8 +5,8 @@ const { isTrue }  = require("@nuskin/ns-common-lib");
 const ProductUtils = require("./productUtils.js");
 
 const Agelocme = require("./agelocme.js");
-const PriceType = require("./models/priceType.js");
-const ProductStatus = require("./models/productStatus.js");
+const PriceType = require("./priceType.js");
+const ProductStatus = require("./productStatus.js");
 
 const Product = function(productData) {
   this.priceMap = {};
@@ -75,6 +75,7 @@ const Product = function(productData) {
   //equinox inventory / stock label
   //@example "IN STOCK"
   this.inventory = "";
+  this.equinoxProductId = "";
 
   this.setMarketAttributes = function(productStatus) {
     if (productStatus.marketAttributes) {
@@ -225,7 +226,7 @@ const Product = function(productData) {
     }
   };
 
-  this.setPriceAndPvFromType = function(_priceType, _activeEvents = null) {
+  this.setPriceAndPvFromType = function(_priceType, _activeEvents = null, option = {}) {
     // WARNING: priceType needs to be handled client-side
     // const priceType = ConfigService.getMarketConfig().showWholeSalePricing && !AccountManager.isLoggedIn()
     //     ? PriceType.WWHL
@@ -234,11 +235,11 @@ const Product = function(productData) {
     const eventPricing = getEventPricing(this, priceType, _activeEvents);
 
     let changed = false;
-    if (
+    if ((
       !this.price ||
       priceType !== this.priceType ||
       this.eventName !== eventPricing.eventName
-    ) {
+    ) && !option.isEqPromotion) {
       this.setPrice(eventPricing.price || this.getPricing(priceType));
       this.setCv(eventPricing.cv || this.getCvWithType(priceType));
       this.setPv(eventPricing.pv || this.getPvWithType(priceType));
@@ -247,11 +248,20 @@ const Product = function(productData) {
       changed = true;
     }
 
+    if (option.isEqPromotion) {
+      //retain product.price as original price
+      this.setCv(this.getCvWithType(priceType));
+      this.setPv(this.getPvWithType(priceType));
+      this.priceType = priceType;
+      changed = true;
+    }
+
     this.variantSkus().forEach((variantSku) => {
       if (
         this.variants[variantSku].setPriceAndPvFromType(
           priceType,
-          _activeEvents
+          _activeEvents,
+          option
         )
       ) {
         changed = true;
@@ -281,7 +291,7 @@ const Product = function(productData) {
     this.priceMap[type] = price;
   };
 
-  this.addPricingFromStatus = function(productStatus, priceType) {
+  this.addPricingFromStatus = function(productStatus, priceType, option ={}) {
     let modified = false;
 
     if (!priceType) {
@@ -319,13 +329,13 @@ const Product = function(productData) {
       if(productStatus.childSkus) {
         this.childSkus = productStatus.childSkus;
       }
-      this.setPriceAndPvFromType(priceType);
+      this.setPriceAndPvFromType(priceType, null, option);
       modified = true;
     } else {
       let variant = this.getVariant(productStatusSku);
 
       if (variant) {
-        if (variant.addPricingFromStatus(productStatus, priceType)) {
+        if (variant.addPricingFromStatus(productStatus, priceType, option)) {
           variant.setMarketAttributes(productStatus);
           updateBaseRanges(this, variant);
           modified = true;
@@ -523,6 +533,7 @@ const Product = function(productData) {
     retData.restrictedMarkets = this.restrictedMarkets;
     retData.addOns = this.addOns;
     retData.inventory = this.inventory;
+    retData.equinoxProductId = this.equinoxProductId;
 
     return retData;
   };
@@ -662,6 +673,8 @@ const Product = function(productData) {
       if (data.agelocme) {
         this.agelocme = new Agelocme(data.agelocme);
       }
+
+      this.equinoxProductId = data.equinoxProductId;
     }
   };
 

package/src/productData.js

@@ -1,9 +1,10 @@
 "use strict";
+const { getConfiguration } = require('@nuskin/configuration-sdk');
+// import { ConfigService } from '@nuskin/ns-util';
 const axios = require("axios");
 const contentstack = require('./contentstack/contentstack');
 const Product = require("./product");
-const CustomerTypes = require('./models/customerTypes');
-const ProductStatus = require("./models/productStatus");
+
 /** @type {*} */
 const ProductData = {
   /**
@@ -14,37 +15,41 @@ const ProductData = {
    */
   getProductData: async function (skus, locale, market, isEquinoxEnabled = false) {
     const localeMarket = `${locale}_${market}`;
-
+    
     if (isEquinoxEnabled) {
-      const marketConfig = await contentstack.isMarketEnabled(market);
-
-      if (marketConfig !== null) {
-        return await this.getProductFromEquinox(skus, localeMarket, marketConfig.store_id);
+      let config = (await getConfiguration({
+        configMapNames: ['Equinox_Markets'],
+        country: market,
+        environment: 'test',
+        clientId: '735b1eb810304bba966af0891ab54053'
+      })).Equinox_Markets;
+      if (config.country_code != '') {
+        return await this.getProductFromEquinox(skus, localeMarket, config);
       }
     }
-
     return await this.getProductFromLegacy(skus, localeMarket);
   },
-
-  getProductFromEquinox: async function (skus, locale, storeID) {
-    const filter = '{"filters":[{"field":"index_key_skuId","operation":"IN","value":"' + skus.toString() + '"}]}';
+  
+  getProductFromEquinox: async function (skus, locale, config) {
+    console.trace(config);
+    const filter = `{"filters": [{"field": "index_key_skuId","operation": "IN", "value": "${skus.toString()}"}]}`;
     axios.defaults.withCredentials = true;
 
-    const url = await contentstack.getKongUrl() + `/orchestrationservices/storefront/catalogs/search/`;
+    const url = `${config.API_Base_URLs}/orchestrationservices/storefront/catalogs/search/`;
     const href = `${url}?filter=${encodeURI(filter)}`;
     const response = await axios.request({
       method: 'get',
       url: href,
       params: {
         locale,
-        storeId: storeID
+        storeId: config.store_id
       },
       headers: this.getEquinoxRequestHeaders(),
       responseType: 'json'
     });
 
     if (response.data.product) {
-      return this.eqProductMapper(response.data.product);
+      return this.eqProductMapper(response.data.product, skus);
     }
 
     return {
@@ -92,11 +97,11 @@ const ProductData = {
 
   /**
    * Map product variant
-   * @todo remove unnecessary fields
+   * @todo remove unnecessary fields and do code refactoring
    * @param {*} eqVariant
    * @returns Array<Product>
    */
-  j : function (eqVariant) {
+  eqProductVariantMapper : function (eqVariant) {
 
     let imageURL = eqVariant.properties.imageURL;
     const regex = /\d+.\d+/
@@ -108,6 +113,10 @@ const ProductData = {
       thumbnailImage = imageURL.replace(regex,'40.40')
     }
 
+    const { eventName, eventLabels, computedPrice, defaultProductPrice} = this.getEqProductPromotions(eqVariant);
+    const productPrice = eventName ? defaultProductPrice : eqVariant.priceFacets["Regular Price"];
+    const discountedPrice = eventName ? computedPrice : eqVariant.priceFacets["Regular Price"];
+
     return {
       "sku": eqVariant.identifier,
       "globalProductID": eqVariant.identifier,
@@ -146,14 +155,14 @@ const ProductData = {
       "cv": (eqVariant.priceFacets.CV) ?  eqVariant.priceFacets.CV : '',
       "pv":eqVariant.priceFacets.PV,
       "priceType": "WRTL",
-      "price": eqVariant.priceFacets["Regular Price"],
+      "price": discountedPrice,
       "priceMap": {
-        "WRTL": eqVariant.priceFacets["Regular Price"],
+        "WRTL": productPrice,
         "WADW-WRTL": eqVariant.priceFacets["Regular Price"],
-        "WADR": 9999.01,
+        "WADR": eqVariant.priceFacets["Regular Price"],
         "RTL": eqVariant.priceFacets["Regular Price"],
         "WWHL": eqVariant.priceFacets["Wholesale Price"],
-        "WADW": 9998.01,
+        "WADW": eqVariant.priceFacets["Wholesale Price"],
         "WHL": eqVariant.priceFacets["Wholesale Price"]
       },
       "cvMap": {
@@ -166,20 +175,7 @@ const ProductData = {
         "WADW": eqVariant.priceFacets.PV,
         "WHL": eqVariant.priceFacets.PV
       },
-      "orderTypes": {
-        "adr": true,
-        "order": true,
-        "zpfc": false,
-        "zadp": true,
-        "ars": true,
-        "kiosk": true,
-        "mobile": true,
-        "preferred customer": true,
-        "retail": true,
-        "web": true,
-        "web display": true
-      },
-      "custTypes": this.switchCustType(eqVariant.properties.customerTypes),
+      "orderTypes": this._setOrderType(eqVariant.properties),
       "division": eqVariant.properties.division,
       "backOrderDate": null,
       "locallyProduced": false,
@@ -190,29 +186,65 @@ const ProductData = {
       "shade": "",
       "status": this.switchStatusFromEquinox(eqVariant.properties.status),
       "variantType": "Other",
-      "variantDropdownLabel": eqVariant.properties.variantSelectLabel  ||  "",
+      "variantDropdownLabel": eqVariant.properties.variantLabel  ||  "",
       "variantDropdownPlaceholder": "Select Type",
-      "variantsLabel": eqVariant.properties.variantSelectLabel  ||  "",
+      "variantsLabel": eqVariant.properties.variantLabel  ||  "",
       "groupOffer": false,
       "personalOffer": false,
-      "savedEventName": null,
-      "salesLabel": "",
-      "eventName": null,
+      "savedEventName": eventName,
+      "salesLabel": eventLabels,
+      "eventName": eventName,
       "sizeWeight": '',
       "nettoWeight": "",
       "searchScore": 0,
-      "isExclusive": eqVariant.properties.isExclusive || false,
+      "isExclusive": false,
       "marketAttributes": {
         "discount": true,
         "redeem": true,
         "earn": true
       },
       "restrictedMarkets": [],
-      "addOns": []
+      "addOns": [],
+      "equinoxProductId": eqVariant.identifier
     };
   },
 
-  eqProductMapper: function (productDataResponse) {
+  /**
+   * Get EQ product promotions
+   * @param {*} product
+   * @returns {obj} promotion
+   */
+  getEqProductPromotions(product) {
+
+    if (!Array.isArray(product.promotion)) {
+      return {
+        eventLabels: "",
+        computedPrice : 0,
+        defaultProductPrice: product.priceFacets ? product.priceFacets["Regular Price"] : 0,
+        eventName: null
+      }
+    }
+
+    const defaultProductPrice = product.totalValue ?  product.totalValue.originalPrice : 0;
+    const computedPrice =  product.totalValue && product.totalValue.priceAfterDiscount ? product.totalValue.priceAfterDiscount : 0;
+    let eventName = "";
+    const eventLabels = [];
+
+    product.promotion.map(promotion => {
+      eventName = promotion.offerId;
+      eventLabels.push(promotion.message);
+      return promotion;
+    });
+
+    return {
+      eventLabels: eventLabels.join(','),
+      defaultProductPrice,
+      computedPrice,
+      eventName
+    }
+  },
+
+  eqProductMapper: function (productDataResponse, skus) {
     let prod = [];
     let count = 0;
     let variants = {};
@@ -229,12 +261,17 @@ const ProductData = {
       }
 
       if (data.sku && data.sku.length > 1) {
-        data.sku.map(variant => {
+        //exclude base product from variants
+        data.sku.filter(v => v.identifier.substring(2, 4) !== "55").map(variant => {
           variants[variant.identifier] = this.eqProductVariantMapper(variant);
           return variant;
         });
       }
 
+      const { eventName, eventLabels, computedPrice, defaultProductPrice} = this.getEqProductPromotions(data.sku[count]);
+      const productPrice = eventName ? defaultProductPrice : data.sku[count].priceFacets["Regular Price"];
+      const discountedPrice = eventName ? computedPrice : data.sku[count].priceFacets["Regular Price"];
+
       prod = {
         "sku": data.sku[count].identifier,
         "globalProductID": data.identifier,
@@ -273,13 +310,13 @@ const ProductData = {
         "cv": (data.sku[count].priceFacets.CV) ?  data.sku[count].priceFacets.CV : '',
         "pv": data.sku[count].priceFacets.PV,
         "priceType": "WRTL",
-        "price": data.sku[count].priceFacets["Regular Price"],
+        "price": discountedPrice,
         "priceMap": {
-          "WRTL": data.sku[count].priceFacets["Regular Price"],
+          "WRTL": productPrice,
           "WADW-WRTL": data.sku[count].priceFacets["Regular Price"],
-          "WADR": 9999.01,
+          "WADR": data.sku[count].priceFacets["Regular Price"],
           "RTL": data.sku[count].priceFacets["Regular Price"],
-          "WADW": 9998.01,
+          "WADW": data.sku[count].priceFacets["Wholesale Price"],
           "WHL": data.sku[count].priceFacets["Wholesale Price"],
           "WWHL": data.sku[count].priceFacets["Wholesale Price"]
         },
@@ -293,19 +330,7 @@ const ProductData = {
           "WADW": data.sku[count].priceFacets.PV,
           "WHL": data.sku[count].priceFacets.PV
         },
-        "orderTypes": {
-          "adr": true,
-          "order": true,
-          "zpfc": false,
-          "zadp": true,
-          "ars": true,
-          "kiosk": true,
-          "mobile": true,
-          "preferred customer": true,
-          "retail": true,
-          "web": true,
-          "web display": true
-        },
+        "orderTypes": this._setOrderType(data.sku[count].properties),
         "childSkus": [],
         "custTypes": this.switchCustType(data.properties.customerTypes),
         "division": data.properties.division,
@@ -323,14 +348,14 @@ const ProductData = {
         "variantsLabel": data.sku[count].properties.variantLabel  ||  "",
         "groupOffer": false,
         "personalOffer": false,
-        "savedEventName": null,
-        "salesLabel": "",
-        "eventName": null,
+        "savedEventName": eventName,
+        "salesLabel": eventLabels,
+        "eventName": eventName,
         "sizeWeight": '',
         "nettoWeight": "",
         "variants": variants,
         "searchScore": 0,
-        "isExclusive": data.sku[count].properties.isExclusive || false,
+        "isExclusive": data.sku[count].properties.isExclusive,
         "marketAttributes": {
           "discount": true,
           "redeem": true,
@@ -338,15 +363,15 @@ const ProductData = {
         },
         "restrictedMarkets": [],
         "addOns": [],
-        "inventory": data.sku[count].inventory || "" //inventory label
-
+        "inventory": data.sku[count].inventory || "", //inventory label
+        "equinoxProductId": data.identifier
       };
       let newProduct = new Product(prod);
       return newProduct
-    })
+    });
 
     let data = {
-      products: prodArr,
+      products: this._sortProductsBySku(skus, prodArr),
       count: productDataResponse.length
     };
     return {
@@ -359,29 +384,27 @@ const ProductData = {
   },
 
   switchStatusFromEquinox: function (status) {
-    const { equinoxStatus } = ProductStatus;
     let newStatus = '';
-    switch (status.toLowerCase()) {
-      case equinoxStatus.SELLABLE:
-        newStatus = ProductStatus.ReleasedForSale;
+    switch (status) {
+      case 'Sellable':
+        newStatus = 'RELEASED_FOR_SALE';
         break;
-      case equinoxStatus.PREVIEW_PRODUCT:
-        newStatus = ProductStatus.NotReleasedForSale;
+      case 'Preview product':
+        newStatus = 'NOT_RELEASED_FOR_SALE';
         break;
-      case equinoxStatus.DISCONTINUED:
-        newStatus = ProductStatus.Discontinued;
+      case 'Discontinued':
+        newStatus = 'DISCONTINUED';
         break;
-      case equinoxStatus.STOPPED:
-        newStatus =  ProductStatus.Discontinued;
+      case 'Stopped':
+        newStatus = 'DISCONTINUED';
         break;
-      case equinoxStatus.REPLACEMENT:
-        newStatus = ProductStatus.NotReleasedForSale;
+      case 'Replacement':
+        newStatus = 'NOT_RELEASED_FOR_SALE';
         break;
       default:
-        newStatus = ProductStatus.NotReleasedForSale;
+        newStatus = 'NOT_RELEASED_FOR_SALE'
         break;
     }
-
     return newStatus;
   },
 
@@ -390,33 +413,92 @@ const ProductData = {
    * @param {*} custType
    *
    */
+  switchCustType: function (custType) {
+    let newCustType = [];
+    if (custType.includes('Brand Affiliate - Business Entity') || custType.includes('Brand Affiliate - Individual'))
+      newCustType.push(10)
+    if (custType.includes('Retail Customer'))
+      newCustType.push(20)
+    if (custType.includes('Preferred Customer/Member'))
+      newCustType.push(30)
+    return newCustType.toString()
+  },
 
   /**
-   * map customer types from string to code
-   * @param {*} eqCustomerTypes
-   * @returns
+   * Sorts the product by sku
+   * @param {Array} skus - the skus arrangment which the sorting will base out of
+   * @param {Array} products - this products to be sorted
    */
-  switchCustType: function (eqCustomerTypes) {
-    if (!eqCustomerTypes) {
-      return "";
-    }
 
-    const custTypes = eqCustomerTypes.split(',').map(customerType => customerType.toLowerCase());
+  _sortProductsBySku: function (skus, products) {
 
-    let newCustType = [];
-    if (custTypes.includes(CustomerTypes.BrandAffiliate)) {
-      newCustType.push(CustomerTypes.properties.BRAND_AFFILIATE.code);
+    if(!skus || !products || products.length === 1) {
+      return products
     }
 
-    if (custTypes.includes(CustomerTypes.Retail)) {
-      newCustType.push(CustomerTypes.properties.RETAIL.code);
-    }
+    const sortedProducts = products.sort(function (a, b) {
+      return skus.indexOf(a.sku) - skus.indexOf(b.sku);
+    });
 
-    if (custTypes.includes(CustomerTypes.Preferred) || custTypes.includes(CustomerTypes.PreferredCustomer)) {
-      newCustType.push(CustomerTypes.properties.PREFERRED.code);
-    }
+    return sortedProducts
 
-    return newCustType.toString()
+  },
+
+  /**
+   *
+   * @param {*} availableChannels
+   *
+   * This function is use to convert arsPhone,web,kiosk,mobile,subscription
+   * to orderType object
+   *  "adr”
+      "order"
+      "zpfc"
+      "zadp"
+      "ars"
+      "kiosk"
+      "mobile"
+      "preferred customer"
+      "retail"
+      "web"
+      "web display"
+   */
+  _setOrderType: function (properties) {
+    let orderTypeArr = {
+      "adr": false,
+      "order": false,
+      "zpfc": false,
+      "zadp": false,
+      "ars": false,
+      "kiosk": false,
+      "mobile": false,
+      "preferred customer": false,
+      "retail": false,
+      "web": false,
+      "web display": false
+    };
+    let availableChannelsArr = properties.availableChannels.split(',')
+
+    availableChannelsArr.forEach(channel => {
+      if (channel == 'arsPhone')
+        orderTypeArr.ars = true
+      if (channel == 'web') {
+        orderTypeArr.order = true
+        orderTypeArr.web = true
+      }
+      if (channel == 'kiosk')
+        orderTypeArr.kiosk = true
+      if (channel == 'mobile')
+        orderTypeArr.mobile = true
+      if (channel == 'subscription')
+        orderTypeArr.adr = true
+
+    });
+    if (properties.retail)
+      orderTypeArr.retail = true
+    if (properties.prefferredCustomer)
+      orderTypeArr['preferred customer'] = true
+
+    return orderTypeArr;
   }
 }
 

package/src/{models/productStatus.js → productStatus.js}

@@ -17,13 +17,6 @@ const ProductStatus = {
     STOP_STATUS: { stringKey: "stopStatus", code: 5 },
     NOT_FOUND: { stringKey: "", code: 0 },
     NOT_SOLD_SEPERATELY: {stringKey: "notSoldSeperately", code: 4 }
-  },
-  equinoxStatus: {
-    SELLABLE: 'sellable',
-    PREVIEW_PRODUCT: 'preview product',
-    DISCONTINUED: 'discontinued',
-    STOPPED: 'stopped',
-    REPLACEMENT: 'Replacement'
   }
 };
 

package/src/models/customerTypes.js

@@ -1,16 +0,0 @@
-"use strict";
-
-const CustomerTypes = {
-  BrandAffiliate: "brandaffiliate",
-  Preferred: "preferred",
-  PreferredCustomer: "preferred customer",
-  Retail: "retail",
-  properties: {
-    BRAND_AFFILIATE: { stringKey: "DIST", code: 10 },
-    RETAIL: { stringKey: "CUST", code: 20 },
-    PREFERRED: { stringKey: "preferred", code: 30 },
-    PREFERRED_CUSTOMER: { stringKey: "PREF", code: 30 }
-  }
-};
-
-module.exports = CustomerTypes;