@nuskin/ns-product-lib 1.3.6 → 1.4.1

package/CHANGELOG.md

@@ -1,3 +1,26 @@
+## [1.4.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v1.4.0...v1.4.1) (2022-03-31)
+
+
+### Fix
+
+* adding locallyProduced flag to mapper (#CX16-5842) ([b5a31ca](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/b5a31cab7cbaaba51af23f29bd70d8b0b495af44)), closes [#CX16-5842](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX16-5842)
+* adding locallyProduced flag to mapper (#CX16-5842) ([c50407d](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/c50407d90270e017a37d3427e43752da34002c11)), closes [#CX16-5842](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX16-5842)
+
+# [1.4.0](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v1.3.7...v1.4.0) (2022-03-31)
+
+
+### Update
+
+* adding locallyProduced flag (#CX16-5842) ([9213365](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/92133654db85e4af7f46a2223a5d999f75dbc9a5)), closes [#CX16-5842](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX16-5842)
+* adding locallyProduced flag (#CX16-5842) ([7e303af](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/7e303af1f14fd870ef571376e1960eb40fb7bd12)), closes [#CX16-5842](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX16-5842)
+
+## [1.3.7](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v1.3.6...v1.3.7) (2021-09-17)
+
+
+### Fix
+
+* fixed issue of new order types coming in as true when set to [secure] (#CX12-4252) ([ab1d15e](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/ab1d15ec9591ad98b113bb0ce8817c1c1c2c03f0)), closes [#CX12-4252](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX12-4252)
+
 ## [1.3.6](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v1.3.5...v1.3.6) (2021-05-18)
 
 

package/package.json

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

package/src/product.js

@@ -17,6 +17,7 @@ const Product = function(productData) {
   this.custTypes = [];
   this.addOns = [];
   this.productCarouselImages = [];
+  this.locallyProduced = false;
 
   //class variables to be used instead of getters/setters
   this.globalProductID = "";
@@ -349,7 +350,7 @@ const Product = function(productData) {
     }
     return retVal;
   };
-    
+
   this.getEventPriceTypes = () => {
     const eventPriceTypes = [];
 
@@ -490,6 +491,7 @@ const Product = function(productData) {
     retData.custTypes = this.custTypes;
     retData.division = this.division;
     retData.backOrderDate = this.backOrderDate;
+    retData.locallyProduced = this.locallyProduced;
     retData.agelocme = this.agelocme ? this.agelocme.toJSON() : null;
     retData.count = this.count;
     retData.flavor = this.flavor;
@@ -597,6 +599,7 @@ const Product = function(productData) {
       if (data.priceType) {
         this.priceType = data.priceType;
       }
+      this.locallyProduced = data.locallyProduced;
       this.count = productData.count;
       this.flavor = productData.flavor;
       this.size = productData.size;

package/src/productStatusMapper.js

@@ -36,6 +36,7 @@ const ProductStatusMapper = {
       globalProductID: productStatusV2.globalProductID,
       backordered: productStatusV2.backordered,
       backorderedAvailableDate: productStatusV2.backorderedAvailableDate,
+      locallyProduced: productStatusV2.locallyProduced,
       availableQuantity: productStatusV2.availableQuantity,
       webEnabled: productStatusV2.webEnabled,
       status: getStatusPartFromV2(productStatusV2),

package/src/productUtils.js

@@ -44,8 +44,8 @@ const ProductUtils = {
   },
 
   mergeOrderTypes: function(previousOrderTypes, newOrderTypes) {
-    // untrust previous order types
-    const previousOrderTypesMapping = this.getOrderTypesMapping(previousOrderTypes, false);
+    // untrust previous order types, override them to false
+    const previousOrderTypesMapping = this.getOrderTypesMapping(previousOrderTypes, true);
 
     // trust new order types
     const newOrderTypesMapping = this.getOrderTypesMapping(newOrderTypes);
@@ -56,18 +56,24 @@ const ProductUtils = {
     };
   },
   
-  getOrderTypesMapping: function(orderTypes, active = true) {
+  /**
+   * Gets the order types as a dictionary/mapping of order type to value
+   * @param {string[] | object[]} orderTypes - ex. ["adr", "order"] or { adr: false, order: true }
+   * @param {boolean} override - used to force the value of each orderType to false
+   * @returns {object} order types dictionary/mapping
+   */
+  getOrderTypesMapping: function(orderTypes, override = false) {
     if (isNullOrEmpty(orderTypes)) {
       return {};
     }
     const orderTypesMapping = {};
     if (Array.isArray(orderTypes)) {
       for (const orderType of orderTypes) {
-        orderTypesMapping[orderType.toLowerCase()] = active;
+        orderTypesMapping[orderType.toLowerCase()] = !override;
       }
     } else {
       for (const orderType in orderTypes) {
-        orderTypesMapping[orderType.toLowerCase()] = active;
+        orderTypesMapping[orderType.toLowerCase()] = !override && !!orderTypes[orderType];
       }
     }
     return orderTypesMapping;