@nuskin/ns-shop 7.3.0-mdigi-897.7 → 7.3.0-mdigi-897.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-shop",
-  "version": "7.3.0-mdigi-897.7",
+  "version": "7.3.0-mdigi-897.9",
   "description": "The description that will amaze and astound your audience when they read it",
   "main": "src/shop.js",
   "scripts": {
@@ -30,8 +30,7 @@
     "@nuskin/nuskinjquery": "2.3.1",
     "@nuskin/order-model": "3.1.3",
     "@nuskin/product-lib": "2.2.1",
-    "@nuskin/ns-util": "4.7.0",
-    "axios": "1.6.5",
+    "axios": "1.7.9",
     "decimal.js": "10.4.3",
     "jp-conversion": "0.0.7",
     "lodash": "4.17.21",
@@ -91,7 +90,7 @@
     "moment": "2.29.4",
     "json5": "2.2.3",
     "ip": "2.0.1",
-    "axios": "1.6.8",
+    "axios": "1.7.9",
     "merge": "2.1.1",
     "glob-parent": "6.0.2",
     "follow-redirects": "1.15.5",

package/src/cart/cart.js

@@ -1329,8 +1329,16 @@ export default function Cart(cartData) {
         const customPayloadMetadata = storage.metadata.CUSTOM_EVENT_PAYLOAD;
         let customPayload = storage.getItem(customPayloadMetadata);
         if (customPayload) {
-            if (customPayload.constructor === {}.constructor) {
-                Object.assign(json, customPayload);
+            if (customPayload.catalogAddToCart) {
+                delete customPayload.catalogAddToCart;
+                const product = json.ecommerce.add && json.ecommerce.add.products && json.ecommerce.add.products[0];
+                if (product) {
+                    Object.assign(product, customPayload);
+                }
+            } else {
+                if (customPayload.constructor === {}.constructor) {
+                    Object.assign(json, customPayload);
+                }
             }
             storage.removeItem(customPayloadMetadata);
         }

package/src/order/orderAdapter.js

@@ -6,10 +6,8 @@ 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";
 
 let splitLineItems = [];
-const utmInfo = storage.getItem(storage.metadata.UTM_INFO);
 const addToCustomList = (customList, type, key, value) => {
     if (value) {
         let found = false;
@@ -497,14 +495,6 @@ const populateCategory = (salesOrder) => {
     } else if (util.getSponsorId()) {
         // affiliates don't use a subdomain.  So if we have a sponsor and it isn't a pitch then we consider it a storefront
         salesOrder.Category = "STOREFRONT";
-    } else if(utmInfo && utmInfo.utm_medium){
-        if (utmInfo && utmInfo.utm_medium.includes('paidsearch')) {
-            salesOrder.Category = 'PAIDSEARCH';
-        } else if (utmInfo && utmInfo.utm_medium.includes('paidsocial')) {
-            salesOrder.Category = 'PAIDAD';
-        } else {
-            salesOrder.Category = 'WEB';
-        }
     } else {
         salesOrder.Category = 'WEB';
     }
@@ -1040,12 +1030,6 @@ const populateSalesOrder = (action, adr) => {
     if (user && user.isGuest) {
         addToCustomList(salesOrder.Custom, "FLAG", "GUEST", "TRUE");
     }
-    addToCustomList(salesOrder.Custom, "FLAG", "UTM_SOURCE", utmInfo ? utmInfo.utm_source : null);
-    addToCustomList(salesOrder.Custom, "FLAG", "UTM_MEDIUM", utmInfo ? utmInfo.utm_medium : null);
-    addToCustomList(salesOrder.Custom, "FLAG", "UTM_CAMPAIGN", utmInfo ? utmInfo.utm_campaign : null);
-    addToCustomList(salesOrder.Custom, "FLAG", "UTM_CAMPAIGN_ID", utmInfo ? utmInfo.utm_id : null);
-    addToCustomList(salesOrder.Custom, "FLAG", "UTM_CONTENT", utmInfo ? utmInfo.utm_content : null);
-    addToCustomList(salesOrder.Custom, "FLAG", "UTM_TERM", utmInfo ? utmInfo.utm_term : null);
     const microsite = getCachedConfigField('microsite');
     if (microsite) {
         salesOrder.Reason = "CUSTOM";

package/src/product/productSearchAPIQueryService.js

@@ -73,6 +73,7 @@ function productSearchAPI(deferred, options) {
                                 customerTypes
                                 description
                                 searchKeywords
+                                matchingVariant
                             }
                             bundle {
                                 purchaseTypes {
@@ -170,7 +171,8 @@ function productSearchAPI(deferred, options) {
             let mappedParentProduct = parentProduct;
     
             if (!isSkuFormat(parentProduct.id) && parentProduct.variants && parentProduct.variants.length > 0) {
-                mappedParentProduct = parentProduct.variants[0];
+                const matchingVariant = parentProduct.variants.find(variant => variant.matchingVariant === true);
+                mappedParentProduct = matchingVariant || parentProduct.variants[0];
             } else {
                 mappedParentProduct.sku = parentProduct.id;
                 mappedParentProduct.variants = [];
@@ -358,15 +360,27 @@ function productSearchAPI(deferred, options) {
         return orderTypes;
     }
 
-    
     function fetchNextPage() {
         sendQuery(currentPage)
             .then(processResponse)
             .then((result) => {
-                allProducts = allProducts.concat(result.products);
-                if ((currentPage * options.rows) < result.totalNumFound && !options.groupByVariant) {
-                    currentPage++;
-                    fetchNextPage();
+                if (!result || !result.products || result.products.length === 0) {
+                    // console.error("No products found or invalid response", result);
+                    deferred.resolve({
+                        products: allProducts,
+                        totalNumFound: result.totalNumFound
+                    });
+                    return;
+                }
+
+                const remainingProducts = options.rows - allProducts.length;
+                const productsToAdd = result.products.slice(0, remainingProducts);
+    
+                allProducts = allProducts.concat(productsToAdd);
+    
+                if (allProducts.length < options.rows && (currentPage * options.rows) < result.totalNumFound && !options.groupByVariant) {
+                    currentPage = currentPage + 1; 
+                    fetchNextPage(); 
                 } else {
                     deferred.resolve({
                         products: allProducts,
@@ -375,7 +389,7 @@ function productSearchAPI(deferred, options) {
                 }
             })
             .catch((error) => {
-                console.error(error);
+                console.error("Error fetching products:", error);
                 deferred.reject(error);
             });
     }