@nuskin/ns-product-lib 2.4.0-cx24-2467.2.1 → 2.4.0-cx24-2462.2.1

package/CHANGELOG.md

@@ -1,9 +1,106 @@
-# [2.4.0-cx24-2467.2.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.3.0...v2.4.0-cx24-2467.2.1) (2022-10-19)
+# [2.4.0-cx24-2462.2.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.4.0-cx24-2462.1.1...v2.4.0-cx24-2462.2.1) (2022-11-15)
 
 
+### Fix
+
+* [Equinox market] Admin > Move up/down/top/bottom of featured products and edit bundle is not working ([0077fdc](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/0077fdc034257bb67b4ea8e49b7e0f55abedb292))
+* platform agnostic updates to ns-product-lib ([bb33b74](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/bb33b7493530b88cb34ed6e0c9428f99f5818644))
+* platform agnostic updates to ns-product-lib ([50ec0a0](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/50ec0a0797e30b79c3d7f7a254ac9417cf935322))
+
+### New
+
+* added support for inventory label (#CX24-2186) ([684cebe](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/684cebe2d743f4d24310eb2b464c3fa90aa914a8)), closes [#CX24-2186](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2186)
+
+### Release
+
+* Automated changes by GitLab pipeline [skip ci] ([990dab6](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/990dab6750a79b1b8c85ea6e11fa0dfe2c032574))
+* Automated changes by GitLab pipeline [skip ci] ([2b8cea7](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/2b8cea79b743101860eb8ee5232bd41f97e38c23))
+* Automated changes by GitLab pipeline [skip ci] ([b6fdc37](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/b6fdc37f4c612ca6ccec378e571ab72f7b41ec24))
+
+### Update
+
+* added support for variant and price (#CX24-2186) ([5d2b029](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/5d2b029f3961c4fc82d83edd920195b493c8c551)), closes [#CX24-2186](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2186)
+* added variant label (#CX24-2186) ([75aaa1e](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/75aaa1e57b029c39dbf8a408760d289fcf172044)), closes [#CX24-2186](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2186)
+* map remaining equinox properties (CX24-2462) ([c0b4584](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/c0b45848e6e1b4b38de6e2755c1592e6429d1da9))
+* map remaining equinox properties (CX24-2462) ([29a73ff](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/29a73ffddf056d6bad14cb9b8587c790677ae955))
+* map remaining equinox properties (CX24-2462) ([dafe0c0](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/dafe0c0349207439d05ba0e45a71c8868a1d65bc))
+
+# [2.5.0-fix.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.0-fix.1...v2.5.0-fix.2) (2022-11-04)
+
+
+### Fix
+
+* update inventory label to match with master ([005b52c](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/005b52cd10063d9af6975315f37d8995d630eb66))
+
+# [2.5.0-fix.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.4.0...v2.5.0-fix.1) (2022-11-04)
+
+
+### Fix
+
+* use platform-specific values when initialized ([04d9c5e](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/04d9c5eb555b6a8304329ac63f1304dd61e5ecd2))
+
+### New
+
+* added support for inventory label (#CX24-2186) ([78e9385](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/78e9385432b6c8245061a450021fe9dd9da9b840)), closes [#CX24-2186](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2186)
+
+### Release
+
+* Automated changes by GitLab pipeline [skip ci] ([78b03b1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/78b03b1c22a09c29c39b926696f2e2141a1ecd1e))
+
+## [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)
+
+
+### Fix
+
+* platform agnostic updates to ns-product-lib ([d53659f](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/d53659f20ab708b1212dd5820be9321e6d1855a5))
+
+# [2.4.0](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.3.0...v2.4.0) (2022-10-26)
+## [2.3.1-fix.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.3.0...v2.3.1-fix.1) (2022-11-04)
+# [2.4.0](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.3.0...v2.4.0) (2022-10-26)
+
+
+### Fix
+
+* To make multiple products work (#CX24-2444) ([ce4c483](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/ce4c483b7fbb0527e60045d8174fd503a67e63fa)), closes [#CX24-2444](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2444)
+
 ### New
 
-* add support for product variant (#CX24-2467) ([3f5ad9e](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/3f5ad9e6c0f00bf40470dbb940a234d55a9ef451)), closes [#CX24-2467](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2467)
+* added support for inventory label (#CX24-2186) ([3e27481](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/3e2748106cd6098086dbd6b738964deabacc875d)), closes [#CX24-2186](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2186)
+
+### Release
+
+* Automated changes by GitLab pipeline [skip ci] ([8f75316](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/8f75316b692ddccda5b7bea830ee6dc625b942c7))
+* Automated changes by GitLab pipeline [skip ci] ([36dca5b](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/36dca5b92285ae6d8ae96345256df92102efad8e))
+
+### Update
+
+* added support for variant and price (#CX24-2186) ([e0bf8f2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/e0bf8f280a838dfa4cc613e5bc34d254dbdc8e1a)), closes [#CX24-2186](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2186)
+* added variant label (#CX24-2186) ([4c223b3](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/4c223b34438ed73cb824716cacb93482486f8195)), closes [#CX24-2186](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2186)
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> d53659f (Fix: platform agnostic updates to ns-product-lib)
+* use platform-specific values when initialized ([18de006](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/18de006211ab396f4d7fa40d0089c8e185d9cee9))
+* To make multiple products work (#CX24-2444) ([ce4c483](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/ce4c483b7fbb0527e60045d8174fd503a67e63fa)), closes [#CX24-2444](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2444)
+
+### New
+
+* added support for inventory label (#CX24-2186) ([3e27481](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/3e2748106cd6098086dbd6b738964deabacc875d)), closes [#CX24-2186](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2186)
+
+### Release
+
+* Automated changes by GitLab pipeline [skip ci] ([8f75316](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/8f75316b692ddccda5b7bea830ee6dc625b942c7))
+* Automated changes by GitLab pipeline [skip ci] ([36dca5b](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/36dca5b92285ae6d8ae96345256df92102efad8e))
+
+### Update
+
+* added support for variant and price (#CX24-2186) ([e0bf8f2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/e0bf8f280a838dfa4cc613e5bc34d254dbdc8e1a)), closes [#CX24-2186](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2186)
+* added variant label (#CX24-2186) ([4c223b3](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/4c223b34438ed73cb824716cacb93482486f8195)), closes [#CX24-2186](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2186)
+<<<<<<< HEAD
+=======
+>>>>>>> db13945 (Release: Automated changes by GitLab pipeline [skip ci])
+=======
+>>>>>>> d53659f (Fix: platform agnostic updates to ns-product-lib)
 
 # [2.3.0](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.2.0...v2.3.0) (2022-10-14)
 
@@ -41,6 +138,39 @@
 
 * replace runConfig and marketConfig parameters of getProductData with locale and market (CX24-2382) ([b7b8ac7](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/b7b8ac7fa946df0b3690f700d00f5acfb0073bcf))
 
+### Fix
+
+* To make multiple products work (#CX24-2444) ([1cbe500](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/1cbe5000d2649157de3bdb6456d601fdeecbd3b6)), closes [#CX24-2444](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2444)
+* To make multiple products work (#CX24-2444) ([b4c2218](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/b4c221853dca33f2c0b06a06d6ead7fc50e9f0c6)), closes [#CX24-2444](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2444)
+
+### Release
+
+* Automated changes by GitLab pipeline [skip ci] ([a974a24](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/a974a244a85ee42eca3540b88429d16edcbf57ce))
+* Automated changes by GitLab pipeline [skip ci] ([aa21d8d](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/aa21d8dcbed15a1c0798f882b4667bcc2bc071dc))
+
+### Update
+
+* updating the product data map (#CX24-2103) ([ea914a4](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/ea914a4079c2472adcd449fac09be85f22671493)), closes [#CX24-2103](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2103)
+
+# [2.0.0-cx24-21035.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.0.0-cx24-21035.1...v2.0.0-cx24-21035.2) (2022-09-22)
+
+
+### Fix
+
+* To make multiple products work (#CX24-2444) ([1cbe500](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/1cbe5000d2649157de3bdb6456d601fdeecbd3b6)), closes [#CX24-2444](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2444)
+* To make multiple products work (#CX24-2444) ([b4c2218](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/b4c221853dca33f2c0b06a06d6ead7fc50e9f0c6)), closes [#CX24-2444](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2444)
+
+### Release
+
+* Automated changes by GitLab pipeline [skip ci] ([aa21d8d](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/aa21d8dcbed15a1c0798f882b4667bcc2bc071dc))
+
+### Update
+
+* updating the product data map (#CX24-2103) ([ea914a4](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/ea914a4079c2472adcd449fac09be85f22671493)), closes [#CX24-2103](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2103)
+
+# [2.0.0-cx24-21035.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.0.0-cx24-21035.1...v2.0.0-cx24-21035.2) (2022-09-22)
+
+
 ### Fix
 
 * To make multiple products work (#CX24-2444) ([b4c2218](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/b4c221853dca33f2c0b06a06d6ead7fc50e9f0c6)), closes [#CX24-2444](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2444)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-product-lib",
-  "version": "2.4.0-cx24-2467.2.1",
+  "version": "2.4.0-cx24-2462.2.1",
   "description": "This project contains shared Product models and code between the backend and frontend.",
   "main": "src/index.js",
   "scripts": {
@@ -19,13 +19,14 @@
   "license": "ISC",
   "homepage": "https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/blob/master/README.md",
   "devDependencies": {
+    "axios-mock-adapter": "1.21.2",
     "eslint": "5.16.0",
     "eslint-config-google": "0.14.0",
     "eslint-config-prettier": "4.1.0",
     "eslint-plugin-json": "2.1.1",
     "eslint-plugin-prettier": "3.1.2",
-    "axios-mock-adapter": "1.18.2",
-    "jest": "25.1.0",
+    "jest": "26.0.1",
+    "jest-environment-jsdom": "26.0.1",
     "jest-sonar-reporter": "2.0.0",
     "prettier": "1.19.1"
   },

package/src/contentstack/contentstack.js

@@ -4,14 +4,51 @@ const { getEnvironmentFromUrl } = require('@nuskin/ns-common-lib');
 const config = require('./environment');
 
 // contentstack HTTP service
-const env = getEnvironmentFromUrl(window.location.host);
-const envConfig = config.getCredentials(env);
-const baseURL = `${envConfig.url}/stacks/${envConfig.apiKey}?environment=${envConfig.env}`;
-const headers = {
-  'access_token': `${envConfig.accessToken}`,
-  'Content-Type': 'application/json'
-};
-const http = axios.create({ baseURL, headers });
+const platform = usePlatformSpecificVariables();
+const http = axios.create({ baseURL: platform.baseURL, headers: platform.headers });
+
+// usePlatformVariables returns an object with platform-specific values; defaults to Lambda environment
+function usePlatformSpecificVariables() {
+  if (typeof window !== 'undefined') {
+    return useWebEnvironment();
+  }
+
+  if (typeof navigator !== 'undefined' && navigator.product === 'ReactNative') {
+    return useMobileEnvironment();
+  }
+
+  return useLambdaEnvironment();
+}
+
+function useWebEnvironment() {
+  console.log('web');
+  const env = getEnvironmentFromUrl(window.location.host);
+  const envConfig = config.getCredentials(env);
+  const baseURL = `${envConfig.url}/stacks/${envConfig.apiKey}?environment=${envConfig.env}`;
+  const headers = {
+    'access_token': `${envConfig.accessToken}`,
+    'Content-Type': 'application/json'
+  };
+
+  return { baseURL, env, headers }
+}
+
+function useMobileEnvironment() {
+  // ...
+}
+
+function useLambdaEnvironment() {
+  console.log('lambda');
+  const env = {};
+  const baseURL = `contentstack-call-for-lambda`;
+  const headers = {
+    'access_token': `contentstack-access-token-for-lambda`,
+    'Content-Type': 'application/json'
+  };
+
+  return { baseURL, env, headers }
+}
+
 
 // in-memory caching
 const cacheKeys = { aemConfig: 'aemConfig', equinoxMarkets: 'equinoxMarkets', kongUrl: 'kongUrl' };
@@ -19,7 +56,7 @@ const cacheTTLInSeconds = 30 * 1000;
 const cache = {
   [cacheKeys.aemConfig]: { data: null, ttl: Date.now() + cacheTTLInSeconds },
   [cacheKeys.equinoxMarkets]: { data: null, ttl: Date.now() + cacheTTLInSeconds },
-  [cacheKeys.kongUrl]: { data: null, ttl: Date.now() + cacheTTLInSeconds}
+  [cacheKeys.kongUrl]: { data: null, ttl: Date.now() + cacheTTLInSeconds }
 };
 
 /**
@@ -67,7 +104,7 @@ function getCachedData(key) {
 async function getAEMConfig() {
   try {
     if (isCacheExpired(cacheKeys.aemConfig)) {
-      const marketConfig = `market_config_${env}`;
+      const marketConfig = `market_config_${platform.env}`;
       const variables = { uid: 'blt52b0b83a89763791' };
       const query = `query AemConfigByUid($uid: String!) {
         aem_config(uid: $uid) {
@@ -114,7 +151,7 @@ async function getAEMConfig() {
 async function getEquinoxMarkets() {
   try {
     if (isCacheExpired(cacheKeys.equinoxMarkets)) {
-      const marketConfig = `${env}_markets`;
+      const marketConfig = `${platform.env}_markets`;
       const variables = { uid: 'blt5633ff9e560f14ef' };
       const query = `query EquinoxMarketsByUid($uid: String!) {
         equinox_markets(uid: $uid) {
@@ -151,7 +188,7 @@ async function getKongUrl() {
       const query = `query KongUrlByUid($uid: String!) {
           equinox_markets(uid: $uid) {
               kong_urls {
-                ${env}
+                ${platform.env}
             }
           }
         }`;
@@ -160,9 +197,9 @@ async function getKongUrl() {
         data: { variables, query }
       });
 
-      setCachedData(cacheKeys.kongUrl, data.equinox_markets.kong_urls[env]);
+      setCachedData(cacheKeys.kongUrl, data.equinox_markets.kong_urls[platform.env]);
     }
-    
+
     return getCachedData(cacheKeys.kongUrl);
   } catch (error) {
     console.error(error);
@@ -199,6 +236,7 @@ async function contentstackService(config) {
 
   try {
     const response = await http.post('', data);
+    console.log(response);
     return response.data
   } catch (error) {
     console.error(error.response.data.errors);

package/src/product.js

@@ -72,6 +72,10 @@ const Product = function(productData) {
   // agelocme stuff
   this.agelocme = null; // object containing agelocme information (like code, label, name)
 
+  //equinox inventory / stock label
+  //@example "IN STOCK"
+  this.inventory = "";
+
   this.setMarketAttributes = function(productStatus) {
     if (productStatus.marketAttributes) {
       this.marketAttributes = productStatus.marketAttributes;
@@ -518,6 +522,7 @@ const Product = function(productData) {
     retData.marketAttributes = this.marketAttributes;
     retData.restrictedMarkets = this.restrictedMarkets;
     retData.addOns = this.addOns;
+    retData.inventory = this.inventory;
 
     return retData;
   };
@@ -626,6 +631,7 @@ const Product = function(productData) {
       this.marketAttributes = productData.marketAttributes;
       this.addOns = productData.addOns || [];
       this.restrictedMarkets = productData.restrictedMarkets || [];
+      this.inventory = productData.inventory || "";
 
       if (data.priceType) {
         this.addPricing(data.priceType, data.price);

package/src/productData.js

@@ -30,7 +30,6 @@ const ProductData = {
     axios.defaults.withCredentials = true;
 
     const url = await contentstack.getKongUrl() + `/orchestrationservices/storefront/catalogs/search/`;
-    console.log("Dynamic URL", url)
     const href = `${url}?filter=${encodeURI(filter)}`;
     const response = await axios.request({
       method: 'get',
@@ -44,7 +43,7 @@ const ProductData = {
     });
 
     if (response.data.product) {
-      return this.eqProductMapper(response.data.product);
+      return this.eqProductMapper(response.data.product, skus);
     }
 
     return {
@@ -82,7 +81,7 @@ const ProductData = {
   /**
    * @param {contentstack.MarketConfig} marketConfig
    */
-  getLegacyRequestHeaders: function(marketConfig) {
+  getLegacyRequestHeaders: function (marketConfig) {
     return {
       'Content-Type': 'application/json',
       client_id: marketConfig.checkout_client_id,
@@ -96,7 +95,7 @@ const ProductData = {
    * @param {*} eqVariant
    * @returns Array<Product>
    */
-  eqProductVariantMapper : function (eqVariant) {
+  eqProductVariantMapper: function (eqVariant) {
 
     let imageURL = eqVariant.properties.imageURL;
     const regex = /\d+.\d+/
@@ -105,7 +104,7 @@ const ProductData = {
     if (imageURL.includes('contentstack')) {
       thumbnailImage = imageURL + '?width=40'
     } else {
-      thumbnailImage = imageURL.replace(regex,'40.40')
+      thumbnailImage = imageURL.replace(regex, '40.40')
     }
 
     return {
@@ -126,7 +125,7 @@ const ProductData = {
         }
       ],
       "thumbnail": thumbnailImage,
-      "ingredients": eqVariant.properties.ingredients,
+      ingredients: mapIngredients(eqVariant.properties.ingredients),
       "benefits": eqVariant.properties.benefits,
       "usage": eqVariant.properties.usage,
       "resources": eqVariant.properties.resources,
@@ -140,11 +139,11 @@ const ProductData = {
         }
       ],
       "scanQualified": eqVariant.properties.scanQualifiedCount,
-      "availableQuantity": 999,
+      "availableQuantity": eqVariant.inventoryProperties.atpQty,
       "maxQuantity": 999,
       "points": "",
-      "cv": (eqVariant.priceFacets.CV) ?  eqVariant.priceFacets.CV : '',
-      "pv":eqVariant.priceFacets.PV,
+      "cv": (eqVariant.priceFacets.CV) ? eqVariant.priceFacets.CV : '',
+      "pv": eqVariant.priceFacets.PV,
       "priceType": "WRTL",
       "price": eqVariant.priceFacets["Regular Price"],
       "priceMap": {
@@ -152,9 +151,9 @@ const ProductData = {
         "WADW-WRTL": eqVariant.priceFacets["Regular Price"],
         "WADR": 9999.01,
         "RTL": eqVariant.priceFacets["Regular Price"],
-        "WWHL": 9998.01,
+        "WWHL": eqVariant.priceFacets["Wholesale Price"],
         "WADW": 9998.01,
-        "WHL": 9998.01
+        "WHL": eqVariant.priceFacets["Wholesale Price"]
       },
       "cvMap": {
         "WWHL": (eqVariant.priceFacets.CV) ? eqVariant.priceFacets.CV : '',
@@ -189,9 +188,9 @@ const ProductData = {
       "shade": "",
       "status": this.switchStatusFromEquinox(eqVariant.properties.status),
       "variantType": "Other",
-      "variantDropdownLabel": "Select Type",
+      "variantDropdownLabel": eqVariant.properties.variantLabel || "",
       "variantDropdownPlaceholder": "Select Type",
-      "variantsLabel": "Select Type",
+      "variantsLabel": eqVariant.properties.variantLabel || "",
       "groupOffer": false,
       "personalOffer": false,
       "savedEventName": null,
@@ -211,10 +210,10 @@ const ProductData = {
     };
   },
 
-  eqProductMapper: function (productDataResponse) {
+  eqProductMapper: function (productDataResponse, skus) {
     let prod = [];
     let count = 0;
-    const variants = {};
+    let variants = {};
 
     let prodArr = productDataResponse.map((data) => {
       let imageURL = data.sku[count].properties.imageURL;
@@ -224,7 +223,7 @@ const ProductData = {
       if (imageURL.includes('contentstack')) {
         thumbnailImage = imageURL + '?width=40'
       } else {
-        thumbnailImage = imageURL.replace(regex,'40.40')
+        thumbnailImage = imageURL.replace(regex, '40.40')
       }
 
       if (data.sku && data.sku.length > 1) {
@@ -244,32 +243,33 @@ const ProductData = {
         "longDescr": data.properties.productDetailsDescription,
         "fullImage": imageURL,
         "imageAltText": data.properties.name,
-        "productCarouselImages": [
-          {
-            "contentType": "img",
-            "src": "/content/products/24/00/35/24003529/jcr:content/fullImage.imgw.1280.1280.png",
-            "alt": ""
-          }
-        ],
+        productCarouselImages: data.sku[count].properties.productImages
+          ? JSON.parse(data.sku[count].properties.productImages).map(img => (
+            {
+              contentType: /\.jpg/i.test(img.url) ? 'img' : 'video',
+              src: img.url,
+              alt: img.alt
+            }
+          )) : [],
         "thumbnail": thumbnailImage,
-        "ingredients": data.properties.ingredients,
-        "benefits": data.properties.benefits,
-        "usage": data.properties.usage,
-        "resources": data.sku[count].properties.resources,
+        ingredients: mapIngredients(data.properties.ingredients),
+        benefits: mapBenefits(data.properties.benefits),
+        usage: mapUsage(data.properties.usage),
+        resources: mapResources(data.properties.resources),
         "videos": "",
         "movie": "",
         "youtube": "",
         "salesEventText": "",
         "contentSection": [
           {
-            "sectionContent": "<div class=\"contentSections\"><div class=\"contentSection section\"><div>\n<h3>BENEFITS</h3>\n<div>\n<div class=\"sectionContent parsys\"><div class=\"text parbase section\">\n<p>Green tea has been used in China for thousands of years for its health-preserving and revitalizing power. Modern science has identified powerful antioxidants in green tea called polyphenols. One group of polyphenols called catechins is particularly potent and is highly effective at neutralizing free radicals at the cellular level. Catechins support healthy cell function while providing antioxidant protection to critical cell structures such as DNA. Clinical studies show catechins interfere with the production of certain enzymes involved in cell damage. Additionally, catechins have been demonstrated to cause a thermogenic effect that enhances the body s metabolic rate. Tegreen 97<sup>®</sup> from Pharmanex is a proprietary, highly concentrated extract of the catechins found in green tea. Tegreen 97<sup>®</sup> is one of the most potent antioxidant supplements on the market with a 97 percent polyphenol content, 65% catechins. Each Tegreen 97<sup>®</sup> capsule contains the catechin equivalent of approximately seven cups of green tea and is 99.5 percent caffeine free.</p>\r\n\n</div>\n\n</div>\n\n</div>\n</div>\n</div>\n<div class=\"contentSection section\"><div>\n<h3>USAGE</h3>\n<div>\n<div class=\"sectionContent parsys\"><div class=\"text parbase section\">\n<p>As a dietary supplement, take one (1) to four (4) capsules daily; preferably one (1) to two (2) each morning and evening with food. Store in a cool, dry place.</p>\r\n\n</div>\n\n</div>\n\n</div>\n</div>\n</div>\n<div class=\"contentSection section\"><div>\n<h3>INGREDIENTS</h3>\n<div>\n<div class=\"sectionContent parsys\"><div class=\"text parbase section\">\n<table border=\"1\" cellspacing=\"1\" cellpadding=\"0\" width=\"360\"><tbody>\r\n<tr>\r\n<td><b>Nutritional Facts</b></td>\r\n<td><b>Amount</b></td>\r\n<td><b>% Daily Value</b></td>\r\n</tr>\r\n<tr>\r\n<td colspan=\"3\"><b>Serving Size: 1 Capsule<br>\r\nServings Per Container: 120</b></td>\r\n</tr>\r\n<tr>\r\n<td width=\"55%\">Green tea leaf (20:1) Extract (<i>Camellia sinensis</i></td>\r\n<td width=\"20%\">250 mg</td>\r\n<td width=\"25%\">&nbsp;</td>\r\n</tr>\r\n<tr>\r\n<td width=\"55%\" colspan=\"3\">* Daily Value not established</td>\r\n</tr>\r\n<tr>\r\n<td width=\"55%\" colspan=\"3\"><b>Other Ingredients: Gelatin, Silicon Dioxide, Microcrystalline Cellulose, Magnesium Stearate.</b></td>\r\n</tr>\r\n</tbody>\r\n</table>\r\n<p>&nbsp;</p>\r\n\n</div>\n\n</div>\n\n</div>\n</div>\n</div>\n</div>\n"
+            "sectionContent": "<div class=\"contentSections\"></div>\n"
           }
         ],
         "scanQualified": data.properties.scanQualifiedCount,
-        "availableQuantity": 999,
+        "availableQuantity": data.sku[count].inventoryProperties.atpQty,
         "maxQuantity": 999,
         "points": "",
-        "cv": (data.sku[count].priceFacets.CV) ?  data.sku[count].priceFacets.CV : '',
+        "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"],
@@ -278,9 +278,9 @@ const ProductData = {
           "WADW-WRTL": data.sku[count].priceFacets["Regular Price"],
           "WADR": 9999.01,
           "RTL": data.sku[count].priceFacets["Regular Price"],
-          "WWHL":  data.sku[count].priceFacets["Regular Price"],
           "WADW": 9998.01,
-          "WHL":  data.sku[count].priceFacets["Regular Price"]
+          "WHL": data.sku[count].priceFacets["Wholesale Price"],
+          "WWHL": data.sku[count].priceFacets["Wholesale Price"]
         },
         "cvMap": {
           "WWHL": (data.sku[count].priceFacets.CV) ? data.sku[count].priceFacets.CV : '',
@@ -317,9 +317,9 @@ const ProductData = {
         "shade": "",
         "status": this.switchStatusFromEquinox(data.sku[count].properties.productStatus),
         "variantType": "Other",
-        "variantDropdownLabel": "Select Type",
+        "variantDropdownLabel": data.sku[count].properties.variantLabel || "",
         "variantDropdownPlaceholder": "Select Type",
-        "variantsLabel": "Select Type",
+        "variantsLabel": data.sku[count].properties.variantLabel || "",
         "groupOffer": false,
         "personalOffer": false,
         "savedEventName": null,
@@ -336,14 +336,16 @@ const ProductData = {
           "earn": true
         },
         "restrictedMarkets": [],
-        "addOns": []
+        "addOns": [],
+        "inventory": data.sku[count].inventory || "" //inventory label
+
       };
       let newProduct = new Product(prod);
       return newProduct
     })
 
     let data = {
-      products: prodArr,
+      products: this._sortProductsBySku(skus, prodArr),
       count: productDataResponse.length
     };
     return {
@@ -394,6 +396,92 @@ const ProductData = {
     if (custType.includes('Preferred Customer/Member'))
       newCustType.push(30)
     return newCustType.toString()
+  },
+
+  /**
+   * 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
+   */
+
+  _sortProductsBySku: function (skus, products) {
+
+    if (!skus || !products || products.length === 1) {
+      return products
+    }
+
+    return products.sort(function (a, b) {
+      return skus.indexOf(a.sku) - skus.indexOf(b.sku);
+    });
+
+  }
+}
+
+function mapBenefits(benefits) {
+  if (!benefits) {
+    return {};
+  }
+
+  const list = JSON.parse(benefits)
+    .map(item => item.benefits.map(benefit => benefit).join(''))
+    .join('');
+
+  return {
+    benefitsHTML: list,
+    benefitsText: 'Benefits',
+    benefitItems: []
+  };
+}
+
+function mapIngredients(ingredients) {
+  if (!mapIngredients) {
+    return {};
+  }
+
+  // concatenating the name, description, keyIngredients, and otherIngredients
+  const list = JSON.parse(ingredients)
+    .map(i => [
+      i.keyIngredients
+        .map(k => `<img src="${k.image.url}" alt="${k.image.alt}" /> ${k.name} ${k.description}`)
+        .join(' '),
+      i.otherIngredients
+    ].join(' '))
+    .join(' ');
+
+  return {
+    ingredientsHTML: list,
+    ingredientsText: 'Ingredients',
+    ingredients: []
+  }
+}
+
+function mapResources(resources) {
+  if (!resources) {
+    return {};
+  }
+
+  const text = JSON.parse(resources)
+    .map(res => `<p><a href="${res.url}" target="_blank">${res.title}</a></p>`)
+    .join('');
+
+  return {
+    resourcesHTML: text,
+    resourcesText: 'Resources',
+    resourceLinks: []
+  }
+}
+
+function mapUsage(usage) {
+  if (!usage) {
+    return {};
+  }
+
+  const text = JSON.parse(usage).additionalText
+    .map(t => t).join('');
+
+  return {
+    usageHTML: text,
+    usageText: 'Usage'
   }
 }