@nuskin/ns-shop 5.18.4 → 5.18.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-shop",
-  "version": "5.18.4",
+  "version": "5.18.6",
   "description": "The description that will amaze and astound your audience when they read it",
   "main": "src/shop.js",
   "scripts": {

package/src/qualification/qualificationService.js

@@ -1,7 +1,8 @@
 import $ from '@nuskin/nuskinjquery';
 import {UserService} from '@nuskin/ns-account';
+import { retrieveToggles } from '@nuskin/ns-feature-flags';
 import {ConfigService, events, StringService, RunConfigService, storage, NsNotQualifiedException} from '@nuskin/ns-util';
-import ProductService from './../cart/productService'
+import {ProductService, CartService} from '@nuskin/ns-shop'
 import axios from 'axios';
 
 const QUALIFICATION_URL = "/qualification/v1";
@@ -13,6 +14,17 @@ let _activeEvents = [];
 let getPromise = {promise: null};
 let managePromise = {promise: null};
 
+let featureFlags = false
+
+let variantMappings = {}
+
+const checkFlag = async (flag) => {
+    if (!featureFlags) {
+        featureFlags = await retrieveToggles()
+    }
+    return featureFlags.has(flag)
+}
+
 /*
 -----------------------------
 Private Methods
@@ -41,6 +53,40 @@ const _getHeaders = (jwt) => {
     return headers;
 };
 
+const _mapSkusToBase = async (skuList, exclusiveProductsOnly) => {
+
+    // load product data
+    await loadVariantMappings(skuList)
+
+    return skuList
+        .map(sku => '' + sku)
+        .filter(sku => variantMappings[sku].isExclusive || !exclusiveProductsOnly)
+        .reduce((result, sku) => {
+            result[sku] = variantMappings[sku].sku
+            return result
+        }, {})
+}
+
+const _convertCartDataToBaseSkus = async (cartList, exclusiveProductsOnly) => {
+
+    const mappings = await _mapSkusToBase(cartList.map(entry => entry.sku), exclusiveProductsOnly)
+
+    const result = cartList
+        .filter(item => mappings[item.sku])
+        .reduce((result, item) => {
+            const baseSku = mappings[item.sku]
+            if (!result[baseSku]) {
+                result[baseSku] = {
+                    sku: baseSku,
+                    qty: 0
+                }
+            }
+            result[baseSku].qty += item.qty
+            return result
+        }, {})
+    return result
+}
+
 const _loadAddons = async (qualifications) => {
     await Promise.all(
         Object.keys(qualifications)
@@ -49,9 +95,7 @@ const _loadAddons = async (qualifications) => {
                 // eslint-disable-next-line no-async-promise-executor
                 new Promise(async (resolve) => {
                     try {
-                        let productData = await ProductService.getProductBySku({
-                            sku: sku
-                        });
+                        let productData = await ProductService.getProductBySku({sku: sku})
 
                         if (productData && productData.product && productData.product.addOns && Array.isArray(productData.product.addOns)) {
                             qualifications[sku].addOns = productData.product.addOns.map(element => element.sku ? element.sku : element + '')
@@ -499,6 +543,12 @@ const returnQualifications = async (sku) => {
  * @returns {Promise<*>}
  */
 const getQualification = async (sku) => {
+
+    const featureEnabled = await checkFlag('cx15-4373')
+    if (featureEnabled) {
+        sku = (await _mapSkusToBase([sku]))[sku]
+    }
+
     let qualifications =  await getQualifications();
     return qualifications[sku];
 };
@@ -511,16 +561,72 @@ const getQualification = async (sku) => {
  * @returns {Promise<*>}
  */
 const isQualified = async (sku, qty) => {
-    let retVal = false,
-        qualification = await getQualification(sku);
+    const featureEnabled = await checkFlag('cx15-4373')
+    if (featureEnabled) {
+        const cartItem = CartService.getItemData().find(item => item.sku == sku)
+        let quantityChange = qty
+        if (cartItem) {
+            quantityChange = qty - cartItem.qty
+        }
 
-    if (qualification && qualification.quantity >= qty) {
-        retVal = qualification.isConsumable;
-    }
+        sku = (await _mapSkusToBase([sku]))[sku]
 
-    return retVal;
+        if (!sku) {
+            return true// the product isn't exclusive
+        }
+    
+        const newCartContentsBaseSkus = await _convertCartDataToBaseSkus(
+            [...CartService.getItemData(), {sku: sku, qty: quantityChange}],
+            true)
+        const qualification = await getQualification(sku);
+
+        return qualification && qualification.quantity >= newCartContentsBaseSkus[sku].qty && qualification.isConsumable
+    } else {
+        let retVal = false,
+            qualification = await getQualification(sku);
+
+        if (qualification && qualification.quantity >= qty) {
+            retVal = qualification.isConsumable;
+        }
+
+        return retVal;
+    }
 };
 
+/**
+ * Allows you to pass a list of product sku's to load variant data for
+ * @param {*} skuList 
+ */
+const loadVariantMappings = async (skuList, loadBaseProducts) => {
+    const promises = skuList
+        .map(sku => '' + sku)
+        .filter(sku => !variantMappings[sku])
+        .map(sku => ProductService.getProductBySku({sku: sku})
+            .then(result => {
+                const sku = result.product.sku
+                variantMappings[sku] = {
+                    isExclusive: result.product.isExclusive,
+                    sku: result.product.baseSku || sku
+                }
+                return result;
+            })
+        )
+    let products = await Promise.all(promises)
+
+    // once we have loaded the variants, also load all their parent products
+
+    if (loadBaseProducts) {
+        const baseProductSkus = products
+            .map(result => result.product)
+            .filter(product => product.baseSku)
+            .map(product => product.baseSku)
+        
+        if (baseProductSkus.length > 0) {
+            loadVariantMappings(baseProductSkus, false)
+        }
+    }
+}
+
 /**
  * Return whether to show qualification banner
  */
@@ -548,6 +654,7 @@ $(document).ready(_setListeners);
 const qualificationService = {
     _setListeners,          // Only exposed for unit testing purposes this is called above in the jquery ready function
     _clearQualifications,   // exposed for unit testing
+    loadVariantMappings,
     getQualifications,
     getQualification,
     isQualified,

package/src/salesEventService.js

@@ -657,13 +657,13 @@ function _getAwsUrl(eventName, ticketId) {
     let url;
 
     if (eventName && ticketId) {    // update ticket
-        url = `${ConfigService.getMarketConfig(false, undefined, true).awsUrl}/sales-event/v1/${eventName}/${ticketId}`;
+        url = `${ConfigService.getMarketConfig().awsUrl}/sales-event/v1/${eventName}/${ticketId}`;
         // url = `https://devapi.cloud.nuskin.com/sales-event/v1/${eventName}/${ticketId}`;
     } else if (eventName) {         // create ticket
-        url = `${ConfigService.getMarketConfig(false, undefined, true).awsUrl}/sales-event/v1/${eventName}`;
+        url = `${ConfigService.getMarketConfig().awsUrl}/sales-event/v1/${eventName}`;
         // url = `https://devapi.cloud.nuskin.com/sales-event/v1/${eventName}`;
     } else {                        // get list of events
-        url = `${ConfigService.getMarketConfig(false, undefined, true).awsUrl}/sales-event/v1`;
+        url = `${ConfigService.getMarketConfig().awsUrl}/sales-event/v1`;
         // url = `https://devapi.cloud.nuskin.com/sales-event/v1`;
     }
 
@@ -680,7 +680,7 @@ function _getAwsUrl(eventName, ticketId) {
  * @private
  */
 function _getHeaders(clientId, clientSecret, jwt) {
-    let config = ConfigService.getMarketConfig(false, undefined, true),
+    let config = ConfigService.getMarketConfig(),
         headers = {
             'Accept': 'application/json',
             'Content-Type': 'application/json',
@@ -767,7 +767,7 @@ function _initDataConnect(country) {
  */
 function _loadMarketEventConfig(force,country=undefined) {
     if (force || !mktEventConfigMap) {
-        let config = ConfigService.getMarketConfig(force, country, true);
+        let config = ConfigService.getMarketConfig(force, country);
 
         if (config && !config.error) {
             let salesEvents = config.salesEvent;