@nuskin/ns-shop 7.1.1-pur-813.4 → 7.1.1-pur-813.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/src/adr/AdrService.js +1 -1
  3. package/src/order/orderAdapter.js +2 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nuskin/ns-shop",
3
- "version": "7.1.1-pur-813.4",
3
+ "version": "7.1.1-pur-813.6",
4
4
  "description": "The description that will amaze and astound your audience when they read it",
5
5
  "main": "src/shop.js",
6
6
  "scripts": {
package/src/adr/AdrService.js CHANGED
@@ -344,7 +344,7 @@ async function setAdrShippingAddress(adrId, shippingAddress, options) {
344
344
  };
345
345
 
346
346
  // If shipping method is Pickup, add pickup location to the request body
347
- if (options.ShippingMethod === 'PU') {
347
+ if (options.ShippingMethod === 'PU' || options.ShippingMethod === 'M3') {
348
348
  body.adr.SalesOrder.Shipping.ShippingMethod.PickUpLocation = options.PickUpLocation;
349
349
  }
350
350
 
package/src/order/orderAdapter.js CHANGED
@@ -154,7 +154,8 @@ const populateAttribution = (salesOrder) => {
154
154
 
155
155
  const populateShipping = (order, salesOrder) => {
156
156
  const user = UserService.getUser();
157
- const defaultCode = getCachedConfigField('defaultShipMethod');
157
+ const useShipMethodsApi = getCachedConfigField('useShipMethodsApi')
158
+ const defaultCode = useShipMethodsApi ? getCachedConfigField('defaultShipMethod') : '';
158
159
  const method = order.selectedShippingMethod;
159
160
  const code = method ? method.Code : defaultCode;
160
161