@nuskin/ns-shop 7.0.11-CodeFix.1 → 7.0.11-pur-813.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-shop",
-  "version": "7.0.11-CodeFix.1",
+  "version": "7.0.11-pur-813.1",
   "description": "The description that will amaze and astound your audience when they read it",
   "main": "src/shop.js",
   "scripts": {
@@ -28,6 +28,8 @@
     "@nuskin/ns-loyalty-web": "1.5.6",
     "@nuskin/ns-product-lib": "2.17.6",
     "@nuskin/nuskinjquery": "2.3.1",
+    "@nuskin/order-model": "3.1.3",
+    "@nuskin/product-lib": "2.2.1",
     "axios": "1.6.5",
     "decimal.js": "10.4.3",
     "jp-conversion": "0.0.7",

package/src/cart/equinoxCartService.js

@@ -404,7 +404,7 @@ function _assembleChildSkus(requestData, options) {
             if(personalOffer != null && productWithVariant.length > 0 && productWithVariant[0].variantSelected){
                 selectedVariants = productWithVariant[0].variantSelected;
             }
-            if (personalOffer != null && selectedVariants && cs.skuId != selectedVariants[cs.productId] && (cs.type !== "BUNDLE" && cs.type !== "OPTIONAL" && cs.type !== "SKUKIT")) return null
+            if (personalOffer != null && selectedVariants && cs.skuId != selectedVariants[cs.productId] && (cs.type !== "BUNDLE" && cs.type !== "OPTIONAL")) return null
             const childSku =
             (personalOffer != null && selectedVariants && selectedVariants[cs.productId] && config.MySite_graphql_active)
                 ? {

package/src/cart/productService.js

@@ -1,11 +1,11 @@
 import $ from '@nuskin/nuskinjquery';
 import {PriceType, Product} from '@nuskin/ns-product-lib';
-import {RunConfigService, util, events, BrowserDetection, UrlService} from '@nuskin/ns-util';
-import {UserService, AccountManager} from '@nuskin/ns-account';
+import {RunConfigService, events, BrowserDetection, UrlService} from '@nuskin/ns-util';
+import {AccountManager} from '@nuskin/ns-account';
 import ProductStatusService from '../product/ProductStatusService.js';
 import _ from 'lodash';
 import { getConfiguration } from '@nuskin/configuration-sdk';
-import axios from 'axios';
+import {productLib} from '@nuskin/product-lib';
 
 let ProductService = function() {
     // ---------------------------------------------
@@ -86,20 +86,20 @@ let ProductService = function() {
     // ---------------------------------------------
     async function getProductDetail(_options) {
         let options = _options;
-        let url = await getSkuSearchUrl(options);
-        let data;
+        let response;
 
         // 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
+            response = await productLib.getProduct({
+                fromId: options.sku,
+                env: RunConfigService.getEnvironmentCode(),
+                market: options.country,
+                language: options.language
             })
         } catch (e) {
-            throw {error: e, url: url, failedSku: options.sku, type: events.errors.PRODUCT_LOOKUP};
+            throw {error: e, failedSku: options.sku, type: events.errors.PRODUCT_LOOKUP};
         }
-        return data.data;
+        return response.data;
     }
 
     function getProductStatus(_options) {
@@ -125,36 +125,6 @@ let ProductService = function() {
         );
     }
 
-    async function getSkuSearchUrl(options) {
-        let firstTwo = options.sku.substring(0, 2),
-            secondTwo = options.sku.substring(2, 4),
-            thirdTwo = options.sku.substring(4, 6),
-            runConfig = RunConfigService.getRunConfig(),
-            query = '',
-            skuSearchUrl;
-
-        const {Url: urlCfg} = await getConfiguration(['Url']);
-        skuSearchUrl = urlCfg.skuSearchUrl;
-
-        if (runConfig.baseUrl !== '' && !skuSearchUrl.startsWith('http')) {
-            query = runConfig.baseUrl;
-        }
-
-        if (UserService.isLTOSite()){
-            query += util.getSiteConfig().urls.skuSearchUrl[0].replace('{firstTwo}', firstTwo);
-        }
-        else{
-            query += skuSearchUrl.replace('{firstTwo}', firstTwo);
-        }
-
-        query = query.replace('{secondTwo}', secondTwo);
-        query = query.replace('{thirdTwo}', thirdTwo);
-        query = query.replace('{sku}', options.sku);
-        query = query.replace('{countryCd}', options.cntryCd ? options.cntryCd : options.country);
-
-        return query;
-    }
-
     async function handleDetailResponse(responseData, options) {
         let retVal = {success: true},
             dataForProduct = createDataFromSkuSearch(responseData, options);

package/src/order/orderAdapter.js

@@ -5,6 +5,7 @@ import {RunConfigService, events, util, PersonalOfferStorageService, BrowserDete
 import {getCachedConfigField} from '@nuskin/configuration-sdk';
 import {UserService} from "@nuskin/ns-account";
 import PaymentAdapter from '../payment/PaymentAdapter';
+import pickupUtil from '../shipping/pickupUtil';
 
 let splitLineItems = [];
 
@@ -865,13 +866,14 @@ let setSelectedShipMethod = function(order, matchMethod = {}) {
 
 /**
  * Parses pickup points from SAP response, in case shipping method is set to pickup points!
- * @param {Object[]} custom The Custom array on the salesorderrequest
+ * @param {Object[]} oldPup The Custom array on the salesorderrequest
+ * @param {Object[]} newPup The Custom array on the salesorderrequest
  * @param {Object} order
  */
-function setPickupPoints(custom, order) {
-    const pupLocations = custom || [];
+function setPickupPoints(oldPup, newPup, order) {
+    const pupLocations = oldPup || [];
     if (order.selectedShippingMethod && PickupUtil.supports(order.selectedShippingMethod.Code)) {
-        order.pickupPoints = PickupUtil.parse(pupLocations);
+        order.pickupPoints = newPup ? newPup : PickupUtil.parse(pupLocations);
         if (order.selectedPickupPoint) {
             order.selectedPickupPoint = order.pickupPoints.find(pickupPoint => order.selectedPickupPoint.id === pickupPoint.id);
         }
@@ -1090,13 +1092,19 @@ const toOrder = async (salesOrderDetail, adr, createResponse) => {
     }
 
     if (salesOrderDetail.ShippingAvailableMethods && salesOrderDetail.ShippingAvailableMethods.length > 0) {
-        order.shippingAvailableMethods = sortShippingAvailableMethods(salesOrderDetail.ShippingAvailableMethods);
+        const useShipMethodsApi = getCachedConfigField('useShipMethodsApi');
+        const shipMethods = useShipMethodsApi ? await pickupUtil.getShipMethods() : salesOrderDetail.ShippingAvailableMethods;
+        order.shippingAvailableMethods = sortShippingAvailableMethods(shipMethods);
         setShippingAvailableMethodsPickupInfo(order.shippingAvailableMethods);
         setSelectedShipMethod(order, salesOrderDetail.Shipping.ShippingMethod);
         // When an order or ADR is created.  The response from the create call is missing the list of pickup locations
         // The list isn't needed in this case since the user has already created the order so we don't need to update the pickup points
         if (!createResponse) {
-            setPickupPoints(salesOrderDetail.Custom, order);
+            let oldPup = null;
+            if (!useShipMethodsApi) oldPup = salesOrderDetail.Custom;
+            let newPup = null;
+            if (useShipMethodsApi) newPup = await pickupUtil.getPickupPoints();
+            setPickupPoints(oldPup, newPup, order);
         }
     }
     shippingHack(order, salesOrderDetail.OrderTotals.Shipping, salesOrderDetail.Currency);

package/src/shipping/pickupUtil.js

@@ -1,3 +1,11 @@
+import OrderAdapter from '../order/orderAdapter';
+import {getCachedConfiguration} from '@nuskin/configuration-sdk';
+import {Order} from '@nuskin/order-model';
+import {RunConfigService} from '@nuskin/ns-util';
+// import {CartService} from '@nuskin/ns-shop';
+import axios from 'axios';
+import { OrderManager } from '../shop';
+
 let PickupUtil = function() {
     'use strict';
     const SERVICE_GROUP = 'SERVICE_GROUP',
@@ -15,6 +23,10 @@ let PickupUtil = function() {
         UNIT = 'UNIT',
         CARRIER_CODE = 'CARRIER_CODE';
 
+    let promise = Promise.resolve();
+    let shipMethods = [];
+    let pickupPoints = [];
+
     /**
      * Pickup Point shipping methods.
      * Values are shipping method codes.
@@ -130,12 +142,75 @@ let PickupUtil = function() {
         return markers;
     }
 
+    function getUrl() {
+        switch (RunConfigService.getEnvironmentCode()) {
+            case 'dev':
+                return 'https://ship-methods.api.dev.nuskin.com/v1';
+            case 'test':
+                return 'https://ship-methods.api.test.nuskin.com/v1';
+            case 'stage':
+                return 'https://ship-methods.api.dev.nuskin.com/v1';
+            case 'prod':
+                return 'https://ship-methods.api.dev.nuskin.com/v1';
+            default:
+                return 'https://ship-methods.api.dev.nuskin.com/v1';
+        }
+    }
+
+    function loadShipMethods() {
+        const order = Order.fromSalesOrderRequest(OrderAdapter.populateSalesOrder('SIMULATE'));
+
+        const postalCode = order.shippingPostalCode;
+        const {metapackMarket, metapackZipExclusions} = getCachedConfiguration('Checkout');
+
+        if (metapackMarket) {
+            const order = OrderManager.getOrder();
+            let includePickupPoints = true;
+            for (const zipRegEx of metapackZipExclusions || []) {
+                const regEx = new RegExp(zipRegEx);
+                includePickupPoints = includePickupPoints && !postalCode.match(regEx);
+            }
+
+            promise = axios.post(
+                getUrl(),
+                {
+                    order,
+                    pudo: includePickupPoints,
+                    orderValue: order && order.orderTotals && order.orderTotals.grandTotal || 0.0
+                },
+                {
+                    headers: {
+                        'Content-Type': 'application/json; charset=UTF-8'
+                    }
+                }
+            ).then((results) => {
+                shipMethods = results.data.shipMethods;
+                pickupPoints = results.data.pickupPoints;
+            })
+        }
+    }
+
+    async function getShipMethods() {
+        await promise;
+
+        return shipMethods;
+    }
+
+    async function getPickupPoints() {
+        await promise;
+
+        return pickupPoints;
+    }
+
     return {
         allMethods: shippingMethods,
         supports: isPickupPointShippingMethod,
         parse: parsePickupPoints,
         bounds: getBounds,
-        markers: generateMarkers
+        markers: generateMarkers,
+        loadShipMethods,
+        getShipMethods,
+        getPickupPoints
     }
 }();