@nuskin/ns-shop 7.6.4 → 7.6.5-pa-87.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-shop",
-  "version": "7.6.4",
+  "version": "7.6.5-pa-87.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/order/orderAdapter.js

@@ -1,12 +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 pickupUtil from '../shipping/pickupUtil';
-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) || {};
@@ -501,7 +502,7 @@ const populateCategory = (salesOrder) => {
     } else if (utmMedium && utmMedium.toLowerCase().includes('paidsearch')) {
         salesOrder.Category = 'PAIDSEARCH';
     } else if (utmMedium && utmMedium.toLowerCase().includes('paidsocial')) {
-        salesOrder.Category = 'PAIDAD'; 
+        salesOrder.Category = 'PAIDAD';
     } else {
         salesOrder.Category = 'WEB';
     }
@@ -650,6 +651,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) {
@@ -1120,6 +1125,18 @@ const populateSalesOrder = (action, adr) => {
     return salesOrder;
 };
 
+const getShipMethods = async (salesOrderDetail) => {
+    let shipMethods;
+    const useShipMethodsApi = getCachedConfigField('useShipMethodsApi');
+    if (useShipMethodsApi) {
+        await PickupUtil.loadShipMethods(Order.fromSalesOrderRequest(populateSalesOrder('SIMULATE')));
+        shipMethods = await PickupUtil.getShipMethods();
+    } else {
+        shipMethods = salesOrderDetail.ShippingAvailableMethods
+    }
+    return shipMethods
+}
+
 /**
  * Maps Sales order detail object to the order object
  * @param {Object} salesOrderDetail
@@ -1141,7 +1158,7 @@ const toOrder = async (salesOrderDetail, adr, createResponse) => {
 
     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.shippingAvailableMethods = sortShippingAvailableMethods(shipMethods);
         order.simulatedShippingMethod =
             order.shippingAvailableMethods.find(
@@ -1156,7 +1173,7 @@ const toOrder = async (salesOrderDetail, adr, createResponse) => {
             let oldPup = null;
             if (!useShipMethodsApi) oldPup = salesOrderDetail.Custom;
             let newPup = null;
-            if (useShipMethodsApi) newPup = await pickupUtil.getPickupPoints();
+            if (useShipMethodsApi) newPup = await PickupUtil.getPickupPoints();
             setPickupPoints(oldPup, newPup, order);
         }
     }

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() {
@@ -197,8 +196,7 @@ let PickupUtil = function() {
         return same
     }
 
-    function loadShipMethods() {
-        const order = Order.fromSalesOrderRequest(OrderAdapter.populateSalesOrder('SIMULATE'));
+    function loadShipMethods(order) {
         const {metapackMarket} = getCachedConfiguration('Checkout');
 
         if (metapackMarket) {