@nuskin/ns-shop 7.3.0-pa-1.6 → 7.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-shop",
-  "version": "7.3.0-pa-1.6",
+  "version": "7.3.0",
   "description": "The description that will amaze and astound your audience when they read it",
   "main": "src/shop.js",
   "scripts": {
@@ -43,7 +43,7 @@
     "@nuskin/ns-account": "5.9.2",
     "@nuskin/ns-jsanalyzer": "1.0.1",
     "@nuskin/ns-product": "3.50.8",
-    "@nuskin/ns-util": "4.7.2",
+    "@nuskin/ns-util": "4.6.1",
     "axios-mock-adapter": "1.22.0",
     "babel-cli": "6.26.0",
     "babel-core": "6.26.3",

package/src/cart/cartService.js

@@ -245,7 +245,7 @@ async function checkForMissingEventNames(order) {
     });
 
     let updated = await cart.setMissingEventNames(order);
-    setCart(cart);
+    setCart(cart, false);
     return updated || outOfSync;
 }
 
@@ -821,7 +821,7 @@ function syncCartItemToSapItem(sapItemKey, cartItemKey = null) {
         cartItem.qtyRedeemWithPoints = sapItem.qtyRedeemWithPoints;
         cartItem.product.subPriceFlag = sapItem.product.subPriceFlag;
         cart.addCartItem(cartItem, true);
-        setCart(cart);
+        setCart(cart, false);
     }
 }
 

package/src/order/order.js

@@ -56,6 +56,7 @@ newShop.Order = function(orderData){
     let errorResponseInfo;
     let paymentAuthorizationObject;
     let giftReceipt;
+    let dropShip;
     let externalPaymentAdrNumber;
 
     let redirectUrl;
@@ -117,6 +118,7 @@ newShop.Order = function(orderData){
         errorResponseInfo = orderData.errorResponseInfo;
         paymentAuthorizationObject = orderData.paymentAuthorizationObject;
         giftReceipt = orderData.giftReceipt;
+        dropShip = orderData.dropShip;
         externalPaymentAdrNumber = orderData.externalPaymentAdrNumber;
         redirectUrl = orderData.redirectUrl;
         proxyLaunchUrl = orderData.proxyLaunchUrl;
@@ -272,6 +274,7 @@ newShop.Order = function(orderData){
         order.externalPaymentAdrNumber = externalPaymentAdrNumber;
         order.paymentAuthorizationObject = paymentAuthorizationObject;
         order.giftReceipt = giftReceipt;
+        order.dropShip = dropShip;
         order.redirectUrl = redirectUrl;
         order.proxyLaunchUrl = proxyLaunchUrl;
         order.proxyReenterUrl = proxyReenterUrl;
@@ -691,6 +694,14 @@ newShop.Order = function(orderData){
                 giftReceipt = _giftReceipt;
             }
         },
+        dropShip: {
+            get: function() {
+                return dropShip;
+            },
+            set: function(_dropShip) {
+                dropShip = _dropShip;
+            }
+        },
         externalPaymentAdrNumber: {
             get: function() {
                 return externalPaymentAdrNumber;

package/src/order/orderAdapter.js

@@ -1027,6 +1027,9 @@ const populateSalesOrder = (action, adr) => {
     }
     addToCustomList(salesOrder.Custom, "", "SENDER", order.distributorName);
     addToCustomList(salesOrder.Custom, "", "ZZUSE_PTS", order.shippingPayWithPoints ? "X" : "NA");
+    if (order.dropShip) {
+        addToCustomList(salesOrder.Custom, "FLAG", "DROPSHIP", "TRUE");
+    }
     if (user && user.isGuest) {
         addToCustomList(salesOrder.Custom, "FLAG", "GUEST", "TRUE");
     }

package/src/shop.js

@@ -65,7 +65,6 @@ export {default as AccertifyFraudService} from './payment/accertifyFraudService.
 export {default as EquinoxCartService} from './cart/equinoxCartService.js';
 export {default as eidLogin} from './eidLogin';
 export {default as Receiver} from './receiver';
-export {default as AgreementService} from './account/agreementService.js'
 
 export {PriceType, Agelocme, Product, ProductStatus} from '@nuskin/ns-product-lib';
 

package/src/account/agreementService.js

@@ -1,46 +0,0 @@
-import {UrlService} from "@nuskin/ns-util";
-import axios from 'axios'
-
-const downConvertAgreedToTerms = async (sapId, authToken) => {
-    let retVal = true;
-
-    try {
-        const result = await axios.get(
-            `${UrlService.getApisUrl()}/account-enrollment/agreement-terms/${sapId}`,
-            {
-                headers: {
-                    Authorization: `Bearer ${authToken}`
-                }
-            }
-        )
-        retVal = result.data.agreedTerms;
-    } catch (e) {
-        console.error('agreement-terms check failed', e)
-    }
-
-    return retVal
-}
-
-const setDownConvertAgreedToTerms = async (sapId, authToken) => {
-    let succeeded = true
-    try {
-        await axios.post(`${UrlService.getApisUrl()}/account-enrollment/agreement-terms`, {
-            agreedTerms: true,
-            sapId
-        },
-        {
-            headers: {
-                Authorization: `Bearer ${authToken}`
-            }
-        })
-    } catch (e) {
-        console.error('Failed setting agreement to terms', e);
-        succeeded = false;
-    }
-    return succeeded;
-}
-
-export default {
-    downConvertAgreedToTerms,
-    setDownConvertAgreedToTerms
-};