@nuskin/ns-product-lib 2.13.3-cx24-5694.2 → 2.13.3-cx24-5694.4

package/package.json

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

package/src/graph-ql/mappers/originalPrice.js

@@ -10,7 +10,7 @@
  */
 function  originalPrice(product, isWholesale = false, isBundleKit = false) {
   const  { price, totalPrice } = product;
-  const productPrice  = totalPrice  ? totalPrice : price;
+  const productPrice  = price  ?  price : totalPrice;
 
   if (isBundleKit) {
 

package/src/graph-ql/mappers/retailPrice.js

@@ -4,19 +4,18 @@
  * Map retail price
  * Map retailSales if it has sales/promotions
  * @param {obj} product
- * @param {boolean} isBundleKit
  * @return {number} retailPrice
  */
-function retailPrice(product, isBundleKit = false) {
+function retailPrice(product) {
   const  { price, totalPrice } = product;
-  const productPrice  = totalPrice  ? totalPrice : price;
+  const productPrice  = price  ?  price : totalPrice;
 
   if (productPrice.retailSales) {
 
     return productPrice.retailSales;
   }
 
-  return isBundleKit ? productPrice.retailOriginal : productPrice.retail;
+  return  productPrice.retail;
 
 }
 

package/src/graph-ql/mappers/retailSubscriptionPrice.js

@@ -8,7 +8,7 @@
  */
 function retailSubscriptionPrice(product) {
   const  { price, totalPrice } = product;
-  const productPrice  = totalPrice  ? totalPrice : price;
+  const productPrice  = price  ?  price : totalPrice;
 
   if (productPrice.retailSales) {
 

package/src/graph-ql/mappers/wholesalePrice.js

@@ -4,18 +4,17 @@
  * Map wholesale price
  * Map wholesaleSales if it has sales/promotions
  * @param {*} product
- * @param {boolean} isBundleKit
  * @return {number} wholesalePrice
  */
-function wholeSalePrice(product, isBundleKit) {
+function wholeSalePrice(product) {
   const  { price, totalPrice } = product;
-  const productPrice  = totalPrice  ? totalPrice : price;
+  const productPrice  = price  ?  price : totalPrice;
 
   if (productPrice.wholesaleSales) {
     return productPrice.wholesaleSales;
   }
 
-  return isBundleKit ? productPrice.wholesaleOriginal : productPrice.wholesale;
+  return productPrice.wholesale;
 }
 
 module.exports  = wholeSalePrice;

package/src/graph-ql/mappers/wholesaleSubscriptionPrice.js

@@ -8,7 +8,7 @@
  */
 function wholesaleSubscriptionPrice(product) {
   const  { price, totalPrice } = product;
-  const productPrice  = totalPrice  ? totalPrice : price;
+  const productPrice  = price  ?  price : totalPrice;
 
   if (productPrice.wholesaleSales) {
 

package/src/graph-ql/product.js

@@ -86,14 +86,14 @@ async function getProduct(id, market, locale, config) {
  * @return {obj} prices
  */
 function mapPrices(product, isKitBundle = false) {
-  const originalPrice = mapOriginalPrice(product, isKitBundle);
-  const retailPrice = mapRetailPrice(product, isKitBundle);
-  const wholesalePrice = mapWholesalePrice(product, isKitBundle);
-  const originalWholeSalePrice = mapOriginalPrice(product, true, isKitBundle);
+  const originalPrice = mapOriginalPrice(product, false, isKitBundle) || 0;
+  const retailPrice = mapRetailPrice(product) || 0;
+  const wholesalePrice = mapWholesalePrice(product) || 0;
+  const originalWholeSalePrice = mapOriginalPrice(product, true, isKitBundle) || 0;
 
   //map subscription (ADR) prices
-  const retailSubscriptionPrice =  mapRetailSubscriptionPrice(product);
-  const wholesaleSubscriptionPrice =  mapWholesaleSubscriptionPrice(product);
+  const retailSubscriptionPrice =  mapRetailSubscriptionPrice(product) || 0;
+  const wholesaleSubscriptionPrice =  mapWholesaleSubscriptionPrice(product) || 0;
 
   return {
     originalPrice,

package/src/graph-ql/query/index.js

@@ -1,5 +1,5 @@
 const getProductByIdQuery = require('./getProductById');
 
 module.exports = {
-  getProductById: getProductByIdQuery
+  getProductByIdQuery
 }