@nuskin/ns-shop 6.4.14 → 6.4.15

package/package.json

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

package/src/cart/productService.js

@@ -4,7 +4,8 @@ import {RunConfigService, util, events, BrowserDetection, UrlService} from '@nus
 import {UserService, AccountManager} from '@nuskin/ns-account';
 import ProductStatusService from '../product/ProductStatusService.js';
 import _ from 'lodash';
-import { getCachedConfigField } from '@nuskin/configuration-sdk';
+import { getConfiguration } from '@nuskin/configuration-sdk';
+import axios from 'axios';
 
 let ProductService = function() {
     // ---------------------------------------------
@@ -27,7 +28,7 @@ let ProductService = function() {
 
             let values = await Promise.all(promises);
 
-            let result = handleDetailResponse(values[0], options);
+            let result = await handleDetailResponse(values[0], options);
 
             if (values[1] && values[1][0]) {
                 handleStatusResponse(result.product, values[1][0], options);
@@ -40,20 +41,6 @@ let ProductService = function() {
             return result;
         },
 
-        getProductsBySkus: function(options, callbackFn) {
-            let deferred = [];
-
-            for (let i = 0; i < options.skus.length; i++) {
-                deferred.push(
-                    $.ajaxWrapper.getJson(getSkuSearchUrl({
-                        sku: options.skus[i],
-                        cntryCd: options.country,
-                        language: options.language}), null, null, 0).getJqXHR()
-                );
-            }
-            $.when.apply(this, deferred).then(multiProductCallback(options, callbackFn));
-        },
-
         /**
          * Retrieves product data from PMD - /content/products
          * Full URL used to get product data ex. https://test.nuskin.com/content/products/01/11/11/01111155/en.service.US.json
@@ -88,7 +75,7 @@ let ProductService = function() {
             });
 
 
-            
+
         }
     };
 
@@ -97,28 +84,22 @@ let ProductService = function() {
     //        Private Methods
     //
     // ---------------------------------------------
-    function getProductDetail(_options) {
+    async function getProductDetail(_options) {
         let options = _options;
-        return new Promise(function(resolve, reject) {
-            let url = getSkuSearchUrl(options);
-
-            // Hit the PMD and get all the data for the product including the price information.
-            // Example url: https://test.nuskin.com/content/products/01/00/34/01003440.service.US.json
-            try {
-                $.ajaxWrapper.getJson(
-                    url,
-                    function(data) {
-                        resolve(data);
-                    },
-                    function(err) {
-                        reject({error: err, url: url, failedSku: options.sku, type: events.errors.PRODUCT_LOOKUP});
-                    },
-                    0
-                );
-            } catch (e) {
-                reject({error: e, url: url, failedSku: options.sku, type: events.errors.PRODUCT_LOOKUP});
-            }
-        });
+        let url = await getSkuSearchUrl(options);
+        let data;
+
+        // Hit the PMD and get all the data for the product including the price information.
+        // Example url: https://test.nuskin.com/content/products/01/00/34/01003440.service.US.json
+        try {
+            data = await axios({
+                method: 'GET',
+                url
+            })
+        } catch (e) {
+            throw {error: e, url: url, failedSku: options.sku, type: events.errors.PRODUCT_LOOKUP};
+        }
+        return data.data;
     }
 
     function getProductStatus(_options) {
@@ -144,7 +125,7 @@ let ProductService = function() {
         );
     }
 
-    function getSkuSearchUrl(options) {
+    async function getSkuSearchUrl(options) {
         let firstTwo = options.sku.substring(0, 2),
             secondTwo = options.sku.substring(2, 4),
             thirdTwo = options.sku.substring(4, 6),
@@ -152,7 +133,8 @@ let ProductService = function() {
             query = '',
             skuSearchUrl;
 
-        skuSearchUrl = getCachedConfigField('skuSearchUrl');
+        const {Url: urlCfg} = await getConfiguration(['Url']);
+        skuSearchUrl = urlCfg.skuSearchUrl;
 
         if (runConfig.baseUrl !== '' && !skuSearchUrl.startsWith('http')) {
             query = runConfig.baseUrl;
@@ -173,7 +155,7 @@ let ProductService = function() {
         return query;
     }
 
-    function handleDetailResponse(responseData, options) {
+    async function handleDetailResponse(responseData, options) {
         let retVal = {success: true},
             dataForProduct = createDataFromSkuSearch(responseData, options);
 
@@ -202,7 +184,8 @@ let ProductService = function() {
         }
 
         if (retVal.product && options.priceType) {
-            const priceType = getCachedConfigField('showWholeSalePricing') && !AccountManager.isLoggedIn()
+            const {Cart: cartCfg} = await getConfiguration(['Cart']);
+            const priceType = cartCfg.showWholeSalePricing && !AccountManager.isLoggedIn()
                 ? PriceType.WWHL
                 : options.priceType;
             retVal.product.setPriceAndPvFromType(priceType);
@@ -219,26 +202,6 @@ let ProductService = function() {
         }
     }
 
-    function multiProductCallback(_options, _callbackFn) {
-        let options = _options,
-            callbackFn = _callbackFn;
-        return function() {
-            let retData = {};
-            if (callbackFn) {
-                if (arguments[0]) {
-                    if (arguments[0][0]) {
-                        for (let i = 0; i < arguments.length; i++) {
-                            retData[arguments[i][0].sku] = createDataFromSkuSearch(arguments[i][0], options);
-                        }
-                    } else {
-                        retData[arguments[0].sku] = createDataFromSkuSearch(arguments[0], options);
-                    }
-                    callbackFn(retData);
-                }
-            }
-        };
-    }
-
     function createDataFromSkuSearch(searchData, options) {
         if (_.isEmpty(searchData)) {
             return new Product();