@nuskin/ns-shop 7.7.0-pa-87.1 → 7.7.0-pa-87.3

package/package.json

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

package/src/cart/cartService.js

@@ -6,6 +6,7 @@ import {AdrService, Product, ScanCard, CurrencyService} from '@nuskin/ns-shop';
 import {UserService, AccountManager}  from '@nuskin/ns-account';
 import ProductService from './productService';
 import Cart from './cart.js';
+import OrderType from '../order/orderType.js';
 import AdrEditService from '../adr/AdrEditService.js';
 import QualificationService from '@nuskin/exclusive-offer-sdk'
 import {ProductStatus} from '@nuskin/ns-product-lib';
@@ -300,17 +301,24 @@ function hasPreviewItems() {
     return _getCart().hasPreviewItems();
 }
 
-function hasDangerousGoods(options = {cartItems: true}) {
+function _getItemsByOrderType(orderType) {
+    if (orderType.SHIP_IMMEDIATE) return getItemData({cartItems: true});
+    else if (orderType == OrderType.ADR_CREATE) return getItemData({cartAdrItems: true});
+    else return getItemData({cartOrderItems: true});
+}
+
+function hasDangerousGoods(orderType) {
     let retVal = false;
-    _getCart().getItems(options).forEach((item) => {
+    _getItemsByOrderType(orderType).forEach((item) => {
         retVal = retVal || item.product.dangerousGoods;
     });
     return retVal;
 }
 
-function getCartWeight() {
+function getCartWeight(orderType) {
     let retVal = 0.0;
-    _getCart().getItems({cartItems: true}).forEach((item) => {
+
+    _getItemsByOrderType(orderType).forEach((item) => {
         retVal += item.qty * (item.product.grossWeight || 0.0);
     });
     return retVal;

package/src/order/orderAdapter.js

@@ -1129,11 +1129,11 @@ const populateSalesOrder = (action, adr) => {
     return salesOrder;
 };
 
-const getShipMethods = async (salesOrderDetail) => {
+const getShipMethods = async (salesOrderDetail, orderType) => {
     let shipMethods;
     const useShipMethodsApi = getCachedConfigField('useShipMethodsApi');
     if (useShipMethodsApi) {
-        await PickupUtil.loadShipMethods(Order.fromSalesOrderRequest(populateSalesOrder('SIMULATE')));
+        await PickupUtil.loadShipMethods(Order.fromSalesOrderRequest(populateSalesOrder('SIMULATE')), orderType);
         shipMethods = await PickupUtil.getShipMethods();
     } else {
         shipMethods = salesOrderDetail.ShippingAvailableMethods
@@ -1164,7 +1164,7 @@ const toOrder = async (salesOrderDetail, adr, createResponse) => {
 
     const useShipMethodsApi = getCachedConfigField('useShipMethodsApi');
     if (useShipMethodsApi || salesOrderDetail.ShippingAvailableMethods && salesOrderDetail.ShippingAvailableMethods.length > 0) {
-        const shipMethods = await getShipMethods(salesOrderDetail);
+        const shipMethods = await getShipMethods(salesOrderDetail, order.orderType);
         order.shippingAvailableMethods = sortShippingAvailableMethods(shipMethods);
 
         setShippingAvailableMethodsPickupInfo(order.shippingAvailableMethods);

package/src/order/orderManager.js

@@ -78,7 +78,7 @@ const _initOrder = () => {
         if (getCachedConfigField('useShipMethodsApi')) {
             const csDefaultCode = getCachedConfigField('defaultShipMethod');
             if (csDefaultCode) {
-                result.selectedShippingMethod = {Code: csDefaultCode};
+                result.selectedShippingMethod = {Code: csDefaultCode, PickUpLocation: ''};
             }
         }
     }

package/src/shipping/pickupUtil.js

@@ -196,7 +196,7 @@ let PickupUtil = function() {
         return same
     }
 
-    function loadShipMethods(order) {
+    function loadShipMethods(order, orderType) {
         const {metapackMarket} = getCachedConfiguration('Checkout');
 
         if (metapackMarket) {
@@ -204,8 +204,8 @@ let PickupUtil = function() {
             const payload = {
                 order,
                 orderValue: getOrderValue(),
-                dangerousGoods: CartService.hasDangerousGoods(),
-                weight: CartService.getCartWeight(),
+                dangerousGoods: CartService.hasDangerousGoods(orderType),
+                weight: CartService.getCartWeight(orderType),
                 language: runConfig.language,
                 country: runConfig.country
             };