@nuskin/ns-product-lib 2.10.0-cx24-4696.3 → 2.10.0-cx24-4922.1

package/CHANGELOG.md

@@ -1,24 +1,32 @@
-# [2.10.0-cx24-4696.3](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.10.0-cx24-4696.2...v2.10.0-cx24-4696.3) (2023-07-28)
+# [2.10.0-cx24-4922.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.9.3...v2.10.0-cx24-4922.1) (2023-08-25)
 
 
+### Fix
+
+* [EQ]  backOrderDate is not showing in MySite/PO product card (#CX24-4922) ([9973e46](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/9973e46b79f752e982589fbc9072fe343023b656)), closes [#CX24-4922](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-4922)
+
 ### New
 
-* Support for bundles ([98a77ca](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/98a77ca4cc7792fe7cfdf85097fc36b65f32a5c3))
+* Support for EQ product bundles (#CX24-4696) ([70156b2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/70156b2120c692c5023ec6b74fdfdabd18f74b73)), closes [#CX24-4696](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-4696)
 
-# [2.10.0-cx24-4696.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.10.0-cx24-4696.1...v2.10.0-cx24-4696.2) (2023-07-27)
+## [2.9.3](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.9.2...v2.9.3) (2023-08-03)
 
 
-### New
+### Fix
 
-* Support for bundles ([dce4424](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/dce44249c9edb5ed264ff012ab9ffa6422fe1dca))
+* backorder Qty for single product and kits (#CX24-4771) ([23715f2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/23715f22728edef2f5936405e7d567e44a2a8cf8)), closes [#CX24-4771](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-4771)
+* backorder Qty for single product and kits (#CX24-4771) ([98f44ec](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/98f44ec2eb1013bb484feeda6b27d111971e3e16)), closes [#CX24-4771](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-4771)
 
-# [2.10.0-cx24-4696.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.9.1...v2.10.0-cx24-4696.1) (2023-07-18)
+### Release
 
+* Automated changes by GitLab pipeline [skip ci] ([fb7c96c](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/fb7c96c18c1994526a584ff0ad2da24daf013646))
 
-### New
+## [2.9.2](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.9.1...v2.9.2) (2023-07-31)
+
+
+### Fix
 
-* Support for bundles ([9d696e9](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/9d696e94522397c2edcb2aa08d2b2755cda81792))
-* Support for bundles ([a945561](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/a94556115f9113b934c6cc993f008b4d539dc965))
+* product backordered quantity (#CX24-4771) ([5efc8cc](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/commit/5efc8ccde4967ee50504f449ac818139f4416a75)), closes [#CX24-4771](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/issues/CX24-4771)
 
 ## [2.9.1](https://code.tls.nuskin.io/ns-am/product/js-libs/ns-product-lib/compare/v2.9.0...v2.9.1) (2023-07-17)
 

package/package.json

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

package/src/equinox-helpers/availableQuantity.js

@@ -5,13 +5,13 @@
  */
 function availableQuantity(product) {
   if (product.inventoryProperties) {
-    return product.inventoryProperties.atpQty;
+    return product.inventoryProperties.backOrdered ? product.inventoryProperties.backOrderedQty : product.inventoryProperties.atpQty;
   }
 
   if (product.childSkus && product.childSkus.length > 0) {
     const quantities = product.childSkus
       .filter(cs => cs.inventory !== undefined)
-      .map(cs => cs.inventory.atpQty);
+      .map(cs => cs.inventory.backOrdered ? cs.inventory.backOrderedQty : cs.inventory.atpQty);
 
     return Math.min(...quantities);
   }

package/src/equinox-helpers/backOrderDate.js

@@ -0,0 +1,18 @@
+
+
+/**
+ * backOrderDate returns backorder date if product inventory status is BACKORDER.
+ * @param {import('./').Product} product
+ * @param {*} product
+ * @returns {number}
+ */
+function backOrderDate(product) {
+  if (product.inventoryProperties && product.inventoryProperties.hasOwnProperty('expectedBackOrderAvailabilityDate')) {
+    return product.inventoryProperties.expectedBackOrderAvailabilityDate;
+  }
+
+  return 0;
+}
+
+
+module.exports = backOrderDate;

package/src/equinox-helpers/childSKU.js

@@ -1,8 +1,8 @@
 /**
  * childSKU maps a product variant. Used mainly in subscription.
  *
- * @param {import('.').KitSKUQuantity[]} kits 
- * @param {import('.').EquinoxNormalProduct} product 
+ * @param {import('.').KitSKUQuantity[]} kits
+ * @param {import('.').EquinoxNormalProduct} product
  */
 function childSKU(kits, product) {
   const sku = product.sku.filter(sku => sku.default)[0];
@@ -23,7 +23,8 @@ function childSKU(kits, product) {
     availableChannels: sku.properties.availableChannels,
     inventory: {
       atpQty: sku.inventoryProperties.atpQty,
-      backOrdered: sku.inventoryProperties.backOrdered
+      backOrdered: sku.inventoryProperties.backOrdered,
+      backOrderedQty: sku.inventoryProperties.backOrderedQty
     }
   }
 }

package/src/equinox-helpers/index.js

@@ -23,6 +23,7 @@
  * @type {object}
  * @property {number} atpQty
  * @property {boolean} backOrdered
+ * @property {number} backOrderedQty
  */
 
 /**
@@ -197,11 +198,13 @@
  * @property {string} sku
  * @property {number} qty
  */
+const backOrderDate = require('./backOrderDate');
 const availableQuantity = require('./availableQuantity');
 const childSKU = require('./childSKU');
 const childSKUBundles = require('./childSKUBundles');
 
 module.exports = {
+  mapBackOrderDate: backOrderDate,
   mapAvailableQuantity: availableQuantity,
   mapChildSKU: childSKU,
   mapChildSKUBundle: childSKUBundles

package/src/productData.js

@@ -5,7 +5,7 @@ const contentstack = require('./contentstack/contentstack');
 const Product = require("./product");
 const CustomerTypes = require('./models/customerTypes');
 const ProductStatus = require("./models/productStatus");
-const { mapAvailableQuantity, mapChildSKU, mapChildSKUBundle } = require('./equinox-helpers');
+const { mapBackOrderDate, mapAvailableQuantity, mapChildSKU, mapChildSKUBundle } = require('./equinox-helpers');
 const { productNotFoundInterceptor } = require('./equinox-helpers/interceptors');
 
 const productTypes = {
@@ -136,6 +136,27 @@ const ProductData = {
     };
   },
 
+  /**
+   * Get available product quantity
+   * If backOrdered === true, use backOrderedQty
+   * else use atpQty
+   * @todo deprecate this and try using equinox-helpers/availableQuantity.js
+   * @param {obj} inventory
+   * @returns {number} qty
+   */
+  getAvailableQty: function(inventory) {
+    if (!inventory || (!inventory.hasOwnProperty('backOrdered')
+      || !inventory.hasOwnProperty('atpQty') || !inventory.hasOwnProperty('backOrderedQty'))) {
+      return 0;
+    }
+
+    if (inventory.backOrdered) {
+      return inventory.backOrderedQty;
+    }
+
+    return inventory.atpQty;
+  },
+
   /**
    * Map product variant
    * @todo remove unnecessary fields and do code refactoring
@@ -257,7 +278,7 @@ const ProductData = {
         }
       ],
       "scanQualified": eqVariant.properties.scanQualifiedCount,
-      "availableQuantity": eqVariant.inventoryProperties.atpQty,
+      "availableQuantity": this.getAvailableQty(eqVariant.inventoryProperties),
       "maxQuantity": 999,
       "points": "",
       "cv": productCVPrice,
@@ -286,7 +307,7 @@ const ProductData = {
       "orderTypes": this._setOrderType(eqVariant.properties),
       "custTypes": this.switchCustType(eqVariant.properties.customerTypes),
       "division": eqVariant.properties.division,
-      "backOrderDate": null,
+      "backOrderDate": mapBackOrderDate(eqVariant),
       "locallyProduced": false,
       "agelocme": null,
       "count": "",
@@ -471,7 +492,7 @@ const ProductData = {
           "orderTypes": this._setOrderType(product.properties),
           "custTypes": this.switchCustType(product.properties.customerTypes),
           "division": productData.properties.division,
-          "backOrderDate": null,
+          "backOrderDate": mapBackOrderDate(product),
           "locallyProduced": false,
           "agelocme": null,
           "count": "",
@@ -500,7 +521,7 @@ const ProductData = {
           },
           "restrictedMarkets": [],
           "addOns": [],
-          "inventory": product.inventory || "", //inventory label
+          "inventory": product.inventory || product.properties.inventoryStatus || "", //inventory label,
           "equinoxProductId": productData.identifier,
           "properties": product.properties,
           equinox: {