@nuskin/cs-product-lib 1.0.9 → 1.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/cs-product-lib",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "Library for pulling and parsing product content (and applying business logic) retrieved from Contentstack",
   "main": "src/index.js",
   "scripts": {

package/src/csProduct.js

@@ -215,7 +215,7 @@ const csProduct = (props) => {
         const requiredProducts = []
         for (let i = 0; i < products.length; i++) {
             for (let v = 0; v < products[i].variants.length; v++) {
-                if (products[i].variants[v].sku !== variantSkus[i]) {
+                if (!variantSkus.includes(products[i].variants[v].sku)) {
                     products[i].variants.splice(v, 1)
                     v--
                 }

package/src/formatKit.js

@@ -2,55 +2,43 @@ const moment = require('moment')
 
 const parseStatus = (variant) => {
     const dateFormat = 'YYYY-MM-DD'
-    const properties = variant.properties || {}
-    if (
-        variant.inventoryProperties && 
-    variant.inventoryProperties.backOrdered && 
-    variant.inventoryProperties.expectedBackOrderAvailabilityDate) {
-        return {
 
-            // changed
-            status: 'inactive', 
-            isBackordered: variant.inventoryProperties.backOrdered, 
-            backorderedAvailableDate: moment(variant.inventoryProperties.expectedBackOrderAvailabilityDate).format(dateFormat)
+    if (variant.type !== 'bundle' && variant.type !== 'kit') {
+        return {
+            status: variant.status.status, 
+            isBackordered: variant.status.isBackordered, 
+            backorderedAvailableDate: variant.status.backorderedAvailableDate
         }
-    } else if(properties.productStatus) {
-        let isBackordered = false
-        let backorderedAvailableDate = null
-        if (variant.kit) {
-            try {
-                const latestBODate = Math.min(...variant.kit.flatMap(a=>a.sku.map(s=>s.inventoryProperties.expectedBackOrderAvailabilityDate))) || 0
-                if (latestBODate) {
-                    isBackordered = true
-                    backorderedAvailableDate = moment(Date(latestBODate)).format(dateFormat)
-                }
-            } catch {
-                backorderedAvailableDate = null
-            }
-      
-        } else if (variant.bundle) {
-            try {
-                const latestBODate = Math.min(...variant.bundleMandatoryProducts.flatMap(a=>a.sku.map(s=>s.inventoryProperties.expectedBackOrderAvailabilityDate))) || 0
-                if (latestBODate) {
-                    isBackordered = true
-                    backorderedAvailableDate = moment(Date(latestBODate)).format(dateFormat)
-                }
-            } catch {
-                backorderedAvailableDate = null
+    } 
+    
+    let isBackordered = false
+    let backorderedAvailableDate = null
+    if (variant.type === 'kit') {
+        try {
+            const latestBODate = Math.max(...variant.requiredProducts.flatMap(a=>a.product.variants.map(s=>Number(new Date(s.status.backorderedAvailableDate)) || 0)))
+            if (latestBODate) {
+                isBackordered = true
+                backorderedAvailableDate = moment(new Date(latestBODate)).format(dateFormat)
             }
+        } catch {
+            backorderedAvailableDate = null
         }
-        return {
-            // changed
-            status: 'active',
-            isBackordered,
-            backorderedAvailableDate
+    } else if (variant.type === 'bundle') {
+        try {
+            const latestBODate = Math.max(...variant.requiredProducts.flatMap(a=>Number(new Date(a.product.variants[0]?.status?.backorderedAvailableDate)) || 0))
+            if (latestBODate) {
+                isBackordered = true
+                backorderedAvailableDate = moment(new Date(latestBODate)).format(dateFormat)
+            }
+        } catch {
+            backorderedAvailableDate = null
         }
-    } 
+    }
     return {
         // changed
-        status: 'active',
-        isBackordered: false,
-        backorderedAvailableDate: null
+        status: variant.status.status, 
+        isBackordered: isBackordered, 
+        backorderedAvailableDate: backorderedAvailableDate
     }
 };
 
@@ -59,7 +47,7 @@ const parsePrice = (product = []) => {
 
     const variants = requiredProducts?.map(p => {
         const [firstVariant] = p?.product?.variants || []
-        return firstVariant
+        return {...firstVariant, quantity: p?.quantity}
     })
 
     const defaultValues =  {
@@ -91,18 +79,18 @@ const parsePrice = (product = []) => {
             wholesale : {}
         }
 
-        price.retail = Number(acc?.price?.retail || 0) + Number(curr?.price?.retail || 0)
-        price.retailSubscription = Number(acc?.price?.retailSubscription || 0) + Number(curr?.price?.retailSubscription || 0)
-        price.wholesale = Number(acc?.price?.wholesale || 0) + Number(curr?.price?.wholesale || 0)
-        price.wholesaleSubscription = Number(acc?.price?.wholesaleSubscription || 0) + Number(curr?.price?.wholesaleSubscription || 0)
-        price.currencyCode = curr?.price.currencyCode
+        price.retail = Number((acc?.price?.retail || 0)) + Number((curr?.price?.retail || 0) * (curr?.quantity || 1))
+        price.retailSubscription = Number(acc?.price?.retailSubscription || 0) + Number((curr?.price?.retailSubscription || 0) * (curr?.quantity || 1))
+        price.wholesale = Number(acc?.price?.wholesale || 0) + Number((curr?.price?.wholesale || 0) * (curr?.quantity || 1))
+        price.wholesaleSubscription = Number(acc?.price?.wholesaleSubscription || 0) + Number((curr?.price?.wholesaleSubscription || 0) * (curr?.quantity || 1))
+        price.currencyCode = curr?.price?.currencyCode
 
-        points.subscription.cv = Number(acc?.points?.subscription?.cv || 0) + Number(curr?.points?.subscription?.cv || 0)
-        points.subscription.pv = Number(acc?.points?.subscription?.pv || 0) + Number(curr?.points?.subscription?.pv || 0)
-        points.subscription.sb = Number(acc?.points?.subscription?.sb || 0) + Number(curr?.points?.subscription?.sb || 0)
-        points.wholesale.cv = Number(acc?.points?.wholesale?.cv || 0) + Number(curr?.points?.wholesale?.cv || 0)
-        points.wholesale.pv = Number(acc?.points?.wholesale?.pv || 0) + Number(curr?.points?.wholesale?.pv || 0)
-        points.wholesale.sb = Number(acc?.points?.wholesale?.sb || 0) + Number(curr?.points?.wholesale?.sb || 0)
+        points.subscription.cv = Number(acc?.points?.subscription?.cv || 0) + Number((curr?.points?.subscription?.cv || 0) * (curr?.quantity || 1))
+        points.subscription.pv = Number(acc?.points?.subscription?.pv || 0) + Number((curr?.points?.subscription?.pv || 0) * (curr?.quantity || 1))
+        points.subscription.sb = Number(acc?.points?.subscription?.sb || 0) + Number((curr?.points?.subscription?.sb || 0) * (curr?.quantity || 1))
+        points.wholesale.cv = Number(acc?.points?.wholesale?.cv || 0) + Number((curr?.points?.wholesale?.cv || 0) * (curr?.quantity || 1))
+        points.wholesale.pv = Number(acc?.points?.wholesale?.pv || 0) + Number((curr?.points?.wholesale?.pv || 0) * (curr?.quantity || 1))
+        points.wholesale.sb = Number(acc?.points?.wholesale?.sb || 0) + Number((curr?.points?.wholesale?.sb || 0) * (curr?.quantity || 1))
 
         return { price, points}
     }, defaultValues)
@@ -120,7 +108,7 @@ const parseKitAvailableQuantity = (kit) => {
 const parseBundleAvailableQuantity = (product) => {
     try {
         const {requiredProducts = []} = product|| {}
-        const quantities = requiredProducts?.map(p => p?.quantity || 0)
+        const quantities = requiredProducts.map(p=>p.product?.variants.map(a=>a.availableQuantity))
         return Math.min(...quantities) || 0
     } catch {
         console.log("some error in availableQuantity")
@@ -159,7 +147,7 @@ const parseKit = (product, market) => {
     kits.grpDiscount = properties?.grpDiscount
     kits.scanQualifiedCount = properties?.scanQualifiedCount
     // newVariant.slug = undefined
-    kits.status = parseStatus(product)
+    kits.status = parseStatus(properties)
     if ((kits.status || {}).status === 'active') kits.status.status = 'sellable'
     const kitProducts = []
     if (properties.type === 'kit' && product.kit) {