@nuskin/ns-product-lib 2.9.0-mysitedomainfix.3 → 2.9.0

package/CHANGELOG.md

@@ -1,42 +1,37 @@
-# [2.9.0-mysitedomainfix.3](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.9.0-mysitedomainfix.2...v2.9.0-mysitedomainfix.3) (2023-06-21)
+# [2.9.0](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.8.2...v2.9.0) (2023-07-05)
 
 
 ### Update
 
-* added hostname as condition on switching domains ([af0d628](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/af0d6289cb9c722c887f9b027b66db1cacb1dd5a))
+* added showWholeSalePricing flag in search api header (#CX24-4377) ([3fdd834](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/3fdd83481637428d9ccf287d3c5d1c0e85fd1f32)), closes [#CX24-4377](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-4377)
 
-# [2.9.0-mysitedomainfix.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.9.0-mysitedomainfix.1...v2.9.0-mysitedomainfix.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)
 
 
-### Fix
-
-* for PO use nuskin.com domain ([3596e90](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/3596e902ef15e3f2d9d15242edfcc423571e6ca3))
-
 ### Update
 
-* adjust unit testing for searchEquinoxProduct ([30c2732](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/30c2732d9e7dfc793493eb30594abff068ba0207))
+* 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-mysitedomainfix.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.9.0-cx24-4460.1...v2.9.0-mysitedomainfix.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)
 
 
 ### Fix
 
-* added the logic to change the domain using the shopping context. ([91449cb](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/91449cb1463eaacb0bc80ba4308c4c8fb6ace777))
-* changing the equinox api domain so that it stays on the same domain as the mysite domain ([b3e672a](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/b3e672a4dae57012cf61d9a1f4454eaab674c3e7))
-* 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))
+* 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)
 
-### Release
+## [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)
 
-* Automated changes by GitLab pipeline [skip ci] ([679e474](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/679e474ad639ca2cf57652acc8fe71db85fac6fc))
-* Automated changes by GitLab pipeline [skip ci] ([5500a55](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/5500a550253e487b79045a9b5f5403bc93c3ee5a))
 
-# [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)
+### 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)
 
-### New
 
-* 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))
+### Fix
+
+* 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-mysitedomainfix.3",
+  "version": "2.9.0",
   "description": "This project contains shared Product models and code between the backend and frontend.",
   "main": "src/index.js",
   "scripts": {
@@ -19,14 +19,13 @@
   "license": "ISC",
   "homepage": "https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/blob/master/README.md",
   "devDependencies": {
-    "@babel/preset-env": "^7.22.5",
     "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",
-    "jest": "29.5.0",
+    "jest": "29.2.2",
     "jest-environment-jsdom": "29.2.2",
     "jest-sonar-reporter": "2.0.0",
     "prettier": "1.19.1"
@@ -34,6 +33,7 @@
   "dependencies": {
     "@nuskin/configuration-sdk": "2.2.3",
     "@nuskin/ns-common-lib": "1.4.5",
+    "@nuskin/ns-util": "4.3.2",
     "axios": "0.27.2",
     "qs": "6.11.0"
   },

package/src/productData.js

@@ -57,7 +57,9 @@ const ProductData = {
   searchEquinoxProduct: async function (skus, locale, config) {
     let skuFilter = [];
 
-    if ((window && window.aem && window.aem.ShoppingContext && window.aem.ShoppingContext.getShoppingContext().context === 'storefront') || window.location.hostname.includes(".mynuskin.com")) {
+    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
     }
 
@@ -82,7 +84,7 @@ const ProductData = {
         locale,
         storeId: config.store_id
       },
-      headers: this.getEquinoxRequestHeaders(),
+      headers: this.getEquinoxRequestHeaders({shoppingContext}),
       responseType: 'json',
       withCredentials: true
     });
@@ -91,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) {
@@ -258,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": {
@@ -442,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
           },