@nuskin/ns-shop 7.7.0-pa-902.6 → 7.8.0-pa-902.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-shop",
-  "version": "7.7.0-pa-902.6",
+  "version": "7.8.0-pa-902.1",
   "description": "The description that will amaze and astound your audience when they read it",
   "main": "src/shop.js",
   "scripts": {
@@ -26,7 +26,7 @@
     "@nuskin/ns-common-lib": "1.4.8",
     "@nuskin/ns-feature-flags": "1.5.0",
     "@nuskin/ns-loyalty-web": "1.5.7",
-    "@nuskin/ns-product-lib": "2.20.0",
+    "@nuskin/ns-product-lib": "2.21.0",
     "@nuskin/nuskinjquery": "2.3.1",
     "@nuskin/order-model": "3.1.3",
     "@nuskin/product-lib": "2.4.0",

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';
@@ -35,6 +36,7 @@ export default {
     hasEventItems,
     hasPreviewItems,
     hasDangerousGoods,
+    getCartWeight,
     getItemCnt,
     addProductToCart,
     addSkuToCart,
@@ -300,14 +302,29 @@ function hasPreviewItems() {
     return _getCart().hasPreviewItems();
 }
 
-function hasDangerousGoods(options = {cartItems: true}) {
+function _getItemsByOrderType(orderType) {
+    if (orderType == OrderType.SHIP_IMMEDIATE) return _getCart().getItems({cartItems: true});
+    else if (orderType == OrderType.ADR_CREATE) return _getCart().getItems({cartAdrItems: true});
+    else return _getCart().getItems({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(orderType) {
+    let retVal = 0.0;
+
+    _getItemsByOrderType(orderType).forEach((item) => {
+        retVal += item.qty * (item.product.grossWeight || 0.0);
+    });
+    return retVal;
+}
+
 function getItemCnt(options) {
     return _getCart().getItemCnt(options);
 }
@@ -874,6 +891,8 @@ function syncCartItemToSapItem(sapItemKey, cartItemKey = null) {
         cartItem.redeem = sapItem.redeem;
         cartItem.qtyRedeemWithPoints = sapItem.qtyRedeemWithPoints;
         cartItem.product.subPriceFlag = sapItem.product.subPriceFlag;
+        cartItem.product.grossWeight = sapItem.product.grossWeight;
+        cartItem.product.weightUnit = sapItem.product.weightUnit;
         cart.addCartItem(cartItem, true);
         setCart(cart, false);
     }

package/src/order/order.js

@@ -29,7 +29,6 @@ newShop.Order = function(orderData){
 
     let selectedAddress;
     let selectedShippingMethod;
-    let simulatedShippingMethod = {};
     let shippingAvailableMethods;
     let availableAddressTypes;
     let selectedPayment;
@@ -112,7 +111,6 @@ newShop.Order = function(orderData){
         simulateWithoutShipping = orderData.simulateWithoutShipping;
         externalPayment = orderData.externalPayment;
         selectedShippingMethod = orderData.selectedShippingMethod;
-        simulatedShippingMethod = orderData.simulatedShippingMethod || {};
         shippingAvailableMethods = orderData.shippingAvailableMethods;
         availableAddressTypes = orderData.availableAddressTypes;
         errorResponseInfo = orderData.errorResponseInfo;
@@ -267,7 +265,6 @@ newShop.Order = function(orderData){
         order.simulateWithoutShipping = simulateWithoutShipping;
         order.externalPayment = externalPayment;
         order.selectedShippingMethod = selectedShippingMethod;
-        order.simulatedShippingMethod = simulatedShippingMethod || {};
         order.shippingAvailableMethods = shippingAvailableMethods;
         order.availableAddressTypes = availableAddressTypes;
         order.errorResponseInfo = errorResponseInfo;
@@ -474,14 +471,6 @@ newShop.Order = function(orderData){
                 selectedShippingMethod = _selectedShippingMethod;
             }
         },
-        simulatedShippingMethod: {
-            get: function() {
-                return simulatedShippingMethod;
-            },
-            set: function(_simulatedShippingMethod) {
-                simulatedShippingMethod = _simulatedShippingMethod;
-            }
-        },
         shippingAvailableMethods: {
             get: function() {
                 return shippingAvailableMethods;

package/src/order/orderAdapter.js

@@ -1,11 +1,13 @@
 import $ from '@nuskin/nuskinjquery';
 import {Agelocme, CartService, ShippingAddress, ShopContextService, OrderManager, SalesOrder,
-    PickupUtil, Product, ProductService, ExternalPaymentService, ProcessorCode} from "../shop.js";
+    Product, ProductService, ExternalPaymentService, ProcessorCode} from "../shop.js";
 import {RunConfigService, events, util, PersonalOfferStorageService, BrowserDetection, ShoppingContext, UrlService} from "@nuskin/ns-util";
 import {getCachedConfigField} from '@nuskin/configuration-sdk';
 import {UserService} from "@nuskin/ns-account";
 import PaymentAdapter from '../payment/PaymentAdapter';
-import { storage } from "@nuskin/ns-util";
+import PickupUtil from '../shipping/pickupUtil';
+import {Order} from '@nuskin/order-model';
+import {storage} from "@nuskin/ns-util";
 
 let splitLineItems = [];
 const utmInfo = storage.getItem(storage.metadata.UTM_INFO) || {};
@@ -169,12 +171,16 @@ const getDefaultShipCode = (osmc) => {
     if (useShipMethodsApi) {
         const csDefaultCode = getCachedConfigField('defaultShipMethod');
         const shipMethods = PickupUtil.getStoredShipMethods();
-        const firstSm = shipMethods.length > 0 ? shipMethods[0].Code : '';
-        const defaultShipMethod = shipMethods.find((sm) => sm.Code === osmc);
-        if (!defaultShipMethod) {
-            defaultCode = shipMethods.find((sm) => sm.Code === csDefaultCode) ? csDefaultCode : firstSm;
+        if (shipMethods?.length > 0) {
+            const firstSm = shipMethods[0].Code;
+            const defaultShipMethod = shipMethods.find((sm) => sm.Code === osmc);
+            if (!defaultShipMethod) {
+                defaultCode = shipMethods.find((sm) => sm.Code === csDefaultCode) ? csDefaultCode : firstSm;
+            } else {
+                defaultCode = defaultShipMethod.Code;
+            }
         } else {
-            defaultCode = defaultShipMethod.Code;
+            defaultCode = csDefaultCode;
         }
     }
 
@@ -649,6 +655,10 @@ const syncProductItems = async (order, sapProducts, adr, includeSapItems) => {
                             label = custom.Value;
                         } else if (custom.Key === 'SUB_PRICE') {
                             newItem.subPriceFlag = true;
+                        } else if (custom.Key === 'GROSSWEIGHT') {
+                            newItem.grossWeight = parseFloat(custom.Value);
+                        } else if (custom.Key === 'WEIGHTUNIT') {
+                            newItem.weightUnit = custom.Value;
                         }
                     });
                     if (code != null || name !== null || label != null) {
@@ -1119,6 +1129,18 @@ const populateSalesOrder = (action, adr) => {
     return salesOrder;
 };
 
+const getShipMethods = async (salesOrderDetail, orderType) => {
+    let shipMethods;
+    const useShipMethodsApi = getCachedConfigField('useShipMethodsApi');
+    if (useShipMethodsApi) {
+        await PickupUtil.loadShipMethods(Order.fromSalesOrderRequest(populateSalesOrder('SIMULATE')), orderType);
+        shipMethods = await PickupUtil.getShipMethods();
+    } else {
+        shipMethods = salesOrderDetail.ShippingAvailableMethods
+    }
+    return shipMethods
+}
+
 /**
  * Maps Sales order detail object to the order object
  * @param {Object} salesOrderDetail
@@ -1138,14 +1160,12 @@ const toOrder = async (salesOrderDetail, adr, createResponse) => {
         order.shippingPayWithPoints = salesOrderDetail.Custom.map(item => item.Key).indexOf('ZZUSE_PTS') > -1;
     }
 
+    await syncProductItems(order, salesOrderDetail.LineItemDetails, order.adr ? adr : null);
+
     const useShipMethodsApi = getCachedConfigField('useShipMethodsApi');
     if (useShipMethodsApi || salesOrderDetail.ShippingAvailableMethods && salesOrderDetail.ShippingAvailableMethods.length > 0) {
-        const shipMethods = useShipMethodsApi ? await PickupUtil.getShipMethods() : salesOrderDetail.ShippingAvailableMethods;
+        const shipMethods = await getShipMethods(salesOrderDetail, order.orderType);
         order.shippingAvailableMethods = sortShippingAvailableMethods(shipMethods);
-        order.simulatedShippingMethod =
-            order.shippingAvailableMethods.find(
-                (sam) => sam.Code === salesOrderDetail.Shipping.ShippingMethod.Code
-            ) || order.shippingAvailableMethods[0];
 
         setShippingAvailableMethodsPickupInfo(order.shippingAvailableMethods);
         setSelectedShipMethod(order, salesOrderDetail.Shipping.ShippingMethod);
@@ -1165,7 +1185,6 @@ const toOrder = async (salesOrderDetail, adr, createResponse) => {
         syncShipping(salesOrderDetail.Shipping, order);
     }
 
-    await syncProductItems(order, salesOrderDetail.LineItemDetails, order.adr ? adr : null);
     syncOrderTotals(salesOrderDetail.OrderTotals, order.orderTotals);
     syncPayment(salesOrderDetail.Payment, order.selectedPayment);
     OrderManager.saveOrders();

package/src/order/orderManager.js

@@ -5,6 +5,7 @@ import {OrderType} from './orderType.js';
 import {storage, events, RunConfigService} from "@nuskin/ns-util";
 import {UserService} from "@nuskin/ns-account";
 import {AdrService, CartService, CheckoutModeService} from "../shop";
+import {getCachedConfigField} from '@nuskin/configuration-sdk';
 
 const ORDER_STORAGE_KEY = storage.metadata.ORDER_STORAGE_KEY,
     ORDER_PREFS_STORAGE_KEY = storage.metadata.ORDER_PREFS_STORAGE_KEY,
@@ -73,6 +74,14 @@ const _initOrder = () => {
             result.selectedAddress = orderPreferences.selectedAddress;
         }
     }
+    if (!result.selectedShippingMethod) {
+        if (getCachedConfigField('useShipMethodsApi')) {
+            const csDefaultCode = getCachedConfigField('defaultShipMethod');
+            if (csDefaultCode) {
+                result.selectedShippingMethod = {Code: csDefaultCode, PickUpLocation: ''};
+            }
+        }
+    }
 
     return new Order(result);
 };

package/src/shipping/pickupUtil.js

@@ -1,7 +1,6 @@
 import {getCachedConfiguration} from '@nuskin/configuration-sdk';
-import {Order} from '@nuskin/order-model';
 import {RunConfigService} from '@nuskin/ns-util';
-import {OrderManager, CartService, OrderType, OrderAdapter} from '../shop';
+import {OrderManager, CartService, OrderType} from '../shop';
 import axios from 'axios';
 
 let PickupUtil = function() {
@@ -187,18 +186,15 @@ let PickupUtil = function() {
             const storedShipData = getShipToData(storedPayload.order);
             same = payload.country === storedPayload.country &&
                 payload.dangerousGoods === storedPayload.dangerousGoods &&
-                payload.orderValue === storedPayload.orderValue &&
                 shipData.country === storedShipData.country &&
                 shipData.postalCode === storedShipData.postalCode &&
                 shipData.line1 === storedShipData.line1 &&
-                shipData.line2 === storedShipData.line2 &&
                 shipData.city === storedShipData.city
         }
         return same
     }
 
-    function loadShipMethods() {
-        const order = Order.fromSalesOrderRequest(OrderAdapter.populateSalesOrder('SIMULATE'));
+    function loadShipMethods(order, orderType) {
         const {metapackMarket} = getCachedConfiguration('Checkout');
 
         if (metapackMarket) {
@@ -206,7 +202,8 @@ let PickupUtil = function() {
             const payload = {
                 order,
                 orderValue: getOrderValue(),
-                dangerousGoods: CartService.hasDangerousGoods(),
+                dangerousGoods: CartService.hasDangerousGoods(orderType),
+                weight: CartService.getCartWeight(orderType),
                 language: runConfig.language,
                 country: runConfig.country
             };