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

package/package.json

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

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

@@ -3,11 +3,12 @@ const wholesalePrice = require('./wholesalePrice');
 const retailPrice = require('./retailPrice');
 const  retailSubscriptionPrice = require('./retailSubscriptionPrice')
 const  wholesaleSubscriptionPrice = require('./wholesaleSubscriptionPrice')
-
+const originalPrice  = require('./originalPrice');
 
 module.exports = {
   mapWholesalePrice: wholesalePrice,
   mapRetailPrice: retailPrice,
   mapRetailSubscriptionPrice: retailSubscriptionPrice,
-  mapWholesaleSubscriptionPrice: wholesaleSubscriptionPrice
+  mapWholesaleSubscriptionPrice: wholesaleSubscriptionPrice,
+  mapOriginalPrice : originalPrice
 }

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

@@ -0,0 +1,24 @@
+
+
+/**
+ * Map original price (set to retail)
+ * use original price if product type is equal to kit/bundle
+ * @param {obj} product
+ * @param {boolean} isWholesale default === false
+ * @param {boolean} isBundleKit default === false
+ * @return {number} retailPrice
+ */
+function  originalPrice(product, isWholesale = false, isBundleKit = false) {
+  const  { price, totalPrice } = product;
+  const productPrice  = totalPrice  ? totalPrice : price;
+
+  if (isBundleKit) {
+
+    return isWholesale ? productPrice.wholesaleOriginal : productPrice.retailOriginal;
+  }
+
+  return isWholesale ? productPrice.wholesale : productPrice.retail;
+
+}
+
+module.exports  = originalPrice;

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

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

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

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

package/src/graph-ql/product.js

@@ -7,7 +7,9 @@ const {
   mapWholesalePrice,
   mapRetailPrice,
   mapRetailSubscriptionPrice,
-  mapWholesaleSubscriptionPrice } = require('./mappers');
+  mapWholesaleSubscriptionPrice,
+  mapOriginalPrice
+} = require('./mappers');
 
 const defaultPayload = {
   operationName: "getProduct",
@@ -77,6 +79,32 @@ async function getProduct(id, market, locale, config) {
   };
 }
 
