washday-sdk 1.6.23 → 1.6.25

package/dist/utils/orders/calculateOrderTotal.js

@@ -2,6 +2,40 @@ import { DiscountCodeTypes } from "../../enum";
 import { calculateTotalTaxesIncluded } from "./calculateTotalTaxesIncluded";
 import { calculateTotalTaxesOverPrice } from "./calculateTotalTaxesOverPrice";
 import { getCreditApplied, getProductLineTotals, getShippingCost } from "./helpers";
+const getNormalizedId = (value) => {
+    if (value === null || value === undefined) {
+        return "";
+    }
+    return String(value).trim();
+};
+const getProductIdentity = (product) => {
+    var _a;
+    const directId = getNormalizedId((_a = product === null || product === void 0 ? void 0 : product._id) !== null && _a !== void 0 ? _a : product === null || product === void 0 ? void 0 : product.productId);
+    if (directId) {
+        return directId;
+    }
+    const storeProductId = product === null || product === void 0 ? void 0 : product.storeProductId;
+    if (typeof storeProductId === "string") {
+        return getNormalizedId(storeProductId);
+    }
+    return getNormalizedId(storeProductId === null || storeProductId === void 0 ? void 0 : storeProductId._id);
+};
+const getDiscountTargetIdentity = (target) => {
+    var _a, _b;
+    if (typeof target === "string") {
+        return getNormalizedId(target);
+    }
+    return getNormalizedId((_b = (_a = target === null || target === void 0 ? void 0 : target._id) !== null && _a !== void 0 ? _a : target === null || target === void 0 ? void 0 : target.productId) !== null && _b !== void 0 ? _b : target === null || target === void 0 ? void 0 : target.storeProductId);
+};
+const hasMatchingDiscountTarget = (targets = [], product) => {
+    const productId = getProductIdentity(product);
+    if (!productId) {
+        return false;
+    }
+    return (Array.isArray(targets) ? targets : []).some((target) => {
+        return getDiscountTargetIdentity(target) === productId;
+    });
+};
 export const calculateOrderTotal = (order, selectedCustomer, storeSettings, hasShippingCost, storeDiscounts = [], discountCodeObj, redeemPointsDiscount = 0 // 💡 NUEVO parámetro
 ) => {
     var _a;
@@ -19,7 +53,7 @@ export const calculateOrderTotal = (order, selectedCustomer, storeSettings, hasS
             discountCodeObj.type === DiscountCodeTypes.NUMBER &&
             discountCodeObj.applyOnceOnOrder) {
             const includesProducts = discountCodeObj.applyToAllProducts ||
-                order.products.some((curr) => discountCodeObj.products.includes(curr._id));
+                order.products.some((curr) => hasMatchingDiscountTarget(discountCodeObj.products, curr));
             discountCodeAmount = includesProducts ? discountCodeObj.value : 0;
         }
         // === SHIPPING COST ===

package/dist/utils/orders/calculateTotalTaxesIncluded.js

@@ -1,9 +1,43 @@
 import { DiscountCodeTypes } from "../../enum";
 import { getProductTaxesPercentage } from "./helpers";
+const getNormalizedId = (value) => {
+    if (value === null || value === undefined) {
+        return "";
+    }
+    return String(value).trim();
+};
+const getProductIdentity = (product) => {
+    var _a;
+    const directId = getNormalizedId((_a = product === null || product === void 0 ? void 0 : product._id) !== null && _a !== void 0 ? _a : product === null || product === void 0 ? void 0 : product.productId);
+    if (directId) {
+        return directId;
+    }
+    const storeProductId = product === null || product === void 0 ? void 0 : product.storeProductId;
+    if (typeof storeProductId === "string") {
+        return getNormalizedId(storeProductId);
+    }
+    return getNormalizedId(storeProductId === null || storeProductId === void 0 ? void 0 : storeProductId._id);
+};
+const getDiscountTargetIdentity = (target) => {
+    var _a, _b;
+    if (typeof target === "string") {
+        return getNormalizedId(target);
+    }
+    return getNormalizedId((_b = (_a = target === null || target === void 0 ? void 0 : target._id) !== null && _a !== void 0 ? _a : target === null || target === void 0 ? void 0 : target.productId) !== null && _b !== void 0 ? _b : target === null || target === void 0 ? void 0 : target.storeProductId);
+};
+const hasMatchingDiscountTarget = (targets = [], currentProduct) => {
+    const currentId = getProductIdentity(currentProduct);
+    if (!currentId) {
+        return false;
+    }
+    return (Array.isArray(targets) ? targets : []).some((target) => {
+        return getDiscountTargetIdentity(target) === currentId;
+    });
+};
 export const calculateTotalTaxesIncluded = (order, selectedCustomer, storeSettings, storeDiscounts, appliedOrderDiscounts, discountCodeObj) => {
     const productTableImports = [...order.products, ...order.buyAndGetProducts].map((current) => {
-        var _a, _b;
-        const qty = current.qty || 0;
+        var _a;
+        const qty = current.qty || current.quantity || 0;
         const taxPercentage = getProductTaxesPercentage(current, storeSettings);
         const taxFactor = 1 + taxPercentage / 100;
         // Convertir extraAmount de bruto a neto
@@ -19,15 +53,7 @@ export const calculateTotalTaxesIncluded = (order, selectedCustomer, storeSettin
         let customerDiscount = 0;
         // ORDER DOES NOT HAVE A DISCOUNT CODE
         if (!order.discountCode) {
-            const discountsToApply = storeDiscounts.filter((discount) => discount.isActive && discount.products.some((p) => {
-                if (typeof p === 'string') {
-                    return p === current._id;
-                }
-                else if (typeof p === 'object') {
-                    return p._id === current._id;
-                }
-                return false;
-            }));
+            const discountsToApply = storeDiscounts.filter((discount) => discount.isActive && hasMatchingDiscountTarget(discount.products, current));
             customerDiscount = ((_a = selectedCustomer === null || selectedCustomer === void 0 ? void 0 : selectedCustomer.customer) === null || _a === void 0 ? void 0 : _a.discount) || 0;
             productPercentageDiscount = discountsToApply.reduce((prev, next) => {
                 return next.type === 'percentage' ? prev + next.value : prev;
@@ -41,7 +67,7 @@ export const calculateTotalTaxesIncluded = (order, selectedCustomer, storeSettin
             if ((discountCodeObj === null || discountCodeObj === void 0 ? void 0 : discountCodeObj.type) === DiscountCodeTypes.PERCENTAGE) {
                 discPercentageInteger = +(discountCodeObj.value / 100).toFixed(2);
                 if (!discountCodeObj.applyToAllProducts) {
-                    discPercentageInteger = ((_b = discountCodeObj.products) === null || _b === void 0 ? void 0 : _b.includes(current._id))
+                    discPercentageInteger = hasMatchingDiscountTarget(discountCodeObj.products, current)
                         ? +(discountCodeObj.value / 100).toFixed(2)
                         : 0;
                 }

package/dist/utils/orders/calculateTotalTaxesOverPrice.js

@@ -1,5 +1,39 @@
 import { BuyAndGetConditionsTypes, DiscountCodeTypes } from "../../enum";
 import { getProductTaxesPercentage } from "./helpers";
+const getNormalizedId = (value) => {
+    if (value === null || value === undefined) {
+        return "";
+    }
+    return String(value).trim();
+};
+const getProductIdentity = (product) => {
+    var _a;
+    const directId = getNormalizedId((_a = product === null || product === void 0 ? void 0 : product._id) !== null && _a !== void 0 ? _a : product === null || product === void 0 ? void 0 : product.productId);
+    if (directId) {
+        return directId;
+    }
+    const storeProductId = product === null || product === void 0 ? void 0 : product.storeProductId;
+    if (typeof storeProductId === "string") {
+        return getNormalizedId(storeProductId);
+    }
+    return getNormalizedId(storeProductId === null || storeProductId === void 0 ? void 0 : storeProductId._id);
+};
+const getDiscountTargetIdentity = (target) => {
+    var _a, _b;
+    if (typeof target === "string") {
+        return getNormalizedId(target);
+    }
+    return getNormalizedId((_b = (_a = target === null || target === void 0 ? void 0 : target._id) !== null && _a !== void 0 ? _a : target === null || target === void 0 ? void 0 : target.productId) !== null && _b !== void 0 ? _b : target === null || target === void 0 ? void 0 : target.storeProductId);
+};
+const hasMatchingDiscountTarget = (targets = [], currentProduct) => {
+    const currentId = getProductIdentity(currentProduct);
+    if (!currentId) {
+        return false;
+    }
+    return (Array.isArray(targets) ? targets : []).some((target) => {
+        return getDiscountTargetIdentity(target) === currentId;
+    });
+};
 export const calculateTotalTaxesOverPrice = (order, selectedCustomer, storeSettings, storeDiscounts, appliedOrderDiscounts, discountCodeObj) => {
     const productTableImports = [...order.products, ...order.buyAndGetProducts].map((current) => {
         var _a;
@@ -17,15 +51,7 @@ export const calculateTotalTaxesOverPrice = (order, selectedCustomer, storeSetti
         const adjustedPrice = productBasePrice + unitExtra;
         // Cálculo de descuento sobre el precio ajustado
         if (!order.discountCode) {
-            const discountsToApply = storeDiscounts.filter((discount) => discount.isActive && discount.products.some((p) => {
-                if (typeof p === 'string') {
-                    return p === current._id;
-                }
-                else if (typeof p === 'object') {
-                    return p._id === current._id;
-                }
-                return false;
-            }));
+            const discountsToApply = storeDiscounts.filter((discount) => discount.isActive && hasMatchingDiscountTarget(discount.products, current));
             customerDiscount = ((_a = selectedCustomer === null || selectedCustomer === void 0 ? void 0 : selectedCustomer.customer) === null || _a === void 0 ? void 0 : _a.discount) || 0;
             productPercentageDiscount = discountsToApply.reduce((acc, discount) => {
                 return discount.type === 'percentage' ? acc + discount.value : acc;
@@ -37,7 +63,7 @@ export const calculateTotalTaxesOverPrice = (order, selectedCustomer, storeSetti
             if (discountCodeObj.type === DiscountCodeTypes.PERCENTAGE) {
                 discPercentageInteger = +(discountCodeObj.value / 100).toFixed(2);
                 if (!discountCodeObj.applyToAllProducts) {
-                    discPercentageInteger = discountCodeObj.products.includes(current._id)
+                    discPercentageInteger = hasMatchingDiscountTarget(discountCodeObj.products, current)
                         ? +(discountCodeObj.value / 100).toFixed(2)
                         : 0;
                 }

package/dist/utils/orders/helpers.js

@@ -1,4 +1,71 @@
 import { BuyAndGetConditionsTypes, DiscountCodeTypes } from "../../enum";
+const getNormalizedId = (value) => {
+    if (value === null || value === undefined) {
+        return "";
+    }
+    return String(value).trim();
+};
+const getProductIdentity = (product) => {
+    var _a;
+    const directId = getNormalizedId((_a = product === null || product === void 0 ? void 0 : product._id) !== null && _a !== void 0 ? _a : product === null || product === void 0 ? void 0 : product.productId);
+    if (directId) {
+        return directId;
+    }
+    const storeProductId = product === null || product === void 0 ? void 0 : product.storeProductId;
+    if (typeof storeProductId === "string") {
+        return getNormalizedId(storeProductId);
+    }
+    return getNormalizedId(storeProductId === null || storeProductId === void 0 ? void 0 : storeProductId._id);
+};
+const getDiscountTargetIdentity = (target) => {
+    var _a, _b;
+    if (typeof target === "string") {
+        return getNormalizedId(target);
+    }
+    return getNormalizedId((_b = (_a = target === null || target === void 0 ? void 0 : target._id) !== null && _a !== void 0 ? _a : target === null || target === void 0 ? void 0 : target.productId) !== null && _b !== void 0 ? _b : target === null || target === void 0 ? void 0 : target.storeProductId);
+};
+const matchesDiscountTarget = (product, target) => {
+    const productId = getProductIdentity(product);
+    const targetId = getDiscountTargetIdentity(target);
+    return Boolean(productId && targetId && productId === targetId);
+};
+const getLineQty = (product) => {
+    var _a, _b;
+    const qty = Number((_b = (_a = product === null || product === void 0 ? void 0 : product.qty) !== null && _a !== void 0 ? _a : product === null || product === void 0 ? void 0 : product.quantity) !== null && _b !== void 0 ? _b : 0);
+    return Number.isFinite(qty) ? qty : 0;
+};
+const getQtyOfProduct = (lines, productId) => {
+    const targetId = getDiscountTargetIdentity(productId);
+    if (!targetId) {
+        return 0;
+    }
+    return lines.reduce((acc, line) => {
+        if (getProductIdentity(line) !== targetId) {
+            return acc;
+        }
+        return acc + getLineQty(line);
+    }, 0);
+};
+const getFulfillmentCount = (buyConditions = [], lines = []) => {
+    if (!Array.isArray(buyConditions) || buyConditions.length === 0) {
+        return 0;
+    }
+    const fulfillments = buyConditions.map((condition) => {
+        var _a, _b;
+        const requiredQty = Number((_a = condition === null || condition === void 0 ? void 0 : condition.qty) !== null && _a !== void 0 ? _a : 0);
+        if (!Number.isFinite(requiredQty) || requiredQty <= 0) {
+            return 0;
+        }
+        const boughtQty = getQtyOfProduct(lines, (_b = condition === null || condition === void 0 ? void 0 : condition.buyProduct) === null || _b === void 0 ? void 0 : _b._id);
+        return Math.floor(boughtQty / requiredQty);
+    });
+    return fulfillments.length > 0 ? Math.min(...fulfillments) : 0;
+};
+const getTargetProductIdSet = (products = []) => {
+    return new Set((Array.isArray(products) ? products : [])
+        .map((item) => getDiscountTargetIdentity(item))
+        .filter((id) => id.length > 0));
+};
 export const getProductTaxesPercentage = (productObj, store) => {
     const getTaxValue = (tax, isTaxExempt) => {
         if (!tax) {
@@ -65,13 +132,7 @@ export const applyDiscountToProducts = (discountCode, productsArr, isExpress, st
         return {
             newOrderProds: productsArr.map((prod) => {
                 const discountsToApply = storeDiscounts.filter((discount) => discount.isActive && discount.products.some((p) => {
-                    if (typeof p === 'string') {
-                        return p === prod._id;
-                    }
-                    else if (typeof p === 'object') {
-                        return p._id === prod._id;
-                    }
-                    return false;
+                    return matchesDiscountTarget(prod, p);
                 }));
                 const customerDiscount = (selectedCustomer === null || selectedCustomer === void 0 ? void 0 : selectedCustomer.discount) / 100 || 0;
                 const productPercentageDiscount = discountsToApply.reduce((prev, next) => {
@@ -103,16 +164,15 @@ export const applyDiscountToProducts = (discountCode, productsArr, isExpress, st
             });
         }
         else {
-            for (let discountProduct of discountCode.products) {
-                const prodIdx = newOrderProds.findIndex((prod) => prod._id === discountProduct);
-                if (prodIdx !== -1) {
-                    let prodObj = newOrderProds[prodIdx];
-                    const prodPrice = isExpress ? prodObj.expressPrice : prodObj.price;
-                    const discountAmount = +(percentageDiscount * prodPrice).toFixed(2);
-                    prodObj.discountAmount = discountAmount;
-                    newOrderProds[prodIdx] = prodObj;
+            const discountProductIds = getTargetProductIdSet(discountCode.products);
+            newOrderProds = newOrderProds.map((prod) => {
+                if (!discountProductIds.has(getProductIdentity(prod))) {
+                    return prod;
                 }
-            }
+                const prodPrice = isExpress ? prod.expressPrice : prod.price;
+                const discountAmount = +(percentageDiscount * prodPrice).toFixed(2);
+                return Object.assign(Object.assign({}, prod), { discountAmount });
+            });
         }
     }
     if (discountCode && discountCode.type === DiscountCodeTypes.NUMBER) {
@@ -122,14 +182,13 @@ export const applyDiscountToProducts = (discountCode, productsArr, isExpress, st
                 newOrderProds = newOrderProds.map((prod) => (Object.assign(Object.assign({}, prod), { discountAmount: discountAmount })));
             }
             else {
-                for (let discountProduct of discountCode.products) {
-                    const prodIdx = newOrderProds.findIndex((prod) => prod._id === discountProduct);
-                    if (prodIdx !== -1) {
-                        let prodObj = newOrderProds[prodIdx];
-                        prodObj.discountAmount = discountAmount;
-                        newOrderProds[prodIdx] = prodObj;
+                const discountProductIds = getTargetProductIdSet(discountCode.products);
+                newOrderProds = newOrderProds.map((prod) => {
+                    if (!discountProductIds.has(getProductIdentity(prod))) {
+                        return prod;
                     }
-                }
+                    return Object.assign(Object.assign({}, prod), { discountAmount });
+                });
             }
         }
     }
@@ -138,15 +197,7 @@ export const applyDiscountToProducts = (discountCode, productsArr, isExpress, st
         const getConditions = discountCode.buyAndGetConditions[0].getConditions;
         const discountType = discountCode.buyAndGetConditions[0].getDiscountType;
         const discountValue = discountCode.buyAndGetConditions[0].discountValue;
-        let buyConditionFulfilledCounter = 0;
-        for (let prodCondition of buyConditions) {
-            const orderProd = productsArr.find((ordProd) => ordProd._id === prodCondition.buyProduct._id);
-            // Nota: Aquí solo se verifica una condición de producto
-            if (orderProd) {
-                let qty = orderProd.qty || orderProd.quantity;
-                buyConditionFulfilledCounter = Math.floor(qty / prodCondition.qty);
-            }
-        }
+        const buyConditionFulfilledCounter = getFulfillmentCount(buyConditions, productsArr);
         if (buyConditionFulfilledCounter) {
             for (let prodCondition of getConditions) {
                 // Se utiliza solo el precio del producto (sin extraAmount) para calcular el descuento

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "washday-sdk",
-  "version": "1.6.23",
+  "version": "1.6.25",
   "description": "Washday utilities functions and API",
   "main": "dist/index.js",
   "type": "module",

package/src/api/products/post.ts

@@ -8,7 +8,7 @@ export const create = async function (this: WashdayClientInstance, data: {
     name: string;
     price: number;
     expressPrice: number;
-    type: 'normal' | 'weight';
+    type: 'normal' | 'weight' | 'length';
     pieces: number;
     sku?: string;
     overlayText: string;

package/src/api/products/put.ts

@@ -19,7 +19,7 @@ export const updateById = async function (this: WashdayClientInstance, id: strin
   name?: string;
   price?: number;
   expressPrice?: number;
-  type?: 'normal' | 'weight';
+  type?: 'normal' | 'weight' | 'length';
   pieces?: number;
   sku?: string;
   overlayText?: string;

package/src/interfaces/Product.ts

@@ -26,7 +26,7 @@ export interface IProduct {
     taxExemptOne: boolean,
     taxExemptTwo: boolean,
     taxExemptThree: boolean,
-    type: String,
+    type: 'normal' | 'weight' | 'length',
     isActive: boolean,
     showInApp: boolean,
     owner: IUser | string,
@@ -50,6 +50,8 @@ export interface IStoreProduct extends IProduct { }
 
 
 export interface IOrderProduct extends IProduct {
+    lineId?: string,
+    orderProductLineID?: string,
     extraAmount: number,
     properties: Array<string>,
     quantity: number,
@@ -57,4 +59,4 @@ export interface IOrderProduct extends IProduct {
     isBuyAndGetProduct: boolean,
     storeProductId: IStoreProduct | string
     qty?: number
-}
+}

package/src/interfaces/Store.ts

@@ -77,6 +77,7 @@ export interface IStore {
     cashierBoxes?: ICashierBox,
     ticketStructure?: ITicketStructure | null,
     ticketForLaundryStructure?: ITicketForLaundryStructure | null,
+    labelTicketStructure?: ILabelTicketStructure | null,
     ticketScanMode?: 'order' | 'customer',
     storeDiscounts: IStoreDiscount | null,
     discountCodes: IDiscountCode | null,
@@ -302,6 +303,7 @@ export interface ITicketStructure {
     showCredit: Boolean,
 }
 
+export interface ILabelTicketStructure extends ITicketStructure {}
 export interface ITicketForLaundryStructure {
     showTotalPieces: Boolean,
     showEmisionDate: Boolean,

package/src/utils/orders/calculateOrderTotal.ts

@@ -5,6 +5,43 @@ import { calculateTotalTaxesIncluded } from "./calculateTotalTaxesIncluded";
 import { calculateTotalTaxesOverPrice } from "./calculateTotalTaxesOverPrice";
 import { getCreditApplied, getProductLineTotals, getShippingCost } from "./helpers";
 
+const getNormalizedId = (value: any): string => {
+  if (value === null || value === undefined) {
+    return "";
+  }
+  return String(value).trim();
+};
+
+const getProductIdentity = (product: any): string => {
+  const directId = getNormalizedId(product?._id ?? product?.productId);
+  if (directId) {
+    return directId;
+  }
+
+  const storeProductId = product?.storeProductId;
+  if (typeof storeProductId === "string") {
+    return getNormalizedId(storeProductId);
+  }
+  return getNormalizedId(storeProductId?._id);
+};
+
+const getDiscountTargetIdentity = (target: any): string => {
+  if (typeof target === "string") {
+    return getNormalizedId(target);
+  }
+  return getNormalizedId(target?._id ?? target?.productId ?? target?.storeProductId);
+};
+
+const hasMatchingDiscountTarget = (targets: any[] = [], product: any): boolean => {
+  const productId = getProductIdentity(product);
+  if (!productId) {
+    return false;
+  }
+  return (Array.isArray(targets) ? targets : []).some((target: any) => {
+    return getDiscountTargetIdentity(target) === productId;
+  });
+};
+
 export const calculateOrderTotal = (
   order: any,
   selectedCustomer: { customer: ICustomer } | undefined,
@@ -51,7 +88,7 @@ export const calculateOrderTotal = (
       const includesProducts =
         discountCodeObj.applyToAllProducts ||
         order.products.some((curr: any) =>
-          discountCodeObj.products.includes(curr._id)
+          hasMatchingDiscountTarget(discountCodeObj.products, curr)
         );
 
       discountCodeAmount = includesProducts ? discountCodeObj.value : 0;
@@ -102,4 +139,4 @@ export const calculateOrderTotal = (
   } catch (error) {
     throw error;
   }
-};
+};

package/src/utils/orders/calculateTotalTaxesIncluded.ts

@@ -2,6 +2,43 @@ import { DiscountCodeTypes } from "../../enum";
 import { IOrderProduct } from "../../interfaces/Product";
 import { getProductTaxesPercentage } from "./helpers";
 
+const getNormalizedId = (value: any): string => {
+  if (value === null || value === undefined) {
+    return "";
+  }
+  return String(value).trim();
+};
+
+const getProductIdentity = (product: any): string => {
+  const directId = getNormalizedId(product?._id ?? product?.productId);
+  if (directId) {
+    return directId;
+  }
+
+  const storeProductId = product?.storeProductId;
+  if (typeof storeProductId === "string") {
+    return getNormalizedId(storeProductId);
+  }
+  return getNormalizedId(storeProductId?._id);
+};
+
+const getDiscountTargetIdentity = (target: any): string => {
+  if (typeof target === "string") {
+    return getNormalizedId(target);
+  }
+  return getNormalizedId(target?._id ?? target?.productId ?? target?.storeProductId);
+};
+
+const hasMatchingDiscountTarget = (targets: any[] = [], currentProduct: any): boolean => {
+  const currentId = getProductIdentity(currentProduct);
+  if (!currentId) {
+    return false;
+  }
+  return (Array.isArray(targets) ? targets : []).some((target: any) => {
+    return getDiscountTargetIdentity(target) === currentId;
+  });
+};
+
 export const calculateTotalTaxesIncluded = (
   order: any,
   selectedCustomer: any,
@@ -11,7 +48,7 @@ export const calculateTotalTaxesIncluded = (
   discountCodeObj: any | null
 ): any => {
   const productTableImports = [...order.products, ...order.buyAndGetProducts].map((current: IOrderProduct) => {
-    const qty = current.qty || 0;
+    const qty = current.qty || current.quantity || 0;
     const taxPercentage = getProductTaxesPercentage(current, storeSettings);
     const taxFactor = 1 + taxPercentage / 100;
 
@@ -31,14 +68,7 @@ export const calculateTotalTaxesIncluded = (
     // ORDER DOES NOT HAVE A DISCOUNT CODE
     if (!order.discountCode) {
       const discountsToApply = storeDiscounts.filter(
-        (discount: any) => discount.isActive && discount.products.some((p: any) => {
-          if (typeof p === 'string') {
-            return p === current._id
-          } else if (typeof p === 'object') {
-            return p._id === current._id
-          }
-          return false
-        })
+        (discount: any) => discount.isActive && hasMatchingDiscountTarget(discount.products, current)
       );
       customerDiscount = selectedCustomer?.customer?.discount || 0;
       productPercentageDiscount = discountsToApply.reduce((prev, next) => {
@@ -52,7 +82,7 @@ export const calculateTotalTaxesIncluded = (
       if (discountCodeObj?.type === DiscountCodeTypes.PERCENTAGE) {
         discPercentageInteger = +(discountCodeObj.value / 100).toFixed(2);
         if (!discountCodeObj.applyToAllProducts) {
-          discPercentageInteger = discountCodeObj.products?.includes(current._id)
+          discPercentageInteger = hasMatchingDiscountTarget(discountCodeObj.products, current)
             ? +(discountCodeObj.value / 100).toFixed(2)
             : 0;
         }

package/src/utils/orders/calculateTotalTaxesOverPrice.ts

@@ -1,6 +1,43 @@
 import { BuyAndGetConditionsTypes, DiscountCodeTypes } from "../../enum";
 import { getProductTaxesPercentage } from "./helpers";
 
+const getNormalizedId = (value: any): string => {
+  if (value === null || value === undefined) {
+    return "";
+  }
+  return String(value).trim();
+};
+
+const getProductIdentity = (product: any): string => {
+  const directId = getNormalizedId(product?._id ?? product?.productId);
+  if (directId) {
+    return directId;
+  }
+
+  const storeProductId = product?.storeProductId;
+  if (typeof storeProductId === "string") {
+    return getNormalizedId(storeProductId);
+  }
+  return getNormalizedId(storeProductId?._id);
+};
+
+const getDiscountTargetIdentity = (target: any): string => {
+  if (typeof target === "string") {
+    return getNormalizedId(target);
+  }
+  return getNormalizedId(target?._id ?? target?.productId ?? target?.storeProductId);
+};
+
+const hasMatchingDiscountTarget = (targets: any[] = [], currentProduct: any): boolean => {
+  const currentId = getProductIdentity(currentProduct);
+  if (!currentId) {
+    return false;
+  }
+  return (Array.isArray(targets) ? targets : []).some((target: any) => {
+    return getDiscountTargetIdentity(target) === currentId;
+  });
+};
+
 export const calculateTotalTaxesOverPrice = (
   order: any,
   selectedCustomer: any,
@@ -28,14 +65,7 @@ export const calculateTotalTaxesOverPrice = (
     // Cálculo de descuento sobre el precio ajustado
     if (!order.discountCode) {
       const discountsToApply = storeDiscounts.filter(
-        (discount: any) => discount.isActive && discount.products.some((p: any) => {
-          if (typeof p === 'string') {
-            return p === current._id
-          } else if (typeof p === 'object') {
-            return p._id === current._id
-          }
-          return false
-        })
+        (discount: any) => discount.isActive && hasMatchingDiscountTarget(discount.products, current)
       );
       customerDiscount = selectedCustomer?.customer?.discount || 0;
       productPercentageDiscount = discountsToApply.reduce((acc, discount) => {
@@ -47,7 +77,7 @@ export const calculateTotalTaxesOverPrice = (
       if (discountCodeObj.type === DiscountCodeTypes.PERCENTAGE) {
         discPercentageInteger = +(discountCodeObj.value / 100).toFixed(2);
         if (!discountCodeObj.applyToAllProducts) {
-          discPercentageInteger = discountCodeObj.products.includes(current._id)
+          discPercentageInteger = hasMatchingDiscountTarget(discountCodeObj.products, current)
             ? +(discountCodeObj.value / 100).toFixed(2)
             : 0;
         }

package/src/utils/orders/helpers.ts

@@ -3,6 +3,85 @@ import { ICustomer } from "../../interfaces/Customer";
 import { IOrderProduct, ProductLineTotals } from "../../interfaces/Product";
 import { IStore, ITaxConfig } from "../../interfaces/Store";
 
+const getNormalizedId = (value: any): string => {
+  if (value === null || value === undefined) {
+    return "";
+  }
+  return String(value).trim();
+};
+
+const getProductIdentity = (product: any): string => {
+  const directId = getNormalizedId(product?._id ?? product?.productId);
+  if (directId) {
+    return directId;
+  }
+
+  const storeProductId = product?.storeProductId;
+  if (typeof storeProductId === "string") {
+    return getNormalizedId(storeProductId);
+  }
+
+  return getNormalizedId(storeProductId?._id);
+};
+
+const getDiscountTargetIdentity = (target: any): string => {
+  if (typeof target === "string") {
+    return getNormalizedId(target);
+  }
+
+  return getNormalizedId(target?._id ?? target?.productId ?? target?.storeProductId);
+};
+
+const matchesDiscountTarget = (product: any, target: any): boolean => {
+  const productId = getProductIdentity(product);
+  const targetId = getDiscountTargetIdentity(target);
+  return Boolean(productId && targetId && productId === targetId);
+};
+
+const getLineQty = (product: any): number => {
+  const qty = Number(product?.qty ?? product?.quantity ?? 0);
+  return Number.isFinite(qty) ? qty : 0;
+};
+
+const getQtyOfProduct = (lines: any[], productId: any): number => {
+  const targetId = getDiscountTargetIdentity(productId);
+  if (!targetId) {
+    return 0;
+  }
+
+  return lines.reduce((acc: number, line: any) => {
+    if (getProductIdentity(line) !== targetId) {
+      return acc;
+    }
+    return acc + getLineQty(line);
+  }, 0);
+};
+
+const getFulfillmentCount = (buyConditions: any[] = [], lines: any[] = []): number => {
+  if (!Array.isArray(buyConditions) || buyConditions.length === 0) {
+    return 0;
+  }
+
+  const fulfillments = buyConditions.map((condition: any) => {
+    const requiredQty = Number(condition?.qty ?? 0);
+    if (!Number.isFinite(requiredQty) || requiredQty <= 0) {
+      return 0;
+    }
+    const boughtQty = getQtyOfProduct(lines, condition?.buyProduct?._id);
+    return Math.floor(boughtQty / requiredQty);
+  });
+
+  return fulfillments.length > 0 ? Math.min(...fulfillments) : 0;
+};
+
+const getTargetProductIdSet = (products: any[] = []): Set<string> => {
+  return new Set(
+    (Array.isArray(products) ? products : [])
+      .map((item: any) => getDiscountTargetIdentity(item))
+      .filter((id) => id.length > 0)
+  );
+};
+
 export const getProductTaxesPercentage = (productObj: IOrderProduct, store: IStore): number => {
   const getTaxValue = (tax: ITaxConfig | null | undefined, isTaxExempt: boolean): number => {
     if (!tax) {
@@ -95,12 +174,7 @@ export const applyDiscountToProducts = (
       newOrderProds: productsArr.map((prod: any) => {
         const discountsToApply = storeDiscounts.filter(
           (discount: any) => discount.isActive && discount.products.some((p: any) =>{
-            if(typeof p === 'string') {
-              return p === prod._id
-            } else if(typeof p === 'object') {
-              return p._id === prod._id
-            }
-            return false
+            return matchesDiscountTarget(prod, p);
           })
         );
         const customerDiscount = selectedCustomer?.discount / 100 || 0;
@@ -135,16 +209,15 @@ export const applyDiscountToProducts = (
         return { ...prod, discountAmount: discountAmount };
       });
     } else {
-      for (let discountProduct of discountCode.products) {
-        const prodIdx = newOrderProds.findIndex((prod: any) => prod._id === discountProduct);
-        if (prodIdx !== -1) {
-          let prodObj = newOrderProds[prodIdx];
-          const prodPrice = isExpress ? prodObj.expressPrice : prodObj.price;
-          const discountAmount = +(percentageDiscount * prodPrice).toFixed(2);
-          prodObj.discountAmount = discountAmount;
-          newOrderProds[prodIdx] = prodObj;
+      const discountProductIds = getTargetProductIdSet(discountCode.products);
+      newOrderProds = newOrderProds.map((prod: any) => {
+        if (!discountProductIds.has(getProductIdentity(prod))) {
+          return prod;
         }
-      }
+        const prodPrice = isExpress ? prod.expressPrice : prod.price;
+        const discountAmount = +(percentageDiscount * prodPrice).toFixed(2);
+        return { ...prod, discountAmount };
+      });
     }
   }
 
@@ -154,14 +227,13 @@ export const applyDiscountToProducts = (
       if (discountCode.applyToAllProducts) {
         newOrderProds = newOrderProds.map((prod: any) => ({ ...prod, discountAmount: discountAmount }));
       } else {
-        for (let discountProduct of discountCode.products) {
-          const prodIdx = newOrderProds.findIndex((prod: any) => prod._id === discountProduct);
-          if (prodIdx !== -1) {
-            let prodObj = newOrderProds[prodIdx];
-            prodObj.discountAmount = discountAmount;
-            newOrderProds[prodIdx] = prodObj;
+        const discountProductIds = getTargetProductIdSet(discountCode.products);
+        newOrderProds = newOrderProds.map((prod: any) => {
+          if (!discountProductIds.has(getProductIdentity(prod))) {
+            return prod;
           }
-        }
+          return { ...prod, discountAmount };
+        });
       }
     }
   }
@@ -171,16 +243,7 @@ export const applyDiscountToProducts = (
     const getConditions = discountCode.buyAndGetConditions[0].getConditions;
     const discountType = discountCode.buyAndGetConditions[0].getDiscountType;
     const discountValue = discountCode.buyAndGetConditions[0].discountValue;
-    let buyConditionFulfilledCounter = 0;
-
-    for (let prodCondition of buyConditions) {
-      const orderProd = productsArr.find((ordProd: any) => ordProd._id === prodCondition.buyProduct._id);
-      // Nota: Aquí solo se verifica una condición de producto
-      if (orderProd) {
-        let qty = orderProd.qty || orderProd.quantity;
-        buyConditionFulfilledCounter = Math.floor(qty / prodCondition.qty);
-      }
-    }
+    const buyConditionFulfilledCounter = getFulfillmentCount(buyConditions, productsArr);
 
     if (buyConditionFulfilledCounter) {
       for (let prodCondition of getConditions) {