@nuskin/ns-shop 5.20.13 → 5.20.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-shop",
-  "version": "5.20.13",
+  "version": "5.20.14",
   "description": "The description that will amaze and astound your audience when they read it",
   "main": "src/shop.js",
   "scripts": {
@@ -38,7 +38,7 @@
     "@nuskin/ns-account": "4.27.3",
     "@nuskin/ns-jsanalyzer": "1.0.1",
     "@nuskin/ns-product": "3.36.2",
-    "@nuskin/ns-util": "3.99.2",
+    "@nuskin/ns-util": "3.102.2",
     "axios-mock-adapter": "1.18.2",
     "babel-cli": "6.26.0",
     "babel-core": "6.26.3",

package/src/cart/cartItem.js

@@ -1,7 +1,6 @@
 import {ConfigService, BrowserDetection} from "@nuskin/ns-util";
 import {AccountManager} from '@nuskin/ns-account';
 import {PriceType,Product} from '@nuskin/ns-product-lib';
-import FirebaseProduct from '../firebase/firebaseProduct.js';
 
 export default function CartItem(cartItemData) {
     if (!cartItemData.product) {
@@ -135,7 +134,7 @@ export default function CartItem(cartItemData) {
     };
 
     this.addAlternateBusinessPortfolio = function (altBpProduct) {
-        if (altBpProduct instanceof Product || altBpProduct instanceof FirebaseProduct) {
+        if (altBpProduct instanceof Product) {
             const priceType = ConfigService.getMarketConfig().showWholeSalePricing && !AccountManager.isLoggedIn()
                 ? PriceType.WWHL
                 : this.product.priceType;

package/src/cart/cartService.js

@@ -113,7 +113,7 @@ function _getCart() {
         let runConfig = RunConfigService.getRunConfig(null),
             user = UserService.getUser(),
             userId = user ? user.id : null,
-            cartJson = storage.getItem({...CART_STORAGE_KEY, key: _getCartStorageName(runConfig.country)}),
+            cartJson = storage.getItem(CART_STORAGE_KEY),
             anonymousCartId = storage.getItem('anonymousCartId'),
             isPitchApp = PersonalOfferStorageService.isPersonalOffer();
 
@@ -138,7 +138,7 @@ function _getCart() {
 
             if (!cartJson.userId && userId != '') {
                 cartJson.userId = userId;
-                storage.setItem({...CART_STORAGE_KEY, key: _getCartStorageName(runConfig.country)}, cartJson);
+                storage.setItem(CART_STORAGE_KEY, cartJson);
             }
             _cart_ = new Cart(cartJson);
             let modified = _cart_.updateLineItemPrices(activeEvents);
@@ -164,35 +164,19 @@ function _getCart() {
 function setCart(cart, updateTimestamp = true) {
     if (cart != null && cart instanceof Cart) {
         cart.timestamp = updateTimestamp ? Date.now() : cart.timestamp;
-        storage.setItem({...CART_STORAGE_KEY, key: _getCartStorageName(cart.cntryCd)}, cart.toJSON());
+        storage.setItem(CART_STORAGE_KEY, cart.toJSON());
     } else {
         if (cart) {
             cart.timestamp = updateTimestamp ? Date.now() : cart.timestamp;
-            storage.setItem({...CART_STORAGE_KEY, key: _getCartStorageName(cart.cntryCd)}, cart);
+            storage.setItem(CART_STORAGE_KEY, cart);
         } else {
             cart = new Cart({cntryCd: RunConfigService.getRunConfig().country, userId: '', type: _cart_.type});
-            storage.setItem({...CART_STORAGE_KEY, key: _getCartStorageName(cart.cntryCd)}, cart);
+            storage.setItem(CART_STORAGE_KEY, cart);
         }
     }
     _cart_ = cart;
 }
 
-/**
- * Gets the name of the cart to use.  The name will either be shop-cart or, if
- * marketConfig.useMarketCarts is on, will be shop-cart-XX where XX is market.
- *
- * @param country
- * @return {string}
- * @private
- */
-function _getCartStorageName(country) {
-    const nsConfig = ConfigService.getMarketConfig();
-
-    return nsConfig.useMarketCarts
-        ? `${CART_STORAGE_KEY.key}-${country}`
-        : CART_STORAGE_KEY.key;
-}
-
 /**
  * Clears the cart from localStorage.
  *
@@ -834,9 +818,9 @@ async function checkItemAvailability() {
             const productInfo = await ProductService.getProductBySku({sku: item.product.sku});
             const qual = await QualificationService.getQualification(item.product.sku);
             let cartQty = 0;
-            // if base sku 
+            // if base sku
             if (featureEnabled && productInfo.product.baseSku) {
-                cartQty = await getBaseSkuCartQuantity(productInfo.product.baseSku)   
+                cartQty = await getBaseSkuCartQuantity(productInfo.product.baseSku)
             }
             const qualCnt = qual ? qual.quantity : 0;
 

package/src/cart/persistentCartService.js

@@ -952,7 +952,7 @@ const getCartType = () => {
     const nsConfig = ConfigService.getMarketConfig();
     let cartType = null;
 
-    if (nsConfig.usePersistentCart && !window.location.pathname.startsWith("/content/login/corporate")) {
+    if (!window.location.pathname.startsWith("/content/login/corporate")) {
         const context = ShoppingContext.getShoppingContext();
 
         if (context) {

package/src/cart/productService.js

@@ -3,7 +3,6 @@ import {PriceType, Product} from '@nuskin/ns-product-lib';
 import {ConfigService, RunConfigService, util, events, BrowserDetection} from '@nuskin/ns-util';
 import {UserService, AccountManager} from '@nuskin/ns-account';
 import ProductStatusService from '../product/ProductStatusService.js';
-import FireBaseProductService from '../firebase/fireBaseProductService.js';
 import _ from 'lodash';
 
 let ProductService = function() {
@@ -14,21 +13,17 @@ let ProductService = function() {
     // ---------------------------------------------
     let publicMethods = {
         getProductByTerm: function(term, priceType, country, language, callbackFn) {
-            if (ConfigService.getMarketConfig().useFirebaseProducts){
-                FireBaseProductService.getProductsBySearchTerm(term, country, language, callbackFn);
-            } else {
-                let url = getCloudSearchUrl(term, priceType, country, language);
-
-                try {
-                    $.ajax({
-                        type: "GET",
-                        url: url,
-                        success: productListCallback(callbackFn),
-                        error: failedCallback(callbackFn, url, term, events.errors.PRODUCT_LOOKUP)
-                    });
-                } catch (e) {
-                    return null;
-                }
+            let url = getCloudSearchUrl(term, priceType, country, language);
+
+            try {
+                $.ajax({
+                    type: "GET",
+                    url: url,
+                    success: productListCallback(callbackFn),
+                    error: failedCallback(callbackFn, url, term, events.errors.PRODUCT_LOOKUP)
+                });
+            } catch (e) {
+                return null;
             }
         },
 
@@ -172,10 +167,6 @@ let ProductService = function() {
         query = query.replace('{countryCd}', country);
         query = query.replace('{language}', language);
         query = query.replace('{priceType}', priceType);
-        // if SEAShoppe add param to url
-        if (marketConfig.checkout.enableSEAShoppe) {
-            query += "/SEAShoppe";
-        }
         return query;
     }
 

package/src/order/orderAdapter.js

@@ -184,32 +184,30 @@ const populateShipping = (order, salesOrder) => {
         }]
     }
 
-    if (!nsConfig.checkout.skipShippingAddress) {
-        shippingParty.ShippingAddress = {
-            Name: order.selectedAddress.shippingAddressName,
-            Address: {
-                Street1: order.selectedAddress.shippingAddress1,
-                Street2: order.selectedAddress.shippingAddress2,
-                City: order.selectedAddress.shippingCity,
-                District: order.selectedAddress.shippingCounty,
-                Region: (!ConfigService.getMarketConfig().checkout.doNotSendRegion &&
-                    (!Array.isArray(order.selectedAddress.shippingState) ||
-                        order.selectedAddress.shippingState.length > 0))
-                    ? order.selectedAddress.shippingState
-                    : null,
-                PostalCode: order.selectedAddress.shippingPostalCode,
-                CountryCode: order.selectedAddress.shippingCountry
-            },
-            Contact: [],
-            Instructions: order.selectedAddress.shippingInstructions
-        };
-        shippingParty.Custom = [{
-            Type: "ADDRESS",
-            Key: "TYPE",
-            Value: order.selectedAddress.addressType
-        }];
-        addContactInfo(shippingParty.ShippingAddress.Contact, order.selectedAddress);
-    }
+    shippingParty.ShippingAddress = {
+        Name: order.selectedAddress.shippingAddressName,
+        Address: {
+            Street1: order.selectedAddress.shippingAddress1,
+            Street2: order.selectedAddress.shippingAddress2,
+            City: order.selectedAddress.shippingCity,
+            District: order.selectedAddress.shippingCounty,
+            Region: (!ConfigService.getMarketConfig().checkout.doNotSendRegion &&
+                (!Array.isArray(order.selectedAddress.shippingState) ||
+                    order.selectedAddress.shippingState.length > 0))
+                ? order.selectedAddress.shippingState
+                : null,
+            PostalCode: order.selectedAddress.shippingPostalCode,
+            CountryCode: order.selectedAddress.shippingCountry
+        },
+        Contact: [],
+        Instructions: order.selectedAddress.shippingInstructions
+    };
+    shippingParty.Custom = [{
+        Type: "ADDRESS",
+        Key: "TYPE",
+        Value: order.selectedAddress.addressType
+    }];
+    addContactInfo(shippingParty.ShippingAddress.Contact, order.selectedAddress);
 
     salesOrder.Shipping.ShippingParty.push(shippingParty);
 

package/src/payment/paymentService.js

@@ -10,10 +10,8 @@ import axios from 'axios';
 
 // Service URI Paths
 const PMNT_BASE_LEGACY = '/shop-service/api/v2/payment';
-const PMNT_PATH_LEGACY = PMNT_BASE_LEGACY + '/saved';
 const PMNT_PATH_AWS_V1 = '/paymentprofile/v1';
 const PMNT_PATH_AWS_V2 = '/paymentprofile/v2';
-const PMNT_TYPES_PATH_LEGACY = PMNT_BASE_LEGACY + '/typesallowed';
 const PMNT_TYPES_PATH_AWS = '/paymentOptions/v1';
 const EXT_PMNT_PATH_LEGACY = '/external-payment/api/v1';
 
@@ -28,15 +26,11 @@ const getLegacyBaseURL = () => ConfigService.getMarketConfig().siteUrl;
 
 const getAWSBaseURL = () => ConfigService.getMarketConfig().awsUrl;
 
-const isUsingAWS = () => !!ConfigService.getMarketConfig().useAwsPaymentProfileService;
+const getPmntURLV1 = () => getAWSBaseURL() + PMNT_PATH_AWS_V1;
 
-const getBaseURL = () => isUsingAWS() ? getAWSBaseURL() : getLegacyBaseURL();
+const getPmntURLV2 = () => getAWSBaseURL() + PMNT_PATH_AWS_V2;
 
-const getPmntURLV1 = () => getBaseURL() + (isUsingAWS() ? PMNT_PATH_AWS_V1 : PMNT_PATH_LEGACY);
-
-const getPmntURLV2 = () => getBaseURL() + (isUsingAWS() ? PMNT_PATH_AWS_V2 : PMNT_PATH_LEGACY);
-
-const getPmntTypeURL = () => getBaseURL() + (isUsingAWS() ? PMNT_TYPES_PATH_AWS : PMNT_TYPES_PATH_LEGACY);
+const getPmntTypeURL = () => getAWSBaseURL() + PMNT_TYPES_PATH_AWS;
 
 const getExtPmntURL = () => getLegacyBaseURL() + EXT_PMNT_PATH_LEGACY;
 

package/src/payment/paymentType.js

@@ -60,7 +60,9 @@ let PaymentType = {
     CENC: 125,
     IDMIR: 128, // MIR card for Russia
     AMIN: 129,
-    CBLU: 132  // Carte Bleue
+    CBLU: 132,  // Carte Bleue
+    '2C2P': 133,
+    SIMV: 134
 };
 
 PaymentType.credit = [
@@ -82,7 +84,8 @@ PaymentType.credit = [
     PaymentType.VISD,
     PaymentType.MCD,
     PaymentType.IDMIR,
-    PaymentType.CBLU
+    PaymentType.CBLU,
+    PaymentType.SIMV
 ];
 
 

package/src/shipping/ShippingService.js

@@ -5,7 +5,6 @@ import axios from 'axios';
 
 let baseUrl;
 let awsUrl;
-const SHIPPING_PATH = '/shop-service/api/v2/shipping/address/';
 const SHIP_DAYS_ROOT_PATH = '/shop-service/api/v2/ship-days';
 const AWS_SHIPPING_PATH = '/shippingprofile/v1/';
 const USER = UserService.getUser();
@@ -157,7 +156,7 @@ async function getVNRegionList () {
  */
 async function getListOfCitiesFromPostalCode (country, zip) {
     const {
-        awsUrl, 
+        awsUrl,
         checkout: { postalCodeServiceUrl }
     } = ConfigService.getMarketConfig();
 
@@ -169,14 +168,14 @@ async function getListOfCitiesFromPostalCode (country, zip) {
             .replace(/:cntry/g, country)
             .replace(/:code/g, zip);
     }
-    
+
     const results = await fetch(url, {
         method: 'GET',
         credentials: 'omit',
         headers: ServiceUtils.getHeaders()
     })
         .then(ServiceUtils.transformFetchResponse);
-    
+
     return (country === 'MX') ? results.zzipRecords : results;
 }
 
@@ -191,18 +190,11 @@ async function getListOfCitiesFromPostalCode (country, zip) {
  */
 function getUrl(queryParams, pathParam = '') {
     let url;
-    if (ConfigService.getMarketConfig().useAwsShippingProfileService) {
-        if (!awsUrl) {
-            awsUrl = ConfigService.getMarketConfig().awsUrl;
-        }
-        delete queryParams.eid;
-        url = `${awsUrl}${AWS_SHIPPING_PATH}${pathParam}?${UrlService.toQueryString(queryParams)}`;
-    } else {
-        if (!baseUrl) {
-            baseUrl = ConfigService.getMarketConfig().siteUrl;
-        }
-        url = `${baseUrl}${SHIPPING_PATH}${pathParam}?${UrlService.toQueryString(queryParams)}`;
+    if (!awsUrl) {
+        awsUrl = ConfigService.getMarketConfig().awsUrl;
     }
+    delete queryParams.eid;
+    url = `${awsUrl}${AWS_SHIPPING_PATH}${pathParam}?${UrlService.toQueryString(queryParams)}`;
     return url
 }
 
@@ -216,9 +208,7 @@ function getHeaders(eid) {
     let retHeader;
 
     headers = headers || ServiceUtils.getHeaders();
-    ConfigService.getMarketConfig().useAwsShippingProfileService ?
-        retHeader = Object.assign({Authorization: `JWT ${eid}`, 'content-type': 'application/json'}, headers) :
-        retHeader = Object.assign({'content-type': 'application/json'}, headers);
+    retHeader = Object.assign({Authorization: `JWT ${eid}`, 'content-type': 'application/json'}, headers);
 
     return retHeader;
 }

package/src/shop.js

@@ -20,12 +20,6 @@ export {default as ErrorMessageCookieService} from './error/errorMessageCookieSe
 export {default as ErrorMessageList} from './error/errorMessageList.js';
 export {default as ErrorMessage} from './error/errorMessage.js';
 export {default as FavoritesService} from './favorites/FavoritesService';
-export {default as FirebaseProduct} from './firebase/firebaseProduct.js';
-export {default as FirebaseProductDetail} from './firebase/firebaseProductDetail.js';
-export {default as FireBaseProductService} from './firebase/fireBaseProductService.js';
-export {default as FirebaseProductParser} from './firebase/firebaseProductParser.js';
-export {default as FirebaseProductCallbackUtil} from './firebase/firebaseProductCallbackUtil.js';
-export {default as FirebaseHealthUtil} from './firebase/firebaseHealthUtil.js';
 export {default as LtoUtils} from './ltoUtils.js';
 export {default as LuhnCheck} from './payment/luhnCheck.js';
 export {default as newShop} from './newShop.js';