@nuskin/ns-product-lib 2.7.1-cx24-3879.2 → 2.7.1-cx24-3684.2

package/CHANGELOG.md

@@ -1,17 +1,16 @@
-## [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)
+## [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)
 
 
 ### 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))
+* 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)
 
-## [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)
+## [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)
 
 
 ### 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))
+* 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)
 
 # [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-3879.2",
+  "version": "2.7.1-cx24-3684.2",
   "description": "This project contains shared Product models and code between the backend and frontend.",
   "main": "src/index.js",
   "scripts": {

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,6 +262,7 @@ 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;
@@ -337,11 +338,7 @@ const Product = function (productData) {
           return this.addCvWithType(csvKey, productStatus.csv[csvKey]);
         }, this);
       }
-      //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);
-      }
-
+      this.orderTypes = ProductUtils.mergeOrderTypes(this.orderTypes, productStatus.orderType);
       if (productStatus.childSkus) {
         this.childSkus = productStatus.childSkus;
       }

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,6 +140,7 @@ 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,
@@ -252,12 +253,12 @@ const ProductData = {
       "price": discountedPrice,
       "priceMap": {
         "WRTL": productPrice,
-        "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"]
+        "WADW-WRTL": productPrice,
+        "WADR": productPrice,
+        "RTL": productPrice,
+        "WWHL": wholeSalePrice,
+        "WADW": wholeSalePrice,
+        "WHL": wholeSalePrice
       },
       "cvMap": {
         "WWHL": productCVPrice,
@@ -383,9 +384,11 @@ const ProductData = {
           PVPrice
         } = this.getEqProductPromotions(product);
         const productPrice = eventName ? defaultProductPrice : product.priceFacets["Regular Price"];
-        const discountedPrice = eventName ? computedPrice : product.priceFacets["Regular Price"];
+        const discountedPrice = eventName ? computedPrice : product.priceFacets["Wholesale 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);
@@ -429,13 +432,13 @@ const ProductData = {
           "priceType": "WRTL",
           "price": discountedPrice,
           "priceMap": {
-            "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"]
+            "WRTL": productPrice, //regular | retail price
+            "WADW-WRTL": productPrice,
+            "WADR": productPrice,
+            "RTL": productPrice,
+            "WADW": wholeSalePrice,
+            "WHL": wholeSalePrice,
+            "WWHL": wholeSalePrice
           },
           "cvMap": {
             "WWHL": productCVPrice,