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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-shop",
-  "version": "7.7.0-pa-87.3",
+  "version": "7.7.0",
   "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,7 +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 {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';
@@ -302,9 +302,9 @@ function hasPreviewItems() {
 }
 
 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});
+    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) {

package/src/shipping/pickupUtil.js

@@ -186,11 +186,9 @@ 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