@nuskin/ns-product-lib 2.6.2-cx24-3563.1 → 2.6.2-cx24-3563.2

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [2.6.2-cx24-3563.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.2-cx24-3563.1...v2.6.2-cx24-3563.2) (2023-03-20)
+
+
+### Fix
+
+* Discounted PV CV are not displayed in MySite admin and home pages ([9f18046](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/9f1804639da01173d9da43c2713654243386ec56))
+* Discounted PV CV are not displayed in MySite admin and home pages ([b1684da](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/b1684dada7851f910548e29ec1e2463cca55c738))
+
 ## [2.6.2-cx24-3563.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.1...v2.6.2-cx24-3563.1) (2023-03-18)
 
 

package/package.json

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

package/src/productData.js

@@ -133,9 +133,11 @@ const ProductData = {
     let thumbnailImage = imageURL ? imageURL + '?width=40' : ''
 
 
-    const { eventName, eventLabels, computedPrice, defaultProductPrice } = this.getEqProductPromotions(eqVariant);
+    const { eventName, eventLabels, computedPrice, defaultProductPrice, CVPrice, PVPrice } = this.getEqProductPromotions(eqVariant);
     const productPrice = eventName ? defaultProductPrice : eqVariant.priceFacets["Regular Price"];
     const discountedPrice = eventName ? computedPrice : eqVariant.priceFacets["Regular Price"];
+    const productCVPrice = eventName ? CVPrice : eqVariant.priceFacets.CV;
+    const productPVPrice = eventName ? PVPrice : eqVariant.priceFacets.PV;
 
     return {
       "sku": eqVariant.identifier,
@@ -242,8 +244,8 @@ const ProductData = {
       "availableQuantity": eqVariant.inventoryProperties.atpQty,
       "maxQuantity": 999,
       "points": "",
-      "cv": (eqVariant.priceFacets.CV) ? eqVariant.priceFacets.CV : '',
-      "pv": eqVariant.priceFacets.PV,
+      "cv": productCVPrice,
+      "pv": productPVPrice,
       "priceType": "WRTL",
       "price": discountedPrice,
       "priceMap": {
@@ -256,14 +258,14 @@ const ProductData = {
         "WHL": eqVariant.priceFacets["Wholesale Price"]
       },
       "cvMap": {
-        "WWHL": (eqVariant.priceFacets.CV) ? eqVariant.priceFacets.CV : '',
-        "WADW": (eqVariant.priceFacets.CV) ? eqVariant.priceFacets.CV : '',
-        "WHL": (eqVariant.priceFacets.CV) ? eqVariant.priceFacets.CV : ''
+        "WWHL": productCVPrice,
+        "WADW": productCVPrice,
+        "WHL": productCVPrice
       },
       "pvMap": {
-        "WWHL": eqVariant.priceFacets.PV,
-        "WADW": eqVariant.priceFacets.PV,
-        "WHL": eqVariant.priceFacets.PV
+        "WWHL": productPVPrice,
+        "WADW": productPVPrice,
+        "WHL": productPVPrice
       },
       "orderTypes": this._setOrderType(eqVariant.properties),
       "custTypes": this.switchCustType(eqVariant.properties.customerTypes),
@@ -320,6 +322,16 @@ const ProductData = {
     const computedPrice = product.totalValue && product.totalValue.priceAfterDiscount
       ? product.totalValue.priceAfterDiscount
       : 0;
+
+    let CVPrice = 0,
+      PVPrice = 0;
+    
+    if(product.totalValue && product.totalValue.priceFacets) {
+      const productPriceFacets = product.totalValue.priceFacets;
+      CVPrice = productPriceFacets.CV && productPriceFacets.CV.CVAfterDiscount ? productPriceFacets.CV.CVAfterDiscount : 0;
+      PVPrice = productPriceFacets.PV && productPriceFacets.PV.PVAfterDiscount ? productPriceFacets.PV.PVAfterDiscount : 0;
+    }
+
     let eventName = "";
     const eventLabels = [];
 
@@ -333,7 +345,9 @@ const ProductData = {
       eventLabels: eventLabels.join(','),
       defaultProductPrice,
       computedPrice,
-      eventName
+      eventName,
+      CVPrice,
+      PVPrice
     }
   },
 
@@ -361,10 +375,14 @@ const ProductData = {
           eventName,
           eventLabels,
           computedPrice,
-          defaultProductPrice
+          defaultProductPrice,
+          CVPrice,
+          PVPrice
         } = this.getEqProductPromotions(product);
         const productPrice = eventName ? defaultProductPrice : product.priceFacets["Regular Price"];
         const discountedPrice = eventName ? computedPrice : product.priceFacets["Regular Price"];
+        const productCVPrice = eventName ? CVPrice : product.priceFacets.CV;
+        const productPVPrice = eventName ? PVPrice : product.priceFacets.PV;
 
         product.equinoxChildSkus = await this.fetchChildSkus(product);
         product.availableQuantity = mapAvailableQuantity(product);
@@ -403,8 +421,8 @@ const ProductData = {
           "scanQualified": productData.properties.scanQualifiedCount,
           "maxQuantity": 999,
           "points": "",
-          "cv": (product.priceFacets.CV) ? product.priceFacets.CV : '',
-          "pv": product.priceFacets.PV,
+          "cv": productCVPrice,
+          "pv": productPVPrice,
           "priceType": "WRTL",
           "price": discountedPrice,
           "priceMap": {
@@ -417,14 +435,14 @@ const ProductData = {
             "WWHL": product.priceFacets["Wholesale Price"]
           },
           "cvMap": {
-            "WWHL": (product.priceFacets.CV) ? product.priceFacets.CV : '',
-            "WADW": (product.priceFacets.CV) ? product.priceFacets.CV : '',
-            "WHL": (product.priceFacets.CV) ? product.priceFacets.CV : ''
+            "WWHL": productCVPrice,
+            "WADW": productCVPrice,
+            "WHL": productCVPrice
           },
           "pvMap": {
-            "WWHL": product.priceFacets.PV,
-            "WADW": product.priceFacets.PV,
-            "WHL": product.priceFacets.PV
+            "WWHL": productPVPrice,
+            "WADW": productPVPrice,
+            "WHL": productPVPrice
           },
           "orderTypes": this._setOrderType(product.properties),
           "childSkus": [],