+/**
+ * Map product prices
+ * @param {*} product
+ * @param {boolean} isKitBundle
+ * @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);
+
+  //map subscription (ADR) prices
+  const retailSubscriptionPrice =  mapRetailSubscriptionPrice(product);
+  const wholesaleSubscriptionPrice =  mapWholesaleSubscriptionPrice(product);
+
+  return {
+    originalPrice,
+    originalWholeSalePrice,
+    retailPrice,
+    wholesalePrice,
+    retailSubscriptionPrice,
+    wholesaleSubscriptionPrice
+  }
+}
+
 /**
  *
  * Map product data to be product card consumable structure *
@@ -108,6 +136,16 @@ function mapProduct(product, market, locale, config) {
   //serves as parent
   const defaultVariant = variants[0];
   const productImages = mapProductImages(defaultVariant);
+
+  const {
+    originalPrice,
+    retailPrice,
+    wholesalePrice,
+    retailSubscriptionPrice,
+    wholesaleSubscriptionPrice,
+    originalWholeSalePrice
+  } = mapPrices(defaultVariant, !!kitBundleProducts);
+
   const productDetail = {
     "sku": defaultVariant.sku || product.id,
     "globalProductID": product.id,
@@ -129,15 +167,15 @@ function mapProduct(product, market, locale, config) {
     "cv": (defaultVariant.points) ? defaultVariant.points.wholesale.cv : 0,
     "pv": (defaultVariant.points) ? defaultVariant.points.wholesale.pv : 0,
     "priceType": "WRTL",
-    "price": mapRetailPrice(defaultVariant),
+    "price": originalPrice,
     "priceMap": {
-      "WRTL": mapRetailPrice(defaultVariant),
-      "WADW-WRTL": mapRetailSubscriptionPrice(defaultVariant),
-      "WADR": mapRetailSubscriptionPrice(defaultVariant), //retail ADR (subscription) price
-      "RTL": mapRetailPrice(defaultVariant),
-      "WWHL": mapWholesalePrice(defaultVariant),
-      "WADW": mapWholesaleSubscriptionPrice(defaultVariant),//wholesale ADR (subscription price)
-      "WHL": mapWholesalePrice(defaultVariant)
+      "WRTL": retailPrice,
+      "WADW-WRTL": retailSubscriptionPrice,
+      "WADR": retailSubscriptionPrice,
+      "RTL": retailPrice,
+      "WWHL": wholesalePrice,
+      "WADW": wholesaleSubscriptionPrice,
+      "WHL": originalWholeSalePrice
     },
     "cvMap": {
       "WWHL": (defaultVariant.points) ? defaultVariant.points.wholesale.cv : 0,
@@ -219,6 +257,13 @@ function mapVariants(product) {
     const sku = variant.sku || variant.id;
 
     const productImages = mapProductImages(variant);
+    const {
+      originalPrice,
+      retailPrice,
+      wholesalePrice,
+      retailSubscriptionPrice,
+      wholesaleSubscriptionPrice
+    } = mapPrices(variant);
 
     variants[sku] = {
       "sku": sku,
@@ -239,15 +284,15 @@ function mapVariants(product) {
       "cv": (variant.points) ? variant.points.wholesale.cv : 0,
       "pv": (variant.points) ? variant.points.wholesale.pv : 0,
       "priceType": "WRTL",
-      "price": mapRetailPrice(variant),
+      "price": originalPrice,
       "priceMap": {
-        "WRTL": mapRetailPrice(variant),
-        "WADW-WRTL": mapRetailSubscriptionPrice(variant),
-        "WADR": mapRetailSubscriptionPrice(variant), //retail ADR (subscription) price
-        "RTL": mapRetailPrice(variant),
-        "WWHL": mapWholesalePrice(variant),
-        "WADW": mapWholesaleSubscriptionPrice(variant),//wholesale ADR (subscription price)
-        "WHL": mapWholesalePrice(variant)
+        "WRTL": retailPrice,
+        "WADW-WRTL": retailSubscriptionPrice,
+        "WADR": retailSubscriptionPrice,
+        "RTL": retailPrice,
+        "WWHL": wholesalePrice,
+        "WADW": wholesaleSubscriptionPrice,
+        "WHL": wholesalePrice
       },
       "cvMap": {
         "WWHL": (variant.points) ? variant.points.wholesale.cv : 0,

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

@@ -360,6 +360,8 @@ const getProductByIdQuery = `query getProduct($id: String!, $market: String, $la
       wholesaleSales
       retailSubscription
       wholesaleSubscription
+      retailOriginal
+      wholesaleOriginal
       currencyCode
       __typename
     }
@@ -370,6 +372,8 @@ const getProductByIdQuery = `query getProduct($id: String!, $market: String, $la
       wholesaleSales
       retailSubscription
       wholesaleSubscription
+      retailOriginal
+      wholesaleOriginal
       currencyCode
       __typename
     }
@@ -448,6 +452,8 @@ const getProductByIdQuery = `query getProduct($id: String!, $market: String, $la
       wholesaleSales
       retailSubscription
       wholesaleSubscription
+      retailOriginal
+      wholesaleOriginal
       __typename
     }
     totalPrice {
@@ -458,6 +464,8 @@ const getProductByIdQuery = `query getProduct($id: String!, $market: String, $la
       wholesaleSales
       retailSubscription
       wholesaleSubscription
+      retailOriginal
+      wholesaleOriginal
       __typename
     }
     points {

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

@@ -362,6 +362,8 @@ const getProductsByIdQuery = `query getProducts($id: String!, $market: String, $
       retailSubscription
       wholesaleSubscription
       currencyCode
+      retailOriginal
+      wholesaleOriginal
       __typename
     }
     totalPrice {
@@ -372,6 +374,8 @@ const getProductsByIdQuery = `query getProducts($id: String!, $market: String, $
       retailSubscription
       wholesaleSubscription
       currencyCode
+      retailOriginal
+      wholesaleOriginal
       __typename
     }
     points {
@@ -449,6 +453,8 @@ const getProductsByIdQuery = `query getProducts($id: String!, $market: String, $
       wholesaleSales
       retailSubscription
       wholesaleSubscription
+      retailOriginal
+      wholesaleOriginal
       __typename
     }
     totalPrice {
@@ -459,6 +465,8 @@ const getProductsByIdQuery = `query getProducts($id: String!, $market: String, $
       wholesaleSales
       retailSubscription
       wholesaleSubscription
+      retailOriginal
+      wholesaleOriginal
       __typename
     }
     points {