@nuskin/ns-shop 5.19.3 → 5.19.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-shop",
-  "version": "5.19.3",
+  "version": "5.19.5",
   "description": "The description that will amaze and astound your audience when they read it",
   "main": "src/shop.js",
   "scripts": {

package/src/cart/cartService.js

@@ -38,7 +38,7 @@ export default {
     getAddToCartQty,
     changeItemQty,
     syncCartItemToSapItem,
-    checkCartAgainstQualifications,
+    checkItemAvailability,
     removeItemBySku,
     removeItemByKey,
     removeItems,
@@ -107,6 +107,10 @@ function _getCart() {
             anonymousCartId = storage.getItem('anonymousCartId'),
             isPitchApp = PersonalOfferStorageService.isPersonalOffer();
 
+        if (cartJson && !cartJson.cntryCd) {
+            cartJson.cntryCd = runConfig.country;
+        }
+
         // If the cartJson userId is empty OR null, then we are going from nothing to something, and we want to keep our items
         if (cartJson &&
             (!UrlService.isLocalePage() || (cartJson.cntryCd === runConfig.country)) &&
@@ -290,6 +294,17 @@ function getPriceTypeTotal(priceType) {
     }).reduce((a, b) => a + b, 0);
 }
 
+/**
+ * Checks status and order types.
+ *
+ * @param {*} product
+ * @returns
+ */
+function itemIsAvailable(product) {
+    return product.status === ProductStatus.ReleasedForSale &&
+        (product.hasOrderOption() || product.hasAdrOption());
+}
+
 /**
  * Adds a product to the cart. If is not a SAP product it checks for excusivity before
  *  adding to the cart.
@@ -313,7 +328,7 @@ function getPriceTypeTotal(priceType) {
 async function addProductToCart(options) {
     let cart = _getCart();
 
-    if (options.product.status != ProductStatus.ReleasedForSale) {
+    if (!itemIsAvailable(options.product)) {
         throw new NsProductNotReleasedForSale('This product is not released for sale');
     }
 
@@ -785,17 +800,18 @@ function syncCartItemToSapItem(sapItemKey, cartItemKey = null) {
  * quantity is at or below qualified amounts. If the quantity in
  * the cart is too high an adjustment is made.
  */
-async function checkCartAgainstQualifications() {
+async function checkItemAvailability() {
     const cart = _getCart();
-    const itemData = cart.getItemData();
 
-    for (const item of itemData) {
-        if (item.isExclusive) {
-            const qual = await QualificationService.getQualification(item.sku);
+    for (const item of cart.getItems()) {
+        if (!itemIsAvailable(item.product)) {
+            cart.removeProduct(item.key);
+        } else if (item.product.isExclusive) {
+            const qual = await QualificationService.getQualification(item.product.sku);
             const qualCnt = qual ? qual.quantity : 0;
 
             if (qualCnt < item.qty) {
-                await changeItemQty(item, qualCnt, 'qualification check');
+                await changeItemQty(item.toFlatJson(), qualCnt, 'qualification check');
             }
         }
     }

package/src/cart/persistentCartService.js

@@ -673,7 +673,7 @@ const mergeIntoLocalCart = async (userId, pCart) => {
         });
 
         await Promise.allSettled(promises);
-        await CartService.checkCartAgainstQualifications();
+        await CartService.checkItemAvailability();
         await adjustPCart(pCart);
     }
     mergingIntoLocalCart = false;

package/src/order/orderAdapter.js

@@ -305,7 +305,7 @@ const addContactInfo = (contacts, selectedAddress) => {
     //Only push contacts if they aren't empty
     if (selectedAddress.shippingPhone) {
         contacts.push({
-            Country: selectedAddress.shippingCountry,
+            Country: selectedAddress.shippingPhoneCountry || selectedAddress.shippingCountry,
             Value: {
                 value: selectedAddress.shippingPhone,
                 Type: "HOMEPHONE"