@nuskin/ns-shop 7.0.11-pur-813.5 → 7.0.11-pur-813.7

package/package.json

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

package/src/cart/csProductHelper.js

@@ -8,7 +8,7 @@ const extractProductData = (data, sku) => {
     let retVal;
 
     if (Array.isArray(data.variants) && data.variants.length > 0) {
-        retVal = data.variants.find((variant) => variant.sku === sku);
+        retVal = data.variants.find((variant) => variant.sku === sku) || data.variants[0];
         retVal.variantSelectLabel = data.variantSelectLabel;
     } else if (data.bundle) {
         retVal = data.bundle;
@@ -262,6 +262,13 @@ const getProductBySku = async (options) => {
     return result;
 }
 
+const getProductData = async (options) => {
+    const data = await getProductDetail(options);
+
+    return createDataFromSkuSearch(data, options);
+}
+
 export {
-    getProductBySku
+    getProductBySku,
+    getProductData
 }

package/src/cart/productService.js

@@ -1,11 +1,10 @@
-import $ from '@nuskin/nuskinjquery';
 import {PriceType, Product} from '@nuskin/ns-product-lib';
 import {RunConfigService, events, util, BrowserDetection, UrlService} from '@nuskin/ns-util';
 import {UserService, AccountManager} from '@nuskin/ns-account';
 import ProductStatusService from '../product/ProductStatusService.js';
 import _ from 'lodash';
 import { getConfiguration } from '@nuskin/configuration-sdk';
-import { getProductBySku as getCsProductBySku } from './csProductHelper.js';
+import { getProductBySku as getCsProductBySku, getProductData as getCsProductData } from './csProductHelper.js';
 import axios from 'axios';
 
 let ProductService = function() {
@@ -37,35 +36,48 @@ let ProductService = function() {
          * @param {string} sku - ex. 01111155
          * @returns {Promise}
          */
-        getProductData: function(sku, country, language) {
-            if(!sku) return;
-            let optionsData = country ? {country} : {};
-            if(language)
-                optionsData.language = language;
-
-            let tokenizedSku = tokenizeSku(sku),
-                url,
-                options = verifyLocaleFields(optionsData);
-
-            url = UrlService.getSiteUrl() + "/content/products/" + tokenizedSku + "/" +
-                options.language + ".service." + options.country + ".json";
-
-            return new Promise((resolve, reject) => {
-                $.ajax({
-                    type: 'GET',
-                    url: url,
-                    success: function(response) {
-                        resolve(createDataFromSkuSearch(response, options));
-                    },
-                    error: function(response) {
-                        console.error("There was a problem retrieving product data:", response);
-                        reject(response);
+        getProductData: async function(sku, country, language) {
+            let retVal;
+
+            if (sku) {
+                const optionsData = {
+                    country: country ? country : undefined,
+                    language: language ? language : undefined,
+                    sku
+                };
+                const options = verifyLocaleFields(optionsData);
+                const {Cart: cartCfg} = await getConfiguration(['Cart']);
+
+                try {
+
+                    if (cartCfg.useContentStackProductData) {
+                        retVal = await getCsProductData(options);
+                    } else {
+                        const tokenizedSku = tokenizeSku(sku);
+                        const url = UrlService.getSiteUrl() + "/content/products/" + tokenizedSku + "/" +
+                            options.language + ".service." + options.country + ".json";
+                        const response = await axios.get(url);
+                        retVal = createDataFromSkuSearch(response, options);
                     }
-                });
-            });
-
-
-
+                } catch (err) {
+                    console.error("There was a problem retrieving product data", err);
+                }
+            }
+            return retVal;
+
+            // return new Promise((resolve, reject) => {
+            //     $.ajax({
+            //         type: 'GET',
+            //         url: url,
+            //         success: function(response) {
+            //             resolve(createDataFromSkuSearch(response, options));
+            //         },
+            //         error: function(response) {
+            //             console.error("There was a problem retrieving product data:", response);
+            //             reject(response);
+            //         }
+            //     });
+            // });
         }
     };
 

package/src/shipping/pickupUtil.js

@@ -182,6 +182,7 @@ let PickupUtil = function() {
                 includePickupPoints = includePickupPoints && !postalCode.match(regEx);
             }
 
+            const runConfig = RunConfigService.getRunConfig();
             promise = axios.post(
                 getUrl(),
                 {
@@ -189,7 +190,8 @@ let PickupUtil = function() {
                     pudo: includePickupPoints,
                     orderValue: getOrderValue(),
                     dangerousGoods: CartService.hasDangerousGoods(),
-                    language: RunConfigService.getRunConfig().language
+                    language: runConfig.language,
+                    country: runConfig.country
                 },
                 {
                     headers: {
@@ -199,7 +201,11 @@ let PickupUtil = function() {
             ).then((results) => {
                 shipMethods = results.data.shipMethods;
                 pickupPoints = results.data.pickupPoints;
-            })
+            }).catch((err) => {
+                console.log(err);
+                shipMethods = [];
+                pickupPoints = [];
+            });
         }
     }