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

package/CHANGELOG.md

@@ -1,17 +1,9 @@
-## [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)
+## [2.6.2-cx24-337703.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.1...v2.6.2-cx24-337703.1) (2023-03-22)
 
 
 ### 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)
-
-
-### Fix
-
-* modified childSkus to equinoxChildSkus ([9f42ae5](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/9f42ae5d02b3e1e810bdb289cf6afee1de086a8b))
+* Show dropdown for variants ([85cdf69](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/85cdf69cc2bbf6700ec5c9bcacc7222cf2ddf674))
 
 ## [2.6.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.0...v2.6.1) (2023-03-16)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-product-lib",
-  "version": "2.6.2-cx24-3563.2",
+  "version": "2.6.2-cx24-337703.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.2.5",
+    "@nuskin/ns-util": "4.2.7",
     "axios": "0.27.2",
     "qs": "6.11.0"
   },

package/src/equinox-helpers/availableQuantity.js

@@ -8,8 +8,8 @@ function availableQuantity(product) {
     return product.inventoryProperties.atpQty;
   }
 
-  if (product.equinoxChildSkus && product.equinoxChildSkus.length > 0) {
-    const quantities = product.equinoxChildSkus
+  if (product.childSkus && product.childSkus.length > 0) {
+    const quantities = product.childSkus
       .filter(cs => cs.inventory !== undefined)
       .map(cs => cs.inventory.atpQty);
 

package/src/product.js

@@ -76,7 +76,6 @@ const Product = function(productData) {
   //@example "IN STOCK"
   this.inventory = "";
   this.equinoxProductId = "";
-  this.equinoxChildSkus = [];
 
   this.setMarketAttributes = function(productStatus) {
     if (productStatus.marketAttributes) {
@@ -505,7 +504,6 @@ const Product = function(productData) {
     retData.pvMap = this.pvMap;
     retData.orderTypes = this.orderTypes;
     retData.childSkus = this.childSkus;
-    retData.equinoxChildSkus = this.equinoxChildSkus;
     retData.custTypes = this.custTypes;
     retData.division = this.division;
     retData.backOrderDate = this.backOrderDate;
@@ -677,10 +675,6 @@ const Product = function(productData) {
       }
 
       this.equinoxProductId = data.equinoxProductId;
-
-      if(data.equinoxChildSkus) {
-        this.equinoxChildSkus = data.equinoxChildSkus;
-      }
     }
   };
 

package/src/productData.js

@@ -66,7 +66,6 @@ const ProductData = {
     }
 
     const filter = skuFilter.join(" OR ")
-    //axios.defaults.withCredentials = true;
 
     const url = `${config.API_Base_URLs}/orchestrationservices/storefront/catalogs/search/`;
     const href = `${url}?filter='\\\\''${encodeURI(filter)}'\\''`;
@@ -133,11 +132,9 @@ const ProductData = {
     let thumbnailImage = imageURL ? imageURL + '?width=40' : ''
 
 
-    const { eventName, eventLabels, computedPrice, defaultProductPrice, CVPrice, PVPrice } = this.getEqProductPromotions(eqVariant);
+    const { eventName, eventLabels, computedPrice, defaultProductPrice } = 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,
@@ -244,8 +241,8 @@ const ProductData = {
       "availableQuantity": eqVariant.inventoryProperties.atpQty,
       "maxQuantity": 999,
       "points": "",
-      "cv": productCVPrice,
-      "pv": productPVPrice,
+      "cv": (eqVariant.priceFacets.CV) ? eqVariant.priceFacets.CV : '',
+      "pv": eqVariant.priceFacets.PV,
       "priceType": "WRTL",
       "price": discountedPrice,
       "priceMap": {
@@ -258,14 +255,14 @@ const ProductData = {
         "WHL": eqVariant.priceFacets["Wholesale Price"]
       },
       "cvMap": {
-        "WWHL": productCVPrice,
-        "WADW": productCVPrice,
-        "WHL": productCVPrice
+        "WWHL": (eqVariant.priceFacets.CV) ? eqVariant.priceFacets.CV : '',
+        "WADW": (eqVariant.priceFacets.CV) ? eqVariant.priceFacets.CV : '',
+        "WHL": (eqVariant.priceFacets.CV) ? eqVariant.priceFacets.CV : ''
       },
       "pvMap": {
-        "WWHL": productPVPrice,
-        "WADW": productPVPrice,
-        "WHL": productPVPrice
+        "WWHL": eqVariant.priceFacets.PV,
+        "WADW": eqVariant.priceFacets.PV,
+        "WHL": eqVariant.priceFacets.PV
       },
       "orderTypes": this._setOrderType(eqVariant.properties),
       "custTypes": this.switchCustType(eqVariant.properties.customerTypes),
@@ -322,16 +319,6 @@ 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 = [];
 
@@ -345,19 +332,17 @@ const ProductData = {
       eventLabels: eventLabels.join(','),
       defaultProductPrice,
       computedPrice,
-      eventName,
-      CVPrice,
-      PVPrice
+      eventName
     }
   },
 
   eqProductMapper: async function (productDataResponse, skus) {
     let count = 0;
-    let variants = {};
     const products = [];
 
     for (const productData of productDataResponse) {
       try {
+        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' : ''
@@ -375,16 +360,12 @@ const ProductData = {
           eventName,
           eventLabels,
           computedPrice,
-          defaultProductPrice,
-          CVPrice,
-          PVPrice
+          defaultProductPrice
         } = 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.childSkus = await this.fetchChildSkus(product);
         product.availableQuantity = mapAvailableQuantity(product);
         product = {
           ...product,
@@ -421,8 +402,8 @@ const ProductData = {
           "scanQualified": productData.properties.scanQualifiedCount,
           "maxQuantity": 999,
           "points": "",
-          "cv": productCVPrice,
-          "pv": productPVPrice,
+          "cv": (product.priceFacets.CV) ? product.priceFacets.CV : '',
+          "pv": product.priceFacets.PV,
           "priceType": "WRTL",
           "price": discountedPrice,
           "priceMap": {
@@ -435,17 +416,16 @@ const ProductData = {
             "WWHL": product.priceFacets["Wholesale Price"]
           },
           "cvMap": {
-            "WWHL": productCVPrice,
-            "WADW": productCVPrice,
-            "WHL": productCVPrice
+            "WWHL": (product.priceFacets.CV) ? product.priceFacets.CV : '',
+            "WADW": (product.priceFacets.CV) ? product.priceFacets.CV : '',
+            "WHL": (product.priceFacets.CV) ? product.priceFacets.CV : ''
           },
           "pvMap": {
-            "WWHL": productPVPrice,
-            "WADW": productPVPrice,
-            "WHL": productPVPrice
+            "WWHL": product.priceFacets.PV,
+            "WADW": product.priceFacets.PV,
+            "WHL": product.priceFacets.PV
           },
           "orderTypes": this._setOrderType(product.properties),
-          "childSkus": [],
           "custTypes": this.switchCustType(product.properties.customerTypes),
           "division": productData.properties.division,
           "backOrderDate": null,