@nuskin/ns-product-lib 2.7.1-cx24-3684.2 → 2.7.2-cdb-1.1

package/CHANGELOG.md

@@ -1,16 +1,45 @@
-## [2.7.1-cx24-3684.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.7.1-cx24-3684.1...v2.7.1-cx24-3684.2) (2023-04-16)
+## [2.7.2-cdb-1.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.7.1...v2.7.2-cdb-1.1) (2023-04-17)
 
 
 ### Fix
 
-* 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)
+* added some logs (#CDB-1) ([253482b](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/253482ba8825d56d9a7e3d8541a83bbbda03e09b)), closes [#CDB-1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CDB-1)
 
-## [2.7.1-cx24-3684.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.7.0...v2.7.1-cx24-3684.1) (2023-04-13)
+## [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)
 
 
 ### Fix
 
-* 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)
+* updating text in unit testing ([65393d6](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/65393d6492b0696a24daa56f79b768cc38e1c7ae))
+
+# [2.8.0-cx24-3705.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.8.0-cx24-3705.1...v2.8.0-cx24-3705.2) (2023-04-14)
+
+
+### Update
+
+* setting correct title if multiple variants ([583e74d](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/583e74d41acc7213cd86a48df9076a453da8bb93))
+
+# [2.8.0-cx24-3705.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.7.0...v2.8.0-cx24-3705.1) (2023-04-14)
+
+
+### Update
+
+* setting correct title if multiple variants ([9574804](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/9574804094f65261ff45c9658ba4e4d4baf0bdf2))
+
+## [2.7.1-cx24-3879.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.7.1-cx24-3879.1...v2.7.1-cx24-3879.2) (2023-04-13)
+
+
+### Fix
+
+* Payload for subscription products are missing when added to cart from MySite homepage ([20b0ed2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/20b0ed2661b4d213147cef9e77d268b167b49421))
+
+## [2.7.1-cx24-3879.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.7.0...v2.7.1-cx24-3879.1) (2023-04-13)
+
+
+### Fix
+
+* Payload for subscription products are missing when added to cart from MySite homepage ([7b7ac3b](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/7b7ac3bd7c0b196aa9a7e97e885f7e296ef7e97d))
+* Payload for subscription products are missing when added to cart from MySite homepage ([d49957f](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/d49957f44d9ce6b6469b0bc94bc8f8050d00f35a))
 
 # [2.7.0](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.6.2...v2.7.0) (2023-04-05)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-product-lib",
-  "version": "2.7.1-cx24-3684.2",
+  "version": "2.7.2-cdb-1.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.7",
+    "@nuskin/ns-util": "4.3.2",
     "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;
@@ -338,7 +337,11 @@ const Product = function (productData) {
           return this.addCvWithType(csvKey, productStatus.csv[csvKey]);
         }, this);
       }
-      this.orderTypes = ProductUtils.mergeOrderTypes(this.orderTypes, productStatus.orderType);
+      //only remap the orderTypes for legacy (which we'll know when equinoxProductId is blank)
+      if(this.equinoxProductId == "") {
+        this.orderTypes = ProductUtils.mergeOrderTypes(this.orderTypes, productStatus.orderType);
+      }
+
       if (productStatus.childSkus) {
         this.childSkus = productStatus.childSkus;
       }

package/src/productData.js

@@ -21,20 +21,48 @@ const ProductData = {
    * @param {boolean} isEquinoxEnabled
    */
   getProductData: async function (skus, locale, market, isEquinoxEnabled = false) {
+    console.trace({
+      where: 'productData getProductData',
+      skus,
+      locale,
+      market,
+      isEquinoxEnabled
+    })
     const localeMarket = `${locale}_${market}`;
 
     if (isEquinoxEnabled) {
       const config = (await getConfiguration(['Equinox_Markets'])).Equinox_Markets;
+      console.trace({
+        where: 'productData getProductData',
+        config
+      })
 
       if (config.country_code === market && config.active) {
+        console.trace({
+          where: 'productData getProductData equinox path',
+          config
+        })
         return await this.getProductFromEquinox(skus, localeMarket, config);
       }
     }
+    console.trace({
+      where: 'productData getProductData legacy path'
+    })
     return await this.getProductFromLegacy(skus, localeMarket);
   },
 
   getProductFromEquinox: async function (skus, locale, config) {
+    console.trace({
+      where: 'productData getProductFromEquinox',
+      skus,
+      locale,
+      config
+    })
     const response = await this.searchEquinoxProduct(skus, locale, config);
+    console.trace({
+      where: 'productData getProductFromEquinox',
+      response
+    })
 
     if (response.data.product) {
       return await this.eqProductMapper(response.data.product, skus);
@@ -48,11 +76,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 = [];
@@ -94,7 +122,16 @@ const ProductData = {
   },
 
   getProductFromLegacy: async function (skus, locale) {
+    console.trace({
+      where: 'productData getProductFromLegacy',
+      skus,
+      locale
+    })
     const marketConfig = await contentstack.getAEMConfig();
+    console.trace({
+      where: 'productData getProductFromLegacy',
+      marketConfig
+    })
 
     if (marketConfig === null) {
       return null;
@@ -140,7 +177,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 +289,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,
@@ -365,7 +401,7 @@ const ProductData = {
         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 productTitle = productData.properties.name
 
         if (productData.sku && productData.sku.length > 1) {
           // exclude base product from variants
@@ -373,6 +409,10 @@ const ProductData = {
             variants[variant.identifier] = this.eqProductVariantMapper(variant);
             return variant;
           });
+          const productArr = productData.sku.filter(p => p.default === true)
+          productTitle = productArr[0].properties.name;
+          product = productArr[0]
+
         }
 
         const {
@@ -384,11 +424,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);
@@ -396,7 +434,7 @@ const ProductData = {
           ...product,
           "sku": product.identifier,
           "globalProductID": productData.identifier,
-          "title": productData.properties.name,
+          "title": productTitle,
           "country": product.properties.market,
           "language": "en",
           "shortDescr": productData.properties.description,
@@ -432,13 +470,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,
@@ -513,7 +551,7 @@ const ProductData = {
     };
   },
 
-  mapEquinoxSKUExists: function(exists) {
+  mapEquinoxSKUExists: function (exists) {
     // this could be avoided if only we are using response mapper
     // for equinox products that exists.
     // @todo: clean-up