washday-sdk 0.0.159 → 0.0.161

package/src/utils/orders/calculateTotalTaxesOverPrice.ts

@@ -14,27 +14,20 @@ export const calculateTotalTaxesOverPrice = (
     let productPercentageDiscount = 0;
     let customerDiscount = 0;
     let qty = current.qty;
-    // extraAmount es en general sin importar el qty, entonces aqui lo repartimos por igual
-    const extraAmountPerUnit = current.extraAmount / qty;
-    const prodPrice = (order.express ? current.expressPrice : current.price) + extraAmountPerUnit;
 
+    // Precio base sin impuestos y sin extraAmount
+    const productBasePrice = order.express ? current.expressPrice : current.price;
+
+    // Calcular descuentos solo sobre el producto
     if (!order.discountCode) {
-      //IF ORDER HAS A DISCOUNT CODE WE DON'T APPLY ANY OTHER DISCOUNT (AUTOMATICALLY OR CUSTOMER DISCOUNT)
-      //THIS WILL GET THE DISCOUNTS OF THE CURRENT PRODUCT
-      // get store discounts if product applies and customer discount
       const discountsToApply = storeDiscounts.filter(
         (discount) => discount.products.includes(current._id) && discount.isActive
       );
       customerDiscount = selectedCustomer?.customer?.discount || 0;
-      productPercentageDiscount = discountsToApply.reduce((prev, next) => {
-        if (next.type === 'percentage') {
-          // for now we just sum percetange type discounts
-          return prev + next.value;
-        }
-        return prev;
+      productPercentageDiscount = discountsToApply.reduce((acc, discount) => {
+        return discount.type === 'percentage' ? acc + discount.value : acc;
       }, 0);
       discPercentageInteger = +((productPercentageDiscount + customerDiscount) / 100).toFixed(2);
-      discountsToApply.forEach((discount) => (appliedOrderDiscounts[discount._id] = discount)); // it will do this for every product, if two products has the same discount it will just overwrite
     } else {
       if (discountCodeObj.type === DiscountCodeTypes.PERCENTAGE) {
         discPercentageInteger = +(discountCodeObj.value / 100).toFixed(2);
@@ -43,39 +36,39 @@ export const calculateTotalTaxesOverPrice = (
             ? +(discountCodeObj.value / 100).toFixed(2)
             : 0;
         }
-      }
-      if (discountCodeObj.type === DiscountCodeTypes.BUY_X_GET_Y) {
-        const discountType = discountCodeObj.buyAndGetConditions[0].getDiscountType;
-        const discountValue = discountCodeObj.buyAndGetConditions[0].discountValue;
-        if (discountType === BuyAndGetConditionsTypes.PERCENTAGE && current.isBuyAndGetProduct) {
-          discPercentageInteger = +(discountValue / 100).toFixed(2);
+      } else if (discountCodeObj.type === DiscountCodeTypes.BUY_X_GET_Y) {
+        const condition = discountCodeObj.buyAndGetConditions[0];
+        if (condition.getDiscountType === BuyAndGetConditionsTypes.PERCENTAGE && current.isBuyAndGetProduct) {
+          discPercentageInteger = +(condition.discountValue / 100).toFixed(2);
         }
       }
     }
 
-    //GET DISCOUNT AMOUNT (IN CASE discPercentageInteger is 0 it could be a discount of a integer number)
-    const discountAmountPerUnit = discPercentageInteger
-      ? prodPrice * discPercentageInteger
-      : (current.discountAmount || 0);
-    //GET PRODUCT PRICE WITH DISCOUNT
-    const prodPriceWithDiscountPerUnit = prodPrice - discountAmountPerUnit;
-    //GET PRODUCT TAXES APPLIED TO FINAL PRICE PER UNIT
-    const taxPercentage = getProductTaxesPercentage(current, storeSettings);
-    const taxPercentageInteger = taxPercentage / 100;
-    const prodPriceWithoutTaxesPerUnit = prodPriceWithDiscountPerUnit;
-    const taxesAmountPerUnit = prodPriceWithoutTaxesPerUnit * taxPercentageInteger;
-    const totalTaxesApplied = +(taxesAmountPerUnit * qty).toFixed(2);
-    let lineDiscount = qty * discountAmountPerUnit;
-    let prodLinePriceWithDiscount = +(qty * prodPriceWithDiscountPerUnit).toFixed(2);
+    // Calcular descuento solo sobre el producto
+    const productDiscount = productBasePrice * discPercentageInteger;
+    const discountedProductPrice = productBasePrice - productDiscount;
+
+    // Calcular subtotal: se aplica el descuento al producto, y luego se suma el extraAmount (que se cobra completo)
+    const subtotal = (discountedProductPrice * qty) + current.extraAmount;
+
+    // Calcular impuestos sobre el subtotal final
+    const taxPercentage = getProductTaxesPercentage(current, storeSettings) / 100;
+    const taxes = subtotal * taxPercentage;
+
+    // Resultados finales
+    const totalTaxesApplied = +(taxes).toFixed(2);
+    const lineDiscount = +(productDiscount * qty).toFixed(2);
+    // Se suma el extraAmount a la parte del producto descontado para obtener el valor total a cobrar de la línea
+    const prodLinePriceWithDiscount = +(((discountedProductPrice * qty) + current.extraAmount)).toFixed(2);
 
     return {
       product: current,
-      qty: qty,
-      productLineImportTotal: prodPrice * qty, //this is line without discount
+      qty,
+      productLineImportTotal: (productBasePrice * qty) + current.extraAmount,
       productLineTotalWithDiscount: prodLinePriceWithDiscount,
       productLineTaxesTotal: totalTaxesApplied,
       lineDiscountAmount: lineDiscount
     };
   });
   return productTableImports;
-};
+};

