@nuskin/ns-product-lib 2.19.7-td-1017.3 → 2.19.8-gms-10644.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-product-lib",
-  "version": "2.19.7-td-1017.3",
+  "version": "2.19.8-gms-10644.1",
   "description": "This project contains shared Product models and code between the backend and frontend.",
   "main": "src/index.js",
   "scripts": {
@@ -22,7 +22,7 @@
     "@nuskin/configuration-sdk": "3.0.0",
     "@nuskin/ns-common-lib": "1.4.7",
     "@nuskin/ns-util": "4.5.4",
-    "@nuskin/product-lib": "2.3.1-td-1017.1",
+    "@nuskin/product-lib": "2.2.1",
     "axios": "1.6.7",
     "axios-mock-adapter": "1.21.2",
     "eslint": "^8.56.0",

package/src/graph-ql/product.js

@@ -72,8 +72,8 @@ async function getProducts(ids, market, locale, config) {
 
   try {
     const data = await productLib.getProductsById(
-      ids, market, locale,
-      null, 1, okta,
+      ids, market, locale, 
+      null, 1, okta, 
       config.graphqlUrl.includes('test') ? 'test' : config.graphqlUrl.includes('dev') ? 'dev' : 'prod'
     );
     if (data && data.products) {
@@ -248,16 +248,16 @@ function mapPricingJson(productDetail, kitOrVariant, isContentStack) {
 // eslint-disable-next-line no-unused-vars
 function mapProduct(product, market, locale, config) {
   const kitBundleProducts = product.bundle;
+  
   //serves as parent
   const defaultVariant = !kitBundleProducts ? product.variants.find(v => v.sku === config.sku) : null
-  const productImages = mapProductImages(product)
   const kitOrVariant = !kitBundleProducts ? defaultVariant : kitBundleProducts
   const productOrVariant = !kitBundleProducts ? defaultVariant : product
+  const productImages = mapProductImages(productOrVariant)
   const pricing = kitOrVariant.price
   const points = kitOrVariant.points
   const isBackOrdered = kitOrVariant.status.inventory === 'backordered'
   const promoData = mapPromos(kitOrVariant)
-  const productionBom = product.bundle && product.bundle.isProductionBom ? product.bundle.isProductionBom : false;
 
   const productDetail = {
     "sku": !kitBundleProducts ? defaultVariant.sku : product.id,
@@ -277,8 +277,8 @@ function mapProduct(product, market, locale, config) {
     "availableQuantity": isBackOrdered ? kitOrVariant.backorderQuantity : kitOrVariant.atpQuantity,
     "maxQuantity": kitOrVariant.maxQuantity,
     "points": "",
-    "cv": points.wholesale ? points.wholesale.cv : 0,
-    "pv": points.wholesale ? points.wholesale.pv : 0,
+    "cv": points && points.wholesale ? points.wholesale.cv : 0,
+    "pv": points && points.wholesale ? points.wholesale.pv : 0,
     "priceType": "WRTL",
     "price": pricing.retail,
     "priceMap": {
@@ -295,15 +295,15 @@ function mapProduct(product, market, locale, config) {
     },
     "cvMap": {
       ...promoData.cvMap,
-      "WWHL": points.wholesale ? points.wholesale.cv : 0,
-      "WADW": points.subscription ? points.subscription.cv : 0,
-      "WHL": points.wholesale ? points.wholesale.cv : 0
+      "WWHL": points &&  points.wholesale ? points.wholesale.cv : 0,
+      "WADW": points && points.subscription ? points.subscription.cv : 0,
+      "WHL": points && points.wholesale ? points.wholesale.cv : 0
     },
     "pvMap": {
       ...promoData.pvMap,
-      "WWHL": points.wholesale ? points.wholesale.pv : 0,
-      "WADW": points.subscription ? points.subscription.pv : 0,
-      "WHL": points.wholesale ? points.wholesale.pv : 0
+      "WWHL": points && points.wholesale ? points.wholesale.pv : 0,
+      "WADW": points && points.subscription ? points.subscription.pv : 0,
+      "WHL": points && points.wholesale ? points.wholesale.pv : 0
     },
     "orderTypes": mapOrderTypes(kitOrVariant.availableChannels, kitOrVariant.purchaseTypes),
     "custTypes": mapCustomerTypes(kitOrVariant.customerTypes),
@@ -328,8 +328,7 @@ function mapProduct(product, market, locale, config) {
     "properties": {
       isBackOrdered: isBackOrdered,
       inventoryStatus: isBackOrdered ? 'BACKORDER' : 'IN STOCK',
-      productStatus: mapProductStatus(kitOrVariant.status.status),
-      productionBom: productionBom
+      productStatus: mapProductStatus(kitOrVariant.status.status)
     }
   }
 
@@ -400,8 +399,8 @@ function mapVariants(product, isContentStack) {
       "availableQuantity": variant.availableQuantity,
       "maxQuantity": variant.maxQuantity,
       "points": "",
-      "cv": points.wholesale ? points.wholesale.cv : 0,
-      "pv": points.wholesale ? points.wholesale.pv : 0,
+      "cv": points && points.wholesale ? points.wholesale.cv : 0,
+      "pv": points && points.wholesale ? points.wholesale.pv : 0,
       "priceType": "WRTL",
       "price": pricing.retail,
       "priceMap": {
@@ -418,15 +417,15 @@ function mapVariants(product, isContentStack) {
       },
       "cvMap": {
         ...promoData.cvMap,
-        "WWHL": points.wholesale ? points.wholesale.cv : 0,
-        "WADW": points.subscription ? points.subscription.cv : 0,
-        "WHL": points.wholesale ? points.wholesale.cv : 0
+        "WWHL": points && points.wholesale ? points.wholesale.cv : 0,
+        "WADW": points && points.subscription ? points.subscription.cv : 0,
+        "WHL": points && points.wholesale ? points.wholesale.cv : 0
       },
       "pvMap": {
         ...promoData.pvMap,
-        "WWHL": points.wholesale ? points.wholesale.pv : 0,
-        "WADW": points.subscription ? points.subscription.pv : 0,
-        "WHL": points.wholesale ? points.wholesale.pv : 0
+        "WWHL": points && points.wholesale ? points.wholesale.pv : 0,
+        "WADW": points && points.subscription ? points.subscription.pv : 0,
+        "WHL": points && points.wholesale ? points.wholesale.pv : 0
       },
       "orderTypes": mapOrderTypes(variant.availableChannels, variant.purchaseTypes),
       "custTypes": mapCustomerTypes(variant.customerTypes),