@nuskin/ns-product-lib 2.9.0-cx24-4460.2 → 2.9.0-cx24-4377.1

package/CHANGELOG.md

@@ -1,18 +1,30 @@
-# [2.9.0-cx24-4460.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.9.0-cx24-4460.1...v2.9.0-cx24-4460.2) (2023-06-21)
+# [2.9.0-cx24-4377.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.8.3-cx24-4377.1...v2.9.0-cx24-4377.1) (2023-07-03)
 
 
-### New
+### Update
 
-* Change API Base URLs for My Site ([f6e2cbf](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/f6e2cbf3ce9bcbd1c8fa85c53b8000de8048d3fc))
-* Change API Base URLs for My Site ([5621d64](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/5621d64be86d75c91837e11ca8f4267c49707971))
+* added showWholesalePrice in the header for product search (#CX24-4377) ([dc18916](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/dc189169241eb869caf69407767c7a6ab3c18438)), closes [#CX24-4377](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-4377)
 
-# [2.9.0-cx24-4460.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.8.0...v2.9.0-cx24-4460.1) (2023-06-20)
+## [2.8.3-cx24-4377.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.8.2...v2.8.3-cx24-4377.1) (2023-06-27)
 
 
-### New
+### Fix
+
+* adr promotion pricing (#CX24-4377) ([c1ea833](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/c1ea833d5b80da366e3dd0bd45cefcb18d096a34)), closes [#CX24-4377](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-4377)
+
+## [2.8.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.8.1...v2.8.2) (2023-06-21)
+
+
+### Fix
+
+* added shopping context checking ([8714953](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/8714953113f4f1970cacd4f4f6b59ecc61e767eb))
+
+## [2.8.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.8.0...v2.8.1) (2023-05-23)
+
+
+### Fix
 
-* Change API Base URLs for My Site ([fb2e309](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/fb2e30953e6e9089da20ac367bad9bf63300a89c))
-* Change API Base URLs for My Site ([1f9ba11](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/1f9ba11f63ef85e9a444e39080e9277a41fa004d))
+* Multiple variants add to cart not adding correct sku ([968ed05](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/968ed055b5f5024579ac256f26c0d58ba409fcb9))
 
 # [2.8.0](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.7.1...v2.8.0) (2023-05-02)
 

package/package.json

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

package/src/productData.js

@@ -57,6 +57,12 @@ const ProductData = {
   searchEquinoxProduct: async function (skus, locale, config) {
     let skuFilter = [];
 
+    const shoppingContext = window && window.aem && window.aem.ShoppingContext && window.aem.ShoppingContext.getShoppingContext();
+
+    if ((shoppingContext && shoppingContext.context === 'storefront') || window.location.hostname.includes(".mynuskin.com")) {
+      config.API_Base_URLs = config.MySite_API_Base_URLs
+    }
+
     if (Array.isArray(skus)) {
       skus.forEach((sku) => {
         skuFilter.push(`index_key_productId="${sku}" OR index_key_skuId="${sku}"`)
@@ -68,10 +74,7 @@ const ProductData = {
 
     const filter = skuFilter.join(" OR ")
 
-    let url = `${config.API_Base_URLs}/orchestrationservices/storefront/catalogs/search/`;
-    if (window && window.aem && window.aem.ShoppingContext && window.aem.ShoppingContext.getShoppingContext().context === 'storefront') {
-      url = `${config.MySite_API_Base_URLs}/orchestrationservices/storefront/catalogs/search/`;
-    }
+    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({
@@ -81,7 +84,7 @@ const ProductData = {
         locale,
         storeId: config.store_id
       },
-      headers: this.getEquinoxRequestHeaders(),
+      headers: this.getEquinoxRequestHeaders({shoppingContext}),
       responseType: 'json',
       withCredentials: true
     });
@@ -90,10 +93,16 @@ const ProductData = {
     return response;
   },
 
-  getEquinoxRequestHeaders() {
-    return {
+  getEquinoxRequestHeaders(option) {
+    const header = {
       'Content-Type': 'application/json'
-    };
+    }
+
+    if (option.shoppingContext &&  option.shoppingContext.overrides) {
+      header.showwholesalepricing = option.shoppingContext.overrides.showWholeSalePricing;
+    }
+
+    return header;
   },
 
   getProductFromLegacy: async function (skus, locale) {
@@ -257,10 +266,10 @@ const ProductData = {
       "priceMap": {
         "WRTL": productPrice,
         "WADW-WRTL": productPrice,
-        "WADR": productPrice,
+        "WADR": productPrice, //retail ADR (subscription) price
         "RTL": productPrice,
         "WWHL": wholeSalePrice,
-        "WADW": wholeSalePrice,
+        "WADW": discountedPrice,//wholesale ADR (subscription price)
         "WHL": wholeSalePrice
       },
       "cvMap": {
@@ -367,8 +376,9 @@ const ProductData = {
         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' : ''
-
+        let thumbnailImage = imageURL ? imageURL + '?width=40' : '';
+        let productTitle = productData.properties.name;
+        let productSku = product.identifier
 
         if (productData.sku && productData.sku.length > 1) {
           // exclude base product from variants
@@ -376,6 +386,9 @@ const ProductData = {
             variants[variant.identifier] = this.eqProductVariantMapper(variant);
             return variant;
           });
+          const productArr = productData.sku.filter(p => p.default === true)
+          productTitle = productArr[0].properties.name;
+          productSku = productArr[0].identifier
         }
 
         const {
@@ -397,9 +410,9 @@ const ProductData = {
         product.availableQuantity = mapAvailableQuantity(product);
         product = {
           ...product,
-          "sku": product.identifier,
+          "sku": productSku,
           "globalProductID": productData.identifier,
-          "title": productData.properties.name,
+          "title": productTitle,
           "country": product.properties.market,
           "language": "en",
           "shortDescr": productData.properties.description,
@@ -437,9 +450,9 @@ const ProductData = {
           "priceMap": {
             "WRTL": productPrice, //regular | retail price
             "WADW-WRTL": productPrice,
-            "WADR": productPrice,
+            "WADR": productPrice, //retail ADR (subscription price)
             "RTL": productPrice,
-            "WADW": wholeSalePrice,
+            "WADW": discountedPrice,//wholesale ADR (subscription price)
             "WHL": wholeSalePrice,
             "WWHL": wholeSalePrice
           },