package/src/utils/orders/helpers.ts

@@ -71,156 +71,140 @@ export const getCreditApplied = (selectedCustomer: { customer: ICustomer } | und
 };
 
 export const applyDiscountToProducts = (
-    discountCode: {
-        freeProductSetting: any;
-        products: any;
-        value: number;
-        type: string;
-        applyToAllProducts: boolean;
-        applyOnceOnOrder: boolean;
-        buyAndGetConditions: any,
-    },
-    productsArr: any,
-    isExpress: boolean,
-    storeDiscounts: any = [],
-    selectedCustomer = { discount: 0 }
+  discountCode: {
+    freeProductSetting: any;
+    products: any;
+    value: number;
+    type: string;
+    applyToAllProducts: boolean;
+    applyOnceOnOrder: boolean;
+    buyAndGetConditions: any,
+  },
+  productsArr: any,
+  isExpress: boolean,
+  storeDiscounts: any = [],
+  selectedCustomer = { discount: 0 }
 ) => {
-    if (!discountCode) {
-        ///WE NEED TO APPLY DISCOUNT IN CASE WE HAVE AUTOMATIC DISCOUNT APPLIED
-        return {
-            newOrderProds: productsArr.map((prod: any) => {
-                const discountsToApply = storeDiscounts.filter(
-                    (discount: any) => discount.products.includes(prod._id) && discount.isActive
-                );
-                const customerDiscount = selectedCustomer?.discount / 100 || 0;
-                const productPercentageDiscount = discountsToApply.reduce((prev: number, next: any) => {
-                    if (next.type === 'percentage') {
-                        // for now we just sum percetange type discounts
-                        return prev + next.value / 100;
-                    }
-                    return prev;
-                }, 0);
-                const prodPrice = isExpress ? prod.expressPrice : prod.price;
-                const extraAmountPerUnit = prod.extraAmount / prod.qty || 0;
-                const discountAmount = +(
-                    (productPercentageDiscount + customerDiscount) *
-                    (prodPrice + extraAmountPerUnit)
-                ).toFixed(2);
-                return { ...prod, discountAmount: discountAmount };
-            }),
-            buyAndGetProds: []
-        };
-    }
-
-    //RESTART PRODUCTS ARR DISCOUNTS
-    let newOrderProds = productsArr.map((prod: any) => {
-        return { ...prod, discountAmount: 0 };
-    });
-
-    //THIS ARRAY ALSO INCLUDES PRODUCTS OF FREE_ITEM discount code type
-    const buyAndGetProds = [];
-    if (discountCode && discountCode.type === DiscountCodeTypes.PERCENTAGE) {
-        const percentageDiscount = discountCode.value / 100;
-        if (discountCode.applyToAllProducts) {
-            newOrderProds = newOrderProds.map((prod: any) => {
-                const prodPrice = isExpress ? prod.expressPrice : prod.price;
-                const extraAmountPerUnit = prod.extraAmount / prod.qty || 0;
-                const discountAmount = +(percentageDiscount * (prodPrice + extraAmountPerUnit)).toFixed(2);
-                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 extraAmountPerUnit = prodObj.extraAmount / prodObj.qty || 0;
-                    const discountAmount = +(percentageDiscount * (prodPrice + extraAmountPerUnit)).toFixed(
-                        2
-                    );
-                    prodObj.discountAmount = discountAmount;
-                    newOrderProds[prodIdx] = prodObj;
-                }
-            }
+  if (!discountCode) {
+    // Caso sin discountCode: se aplican descuentos automáticos solo sobre el precio del producto
+    return {
+      newOrderProds: productsArr.map((prod: any) => {
+        const discountsToApply = storeDiscounts.filter(
+          (discount: any) => discount.products.includes(prod._id) && discount.isActive
+        );
+        const customerDiscount = selectedCustomer?.discount / 100 || 0;
+        const productPercentageDiscount = discountsToApply.reduce((prev: number, next: any) => {
+          if (next.type === 'percentage') {
+            return prev + next.value / 100;
+          }
+          return prev;
+        }, 0);
+        const prodPrice = isExpress ? prod.expressPrice : prod.price;
+        // Se remueve el extraAmountPerUnit para que el descuento se aplique solo sobre prodPrice
+        const discountAmount = +((productPercentageDiscount + customerDiscount) * prodPrice).toFixed(2);
+        return { ...prod, discountAmount: discountAmount };
+      }),
+      buyAndGetProds: []
+    };
+  }
+
+  // Reiniciar los descuentos en los productos
+  let newOrderProds = productsArr.map((prod: any) => ({ ...prod, discountAmount: 0 }));
+
+  // Array para productos de descuento BUY_X_GET_Y o FREE_ITEM
+  const buyAndGetProds = [];
+
+  if (discountCode && discountCode.type === DiscountCodeTypes.PERCENTAGE) {
+    const percentageDiscount = discountCode.value / 100;
+    if (discountCode.applyToAllProducts) {
+      newOrderProds = newOrderProds.map((prod: any) => {
+        const prodPrice = isExpress ? prod.expressPrice : prod.price;
+        // Aplica descuento solo sobre prodPrice (no se incluye extraAmountPerUnit)
+        const discountAmount = +(percentageDiscount * prodPrice).toFixed(2);
+        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;
         }
+      }
     }
-    if (discountCode && discountCode.type === DiscountCodeTypes.NUMBER) {
-        const discountAmount = discountCode.value;
-        if (!discountCode.applyOnceOnOrder) {
-            if (discountCode.applyToAllProducts) {
-                newOrderProds = newOrderProds.map((prod: any) => {
-                    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];
-                        prodObj.discountAmount = discountAmount;
-                        newOrderProds[prodIdx] = prodObj;
-                    }
-                }
-            }
+  }
+
+  if (discountCode && discountCode.type === DiscountCodeTypes.NUMBER) {
+    const discountAmount = discountCode.value;
+    if (!discountCode.applyOnceOnOrder) {
+      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;
+          }
         }
+      }
+    }
+  }
+
+  if (discountCode.buyAndGetConditions && discountCode.type === DiscountCodeTypes.BUY_X_GET_Y) {
+    const buyConditions = discountCode.buyAndGetConditions[0].buyConditions;
+    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);
+      }
     }
