@nuskin/ns-product-lib 2.4.2-CX24.2.1 → 2.5.0-CX24.3.1

package/CHANGELOG.md

@@ -1,9 +1,45 @@
-## [2.4.2-CX24.2.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.4.1...v2.4.2-CX24.2.1) (2022-11-07)
+# [2.5.0-CX24.3.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.4.2-CX24.2.1...v2.5.0-CX24.3.1) (2022-12-06)
 
 
 ### Fix
 
-* [Equinox market] Admin > Move up/down/top/bottom of featured products and edit bundle is not working ([82611ca](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/82611cab93c990ed1ce05690feb9d00967090dea))
+* [Equinox market] Admin > Move up/down/top/bottom of featured products and edit bundle is not working ([a89af4a](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/a89af4a5d00c6a68fcaeff22f128554270add21e))
+* eq market  event pricing and name (#CX24-2179) ([213b59a](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/213b59a33a208ffad0a6726521ce7f365d34d36e)), closes [#CX24-2179](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-2179)
+
+### Release
+
+* Automated changes by GitLab pipeline [skip ci] ([07bfa40](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/07bfa404c552c05637c2c8a537c4ff298536874e))
+* Automated changes by GitLab pipeline [skip ci] ([fa1c0d9](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/fa1c0d9d5853482e3ac49cea4e99599e7192f85b))
+* Automated changes by GitLab pipeline [skip ci] ([2d20787](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/2d2078763b2d57edb8a24f438ac90dd37c3ff41b))
+
+### Update
+
+* set ADR pricing from equinox (CX24-2862) ([65d04d2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/65d04d2e9ff4018edfe99e5a7412bee985d3def2))
+* set ADR pricing from equinox (CX24-2862) ([54a5693](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/54a56932e5df36c9c30ce6358d8597c98be3d20d))
+* set ADR pricing from equinox (CX24-2862) ([bbd135f](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/bbd135f1ed0395c578be2274c84ba136ceed9376))
+* set ADR pricing from equinox (CX24-2862) ([197003e](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/197003e1629bd394c547a118d332b5e8574dfc7d))
+
+# [2.5.0-cx24-2862.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.5.0-cx24-2862.1...v2.5.0-cx24-2862.2) (2022-11-11)
+
+
+### Update
+
+* set ADR pricing from equinox (CX24-2862) ([b64dcea](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/b64dcea4dd3374be992c667db5c0b2604aacc029))
+
+# [2.5.0-cx24-2862.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.4.2-cx24-2612.1.1...v2.5.0-cx24-2862.1) (2022-11-10)
+
+
+### Update
+
+* set ADR pricing from equinox (CX24-2862) ([9f6dfb7](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/9f6dfb726f40b1335411318629a2ebdf1b4dac96))
+* set ADR pricing from equinox (CX24-2862) ([61f550a](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/61f550a21c5cc9d062549ec2aaf2758aebccf2be))
+
+## [2.4.2-cx24-2612.1.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.4.1...v2.4.2-cx24-2612.1.1) (2022-11-07)
+
+
+### Fix
+
+* [Equinox market] Admin > Move up/down/top/bottom of featured products and edit bundle is not working ([9d9d106](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/9d9d10667477b4c7ef7bf8ec013aab322d3cdbcc))
 
 ## [2.4.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.4.0...v2.4.1) (2022-11-06)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-product-lib",
-  "version": "2.4.2-CX24.2.1",
+  "version": "2.5.0-CX24.3.1",
   "description": "This project contains shared Product models and code between the backend and frontend.",
   "main": "src/index.js",
   "scripts": {

package/src/product.js

@@ -225,7 +225,7 @@ const Product = function(productData) {
     }
   };
 
-  this.setPriceAndPvFromType = function(_priceType, _activeEvents = null) {
+  this.setPriceAndPvFromType = function(_priceType, _activeEvents = null, option = {}) {
     // WARNING: priceType needs to be handled client-side
     // const priceType = ConfigService.getMarketConfig().showWholeSalePricing && !AccountManager.isLoggedIn()
     //     ? PriceType.WWHL
@@ -234,11 +234,11 @@ const Product = function(productData) {
     const eventPricing = getEventPricing(this, priceType, _activeEvents);
 
     let changed = false;
-    if (
+    if ((
       !this.price ||
       priceType !== this.priceType ||
       this.eventName !== eventPricing.eventName
-    ) {
+    ) && !option.isEqPromotion) {
       this.setPrice(eventPricing.price || this.getPricing(priceType));
       this.setCv(eventPricing.cv || this.getCvWithType(priceType));
       this.setPv(eventPricing.pv || this.getPvWithType(priceType));
@@ -247,11 +247,20 @@ const Product = function(productData) {
       changed = true;
     }
 
+    if (option.isEqPromotion) {
+      //retain product.price as original price
+      this.setCv(this.getCvWithType(priceType));
+      this.setPv(this.getPvWithType(priceType));
+      this.priceType = priceType;
+      changed = true;
+    }
+
     this.variantSkus().forEach((variantSku) => {
       if (
         this.variants[variantSku].setPriceAndPvFromType(
           priceType,
-          _activeEvents
+          _activeEvents,
+          option
         )
       ) {
         changed = true;
@@ -281,7 +290,7 @@ const Product = function(productData) {
     this.priceMap[type] = price;
   };
 
-  this.addPricingFromStatus = function(productStatus, priceType) {
+  this.addPricingFromStatus = function(productStatus, priceType, option ={}) {
     let modified = false;
 
     if (!priceType) {
@@ -319,13 +328,13 @@ const Product = function(productData) {
       if(productStatus.childSkus) {
         this.childSkus = productStatus.childSkus;
       }
-      this.setPriceAndPvFromType(priceType);
+      this.setPriceAndPvFromType(priceType, null, option);
       modified = true;
     } else {
       let variant = this.getVariant(productStatusSku);
 
       if (variant) {
-        if (variant.addPricingFromStatus(productStatus, priceType)) {
+        if (variant.addPricingFromStatus(productStatus, priceType, option)) {
           variant.setMarketAttributes(productStatus);
           updateBaseRanges(this, variant);
           modified = true;

package/src/productData.js

@@ -91,7 +91,7 @@ const ProductData = {
 
   /**
    * Map product variant
-   * @todo remove unnecessary fields
+   * @todo remove unnecessary fields and do code refactoring
    * @param {*} eqVariant
    * @returns Array<Product>
    */
@@ -107,6 +107,10 @@ const ProductData = {
       thumbnailImage = imageURL.replace(regex,'40.40')
     }
 
+    const { eventName, eventLabels, computedPrice, defaultProductPrice} = this.getEqProductPromotions(eqVariant);
+    const productPrice = eventName ? defaultProductPrice : eqVariant.priceFacets["Regular Price"];
+    const discountedPrice = eventName ? computedPrice : eqVariant.priceFacets["Regular Price"];
+
     return {
       "sku": eqVariant.identifier,
       "globalProductID": eqVariant.identifier,
@@ -145,14 +149,14 @@ const ProductData = {
       "cv": (eqVariant.priceFacets.CV) ?  eqVariant.priceFacets.CV : '',
       "pv":eqVariant.priceFacets.PV,
       "priceType": "WRTL",
-      "price": eqVariant.priceFacets["Regular Price"],
+      "price": discountedPrice,
       "priceMap": {
-        "WRTL": eqVariant.priceFacets["Regular Price"],
+        "WRTL": productPrice,
         "WADW-WRTL": eqVariant.priceFacets["Regular Price"],
-        "WADR": 9999.01,
+        "WADR": eqVariant.priceFacets["Regular Price"],
         "RTL": eqVariant.priceFacets["Regular Price"],
         "WWHL": eqVariant.priceFacets["Wholesale Price"],
-        "WADW": 9998.01,
+        "WADW": eqVariant.priceFacets["Wholesale Price"],
         "WHL": eqVariant.priceFacets["Wholesale Price"]
       },
       "cvMap": {
@@ -165,19 +169,7 @@ const ProductData = {
         "WADW": eqVariant.priceFacets.PV,
         "WHL": eqVariant.priceFacets.PV
       },
-      "orderTypes": {
-        "adr": true,
-        "order": true,
-        "zpfc": false,
-        "zadp": true,
-        "ars": true,
-        "kiosk": true,
-        "mobile": true,
-        "preferred customer": true,
-        "retail": true,
-        "web": true,
-        "web display": true
-      },
+      "orderTypes": this._setOrderType(eqVariant.properties),
       "division": eqVariant.properties.division,
       "backOrderDate": null,
       "locallyProduced": false,
@@ -193,9 +185,9 @@ const ProductData = {
       "variantsLabel": eqVariant.properties.variantLabel  ||  "",
       "groupOffer": false,
       "personalOffer": false,
-      "savedEventName": null,
-      "salesLabel": "",
-      "eventName": null,
+      "savedEventName": eventName,
+      "salesLabel": eventLabels,
+      "eventName": eventName,
       "sizeWeight": '',
       "nettoWeight": "",
       "searchScore": 0,
@@ -210,6 +202,41 @@ const ProductData = {
     };
   },
 
+  /**
+   * Get EQ product promotions
+   * @param {*} product
+   * @returns {obj} promotion
+   */
+  getEqProductPromotions(product) {
+
+    if (!Array.isArray(product.promotion)) {
+      return {
+        eventLabels: "",
+        computedPrice : 0,
+        defaultProductPrice: product.priceFacets ? product.priceFacets["Regular Price"] : 0,
+        eventName: null
+      }
+    }
+
+    const defaultProductPrice = product.totalValue ?  product.totalValue.originalPrice : 0;
+    const computedPrice =  product.totalValue && product.totalValue.priceAfterDiscount ? product.totalValue.priceAfterDiscount : 0;
+    let eventName = "";
+    const eventLabels = [];
+
+    product.promotion.map(promotion => {
+      eventName = promotion.offerId;
+      eventLabels.push(promotion.message);
+      return promotion;
+    });
+
+    return {
+      eventLabels: eventLabels.join(','),
+      defaultProductPrice,
+      computedPrice,
+      eventName
+    }
+  },
+
   eqProductMapper: function (productDataResponse, skus) {
     let prod = [];
     let count = 0;
@@ -227,12 +254,17 @@ const ProductData = {
       }
 
       if (data.sku && data.sku.length > 1) {
-        data.sku.map(variant => {
+        //exclude base product from variants
+        data.sku.filter(v => v.identifier.substring(2, 4) !== "55").map(variant => {
           variants[variant.identifier] = this.eqProductVariantMapper(variant);
           return variant;
         });
       }
 
+      const { eventName, eventLabels, computedPrice, defaultProductPrice} = this.getEqProductPromotions(data.sku[count]);
+      const productPrice = eventName ? defaultProductPrice : data.sku[count].priceFacets["Regular Price"];
+      const discountedPrice = eventName ? computedPrice : data.sku[count].priceFacets["Regular Price"];
+
       prod = {
         "sku": data.sku[count].identifier,
         "globalProductID": data.identifier,
@@ -271,13 +303,13 @@ const ProductData = {
         "cv": (data.sku[count].priceFacets.CV) ?  data.sku[count].priceFacets.CV : '',
         "pv": data.sku[count].priceFacets.PV,
         "priceType": "WRTL",
-        "price": data.sku[count].priceFacets["Regular Price"],
+        "price": discountedPrice,
         "priceMap": {
-          "WRTL": data.sku[count].priceFacets["Regular Price"],
+          "WRTL": productPrice,
           "WADW-WRTL": data.sku[count].priceFacets["Regular Price"],
-          "WADR": 9999.01,
+          "WADR": data.sku[count].priceFacets["Regular Price"],
           "RTL": data.sku[count].priceFacets["Regular Price"],
-          "WADW": 9998.01,
+          "WADW": data.sku[count].priceFacets["Wholesale Price"],
           "WHL": data.sku[count].priceFacets["Wholesale Price"],
           "WWHL": data.sku[count].priceFacets["Wholesale Price"]
         },
@@ -291,19 +323,7 @@ const ProductData = {
           "WADW": data.sku[count].priceFacets.PV,
           "WHL": data.sku[count].priceFacets.PV
         },
-        "orderTypes": {
-          "adr": true,
-          "order": true,
-          "zpfc": false,
-          "zadp": true,
-          "ars": true,
-          "kiosk": true,
-          "mobile": true,
-          "preferred customer": true,
-          "retail": true,
-          "web": true,
-          "web display": true
-        },
+        "orderTypes": this._setOrderType(data.sku[count].properties),
         "childSkus": [],
         "custTypes": this.switchCustType(data.properties.customerTypes),
         "division": data.properties.division,
@@ -321,9 +341,9 @@ const ProductData = {
         "variantsLabel": data.sku[count].properties.variantLabel  ||  "",
         "groupOffer": false,
         "personalOffer": false,
-        "savedEventName": null,
-        "salesLabel": "",
-        "eventName": null,
+        "savedEventName": eventName,
+        "salesLabel": eventLabels,
+        "eventName": eventName,
         "sizeWeight": '',
         "nettoWeight": "",
         "variants": variants,
@@ -341,7 +361,7 @@ const ProductData = {
       };
       let newProduct = new Product(prod);
       return newProduct
-    })
+    });
 
     let data = {
       products: this._sortProductsBySku(skus, prodArr),
@@ -409,10 +429,69 @@ const ProductData = {
       return products
     }
 
-    return products.sort(function (a, b) {
+    const sortedProducts = products.sort(function (a, b) {
       return skus.indexOf(a.sku) - skus.indexOf(b.sku);
     });
 
+    return sortedProducts
+
+  },
+
+  /**
+   *
+   * @param {*} availableChannels
+   *
+   * This function is use to convert arsPhone,web,kiosk,mobile,subscription
+   * to orderType object
+   *  "adr”
+      "order"
+      "zpfc"
+      "zadp"
+      "ars"
+      "kiosk"
+      "mobile"
+      "preferred customer"
+      "retail"
+      "web"
+      "web display"
+   */
+  _setOrderType: function (properties) {
+    let orderTypeArr = {
+      "adr": false,
+      "order": false,
+      "zpfc": false,
+      "zadp": false,
+      "ars": false,
+      "kiosk": false,
+      "mobile": false,
+      "preferred customer": false,
+      "retail": false,
+      "web": false,
+      "web display": false
+    };
+    let availableChannelsArr = properties.availableChannels.split(',')
+
+    availableChannelsArr.forEach(channel => {
+      if (channel == 'arsPhone')
+        orderTypeArr.ars = true
+      if (channel == 'web') {
+        orderTypeArr.order = true
+        orderTypeArr.web = true
+      }
+      if (channel == 'kiosk')
+        orderTypeArr.kiosk = true
+      if (channel == 'mobile')
+        orderTypeArr.mobile = true
+      if (channel == 'subscription')
+        orderTypeArr.adr = true
+
+    });
+    if (properties.retail)
+      orderTypeArr.retail = true
+    if (properties.prefferredCustomer)
+      orderTypeArr['preferred customer'] = true
+
+    return orderTypeArr;
   }
 }