@nuskin/ns-product-lib 2.5.0-cx24-2462.1.2 → 2.5.0-cx24-2862.1

package/CHANGELOG.md

@@ -1,28 +1,17 @@
-# [2.5.0-cx24-2462.1.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.0-cx24-2462.1.1...v2.5.0-cx24-2462.1.2) (2022-11-08)
+# [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
 
-* map remaining equinox properties (CX24-2462) ([66e320d](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/66e320dfcf0b9e35f7fb2adeb1cdfe5308f51850))
+* 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.5.0-cx24-2462.1.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-2462.1.1) (2022-11-07)
-
-
-### Release
-
-* Automated changes by GitLab pipeline [skip ci] ([62c7b7d](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/62c7b7d38d24f3f267c859ae7f16af55f8d950f1))
-
-### Update
-
-* map product images to carousel images (CX24-2462) ([1e17c6e](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/1e17c6ec39e54b4bdb2bb804c997eb14c9e501d5))
-* map remaining equinox properties (CX24-2462) ([dafe0c0](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/dafe0c0349207439d05ba0e45a71c8868a1d65bc))
-
-## [2.4.2-CX24.2.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.4.1...v2.4.2-CX24.2.1) (2022-11-07)
+## [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 ([82611ca](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/82611cab93c990ed1ce05690feb9d00967090dea))
+* [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)
 
@@ -62,13 +51,10 @@
 
 * 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)
 
-<<<<<<< HEAD
-=======
 ### 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)
 
->>>>>>> CX24.2
 ### Release
 
 * Automated changes by GitLab pipeline [skip ci] ([8f75316](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/8f75316b692ddccda5b7bea830ee6dc625b942c7))
@@ -76,9 +62,6 @@
 
 ### Update
 
-<<<<<<< HEAD
-* map product images to carousel images (CX24-2462) ([1e17c6e](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/1e17c6ec39e54b4bdb2bb804c997eb14c9e501d5))
-=======
 * 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)
 * use platform-specific values when initialized ([18de006](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/18de006211ab396f4d7fa40d0089c8e185d9cee9))
@@ -97,7 +80,6 @@
 
 * 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)
->>>>>>> CX24.2
 
 # [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)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-product-lib",
-  "version": "2.5.0-cx24-2462.1.2",
+  "version": "2.5.0-cx24-2862.1",
   "description": "This project contains shared Product models and code between the backend and frontend.",
   "main": "src/index.js",
   "scripts": {

package/src/productData.js

@@ -81,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,
@@ -95,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+/
@@ -104,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 {
@@ -125,7 +125,7 @@ const ProductData = {
         }
       ],
       "thumbnail": thumbnailImage,
-      ingredients: mapIngredients(eqVariant.properties.ingredients),
+      "ingredients": eqVariant.properties.ingredients,
       "benefits": eqVariant.properties.benefits,
       "usage": eqVariant.properties.usage,
       "resources": eqVariant.properties.resources,
@@ -142,17 +142,17 @@ const ProductData = {
       "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": {
         "WRTL": eqVariant.priceFacets["Regular Price"],
         "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": {
@@ -188,9 +188,9 @@ const ProductData = {
       "shade": "",
       "status": this.switchStatusFromEquinox(eqVariant.properties.status),
       "variantType": "Other",
-      "variantDropdownLabel": eqVariant.properties.variantLabel || "",
+      "variantDropdownLabel": eqVariant.properties.variantLabel  ||  "",
       "variantDropdownPlaceholder": "Select Type",
-      "variantsLabel": eqVariant.properties.variantLabel || "",
+      "variantsLabel": eqVariant.properties.variantLabel  ||  "",
       "groupOffer": false,
       "personalOffer": false,
       "savedEventName": null,
@@ -223,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) {
@@ -243,19 +243,18 @@ const ProductData = {
         "longDescr": data.properties.productDetailsDescription,
         "fullImage": imageURL,
         "imageAltText": data.properties.name,
-        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
-            }
-          )) : [],
+        "productCarouselImages": [
+          {
+            "contentType": "img",
+            "src": "/content/products/24/00/35/24003529/jcr:content/fullImage.imgw.1280.1280.png",
+            "alt": ""
+          }
+        ],
         "thumbnail": thumbnailImage,
-        ingredients: mapIngredients(data.properties.ingredients),
-        benefits: mapBenefits(data.properties.benefits),
-        usage: mapUsage(data.properties.usage),
-        resources: mapResources(data.properties.resources),
+        "ingredients": data.properties.ingredients,
+        "benefits": data.properties.benefits,
+        "usage": data.properties.usage,
+        "resources": data.sku[count].properties.resources,
         "videos": "",
         "movie": "",
         "youtube": "",
@@ -269,16 +268,16 @@ const ProductData = {
         "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"],
         "priceMap": {
           "WRTL": data.sku[count].priceFacets["Regular Price"],
           "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"]
         },
@@ -317,9 +316,9 @@ const ProductData = {
         "shade": "",
         "status": this.switchStatusFromEquinox(data.sku[count].properties.productStatus),
         "variantType": "Other",
-        "variantDropdownLabel": data.sku[count].properties.variantLabel || "",
+        "variantDropdownLabel": data.sku[count].properties.variantLabel  ||  "",
         "variantDropdownPlaceholder": "Select Type",
-        "variantsLabel": data.sku[count].properties.variantLabel || "",
+        "variantsLabel": data.sku[count].properties.variantLabel  ||  "",
         "groupOffer": false,
         "personalOffer": false,
         "savedEventName": null,
@@ -406,82 +405,16 @@ const ProductData = {
 
   _sortProductsBySku: function (skus, products) {
 
-    if (!skus || !products || products.length === 1) {
+    if(!skus || !products || products.length === 1) {
       return products
     }
 
-    return products.sort(function (a, b) {
+    const sortedProducts = 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 sortedProducts
 
-  return {
-    usageHTML: text,
-    usageText: 'Usage'
   }
 }