-    if (discountCode.buyAndGetConditions && discountCode.type === DiscountCodeTypes.BUY_X_GET_Y) {
-        const buyConditions = discountCode.buyAndGetConditions[0].buyConditions;
-        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);
-            //TODO : IN CASE WE HAVE MORE PRODUCT CONDITIONS, THIS WON'T WORK SINCE THIS LINE JUST CHECKS  1 PRODUCT CONDITION
-            if (orderProd) {
-                let qty = orderProd.qty || orderProd.quantity;
-                buyConditionFulfilledCounter = Math.floor(qty / prodCondition.qty);
-            }
-        }
 
-        if (buyConditionFulfilledCounter) {
-            for (let prodCondition of getConditions) {
-                //HERE WE SHOULD GET PROD PRICE MAYBE VERIFY IF IS PERCENTAGE AND TAXES ARE INCLUDED IN PRICE, WE SHOULD GET PRODUCT WITHOUT TAXES;
-                const prodPrice = isExpress
-                    ? prodCondition.getProduct.expressPrice
-                    : prodCondition.getProduct.price;
-                const extraAmountPerUnit =
-                    prodCondition.getProduct?.extraAmount / prodCondition.getProduct?.qty || 0 || 0;
-                const percentageDiscount = discountValue / 100;
-                const discountAmount =
-                    discountType === BuyAndGetConditionsTypes.FREE
-                        ? prodPrice + extraAmountPerUnit
-                        : +(percentageDiscount * (prodPrice + extraAmountPerUnit)).toFixed(2);
-                buyAndGetProds.push({
-                    ...prodCondition.getProduct,
-                    qty: buyConditionFulfilledCounter * prodCondition.qty,
-                    quantity: buyConditionFulfilledCounter * prodCondition.qty,
-                    discountAmount: discountAmount,
-                    isBuyAndGetProduct: true
-                });
-            }
-        }
-    } else if (discountCode.type === DiscountCodeTypes.FREE_ITEM) {
-        const freeProductsSettinggs = discountCode.freeProductSetting[0];
-        const freeProduct = freeProductsSettinggs.product;
-        const prodPrice = isExpress ? freeProduct.expressPrice : freeProduct.price;
-        const extraAmountPerUnit = freeProduct.extraAmount / freeProduct.qty || 0 || 0;
-        const discountAmount = prodPrice + extraAmountPerUnit;
+    if (buyConditionFulfilledCounter) {
+      for (let prodCondition of getConditions) {
+        // Se utiliza solo el precio del producto (sin extraAmount) para calcular el descuento
+        const prodPrice = isExpress
+          ? prodCondition.getProduct.expressPrice
+          : prodCondition.getProduct.price;
+        const percentageDiscount = discountValue / 100;
+        const discountAmount =
+          discountType === BuyAndGetConditionsTypes.FREE
+            ? prodPrice
+            : +(percentageDiscount * prodPrice).toFixed(2);
         buyAndGetProds.push({
-            ...freeProduct,
-            qty: freeProductsSettinggs.qty,
-            quantity: freeProductsSettinggs.qty,
-            discountAmount: discountAmount,
-            isBuyAndGetProduct: true, //we might use it in this kind of discounts?
-            isFreeItem: true //we dont' really use this attribute at the moment
+          ...prodCondition.getProduct,
+          qty: buyConditionFulfilledCounter * prodCondition.qty,
+          quantity: buyConditionFulfilledCounter * prodCondition.qty,
+          discountAmount: discountAmount,
+          isBuyAndGetProduct: true
         });
+      }
     }
-    return { newOrderProds, buyAndGetProds };
-};
+  } else if (discountCode.type === DiscountCodeTypes.FREE_ITEM) {
+    const freeProductsSettinggs = discountCode.freeProductSetting[0];
+    const freeProduct = freeProductsSettinggs.product;
+    const prodPrice = isExpress ? freeProduct.expressPrice : freeProduct.price;
+    // Para free item, se asume que el producto es gratuito, es decir, se descuenta el precio del producto
+    const discountAmount = prodPrice;
+    buyAndGetProds.push({
+      ...freeProduct,
+      qty: freeProductsSettinggs.qty,
+      quantity: freeProductsSettinggs.qty,
+      discountAmount: discountAmount,
+      isBuyAndGetProduct: true,
+      isFreeItem: true
+    });
+  }
+  return { newOrderProds, buyAndGetProds };
+};