@nuskin/ns-product-lib 2.7.2-cx24-3684.1 → 2.7.2-cx24-3964.1

package/CHANGELOG.md

@@ -1,18 +1,9 @@
-## [2.7.2-cx24-3684.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.7.1...v2.7.2-cx24-3684.1) (2023-04-16)
+## [2.7.2-cx24-3964.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.7.1...v2.7.2-cx24-3964.1) (2023-04-28)
 
 
 ### Fix
 
-* added event pricing (#CX24-3684) ([49d1467](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/49d1467eecb69437adb16e9c85d07c52dca21d26)), closes [#CX24-3684](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3684)
-* added event pricing (#CX24-3684) ([fca7e9b](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/fca7e9b9f01d99682ddff162db40b4a727d018c1)), closes [#CX24-3684](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3684)
-* Rebased to master ([65b08a7](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/65b08a7d2ed14ae431ac2a9218ad138716c5ea1c))
-* set original price as wholesale price (#CX24-3684) ([047c01c](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/047c01c04a7ba6b9b1a2a30d997574460fda36ea)), closes [#CX24-3684](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3684)
-* set original price as wholesale price (#CX24-3684) ([e1d5650](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/e1d5650da1bee59b19977c9af5da58b6ff08485d)), closes [#CX24-3684](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3684)
-
-### Release
-
-* Automated changes by GitLab pipeline [skip ci] ([edf7159](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/edf7159c70c164b5511f8d9a19d49663dad75296))
-* Automated changes by GitLab pipeline [skip ci] ([0a2a6a0](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/0a2a6a00edb579cf167928e0e9dd2d82089124a3))
+* Products in sales event not showing adjusted price and sales ribbon #CX24-3964 ([1242901](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/124290157798010c82b5e30a273b342fe707e884)), closes [#CX24-3964](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-3964)
 
 ## [2.7.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.7.0...v2.7.1) (2023-04-15)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-product-lib",
-  "version": "2.7.2-cx24-3684.1",
+  "version": "2.7.2-cx24-3964.1",
   "description": "This project contains shared Product models and code between the backend and frontend.",
   "main": "src/index.js",
   "scripts": {
@@ -33,7 +33,7 @@
   "dependencies": {
     "@nuskin/configuration-sdk": "2.2.3",
     "@nuskin/ns-common-lib": "1.4.5",
-    "@nuskin/ns-util": "4.3.2",
+    "@nuskin/ns-util": "4.4.0",
     "axios": "0.27.2",
     "qs": "6.11.0"
   },

package/src/product.js

@@ -75,7 +75,7 @@ const Product = function (productData) {
   //equinox inventory / stock label
   //@example "IN STOCK"
   this.inventory = "";
-
+  
   // equinox specific properties
   this.equinoxProductId = "";
   this.properties = {};
@@ -262,7 +262,6 @@ const Product = function (productData) {
 
     if (option.isEqPromotion) {
       //retain product.price as original price
-      this.setPrice(this.getPricing(priceType));
       this.setCv(this.getCvWithType(priceType));
       this.setPv(this.getPvWithType(priceType));
       this.priceType = priceType;

package/src/productData.js

@@ -48,11 +48,11 @@ const ProductData = {
   },
 
   /**
-   *
-   * @param {string[]} skus
-   * @param {string} locale
-   * @param {ConfigMap} config
-   * @returns
+   * 
+   * @param {string[]} skus 
+   * @param {string} locale 
+   * @param {ConfigMap} config 
+   * @returns 
    */
   searchEquinoxProduct: async function (skus, locale, config) {
     let skuFilter = [];
@@ -140,7 +140,6 @@ const ProductData = {
     const discountedPrice = eventName ? computedPrice : eqVariant.priceFacets["Regular Price"];
     const productCVPrice = eventName ? CVPrice : eqVariant.priceFacets.CV;
     const productPVPrice = eventName ? PVPrice : eqVariant.priceFacets.PV;
-    const wholeSalePrice = eventName ? defaultProductPrice : eqVariant.priceFacets["Wholesale Price"];
 
     return {
       "sku": eqVariant.identifier,
@@ -253,12 +252,12 @@ const ProductData = {
       "price": discountedPrice,
       "priceMap": {
         "WRTL": productPrice,
-        "WADW-WRTL": productPrice,
-        "WADR": productPrice,
-        "RTL": productPrice,
-        "WWHL": wholeSalePrice,
-        "WADW": wholeSalePrice,
-        "WHL": wholeSalePrice
+        "WADW-WRTL": eqVariant.priceFacets["Regular Price"],
+        "WADR": eqVariant.priceFacets["Regular Price"],
+        "RTL": eqVariant.priceFacets["Regular Price"],
+        "WWHL": eqVariant.priceFacets["Wholesale Price"],
+        "WADW": eqVariant.priceFacets["Wholesale Price"],
+        "WHL": eqVariant.priceFacets["Wholesale Price"]
       },
       "cvMap": {
         "WWHL": productCVPrice,
@@ -388,11 +387,9 @@ const ProductData = {
           PVPrice
         } = this.getEqProductPromotions(product);
         const productPrice = eventName ? defaultProductPrice : product.priceFacets["Regular Price"];
-        const discountedPrice = eventName ? computedPrice : product.priceFacets["Wholesale Price"];
+        const discountedPrice = eventName ? computedPrice : product.priceFacets["Regular Price"];
         const productCVPrice = eventName ? CVPrice : product.priceFacets.CV;
         const productPVPrice = eventName ? PVPrice : product.priceFacets.PV;
-        const wholeSalePrice = eventName ? defaultProductPrice : product.priceFacets["Wholesale Price"];
-
 
         product.childSkus = await this.fetchChildSkus(product);
         product.availableQuantity = mapAvailableQuantity(product);
@@ -436,13 +433,13 @@ const ProductData = {
           "priceType": "WRTL",
           "price": discountedPrice,
           "priceMap": {
-            "WRTL": productPrice, //regular | retail price
-            "WADW-WRTL": productPrice,
-            "WADR": productPrice,
-            "RTL": productPrice,
-            "WADW": wholeSalePrice,
-            "WHL": wholeSalePrice,
-            "WWHL": wholeSalePrice
+            "WRTL": productPrice,
+            "WADW-WRTL": product.priceFacets["Regular Price"],
+            "WADR": product.priceFacets["Regular Price"],
+            "RTL": product.priceFacets["Regular Price"],
+            "WADW": product.priceFacets["Wholesale Price"],
+            "WHL": product.priceFacets["Wholesale Price"],
+            "WWHL": product.priceFacets["Wholesale Price"]
           },
           "cvMap": {
             "WWHL": productCVPrice,