washday-sdk 0.0.163 → 0.0.165

package/dist/utils/orders/calculateOrderTotal.js

@@ -9,10 +9,11 @@ export const calculateOrderTotal = (order, selectedCustomer, storeSettings, hasS
         const productTableCalculator = (storeSettings === null || storeSettings === void 0 ? void 0 : storeSettings.taxesType) === 'over_price' ? calculateTotalTaxesOverPrice : calculateTotalTaxesIncluded;
         const productTableImports = productTableCalculator(order, selectedCustomer, storeSettings, storeDiscounts, appliedOrderDiscounts, discountCodeObj);
         // PRODUCT LINE TOTALS
-        const { totalQuantity, totalImportWithDiscount, totalImportWithoutDiscount, totalImporTaxes, totalDiscountAmount } = getProductLineTotals(productTableImports);
+        const { totalQuantity, totalImportWithDiscount, totalImportWithoutDiscount, totalImporTaxes, totalDiscountAmount, totalSubtotalAmount } = getProductLineTotals(productTableImports);
         // DISCOUNT TOTAL AND SHIPPING SERVICE COST
         let discountCodeAmount = 0;
         let shippingCost = getShippingCost(discountCodeObj, hasShippingCost, storeSettings);
+        // TODO: MAYBE THIS KIND OF DISCOUNT IS WRONG BECAUSE TAXES ARE CALCULATED BEFORE THIS POINT;
         if (discountCodeObj && discountCodeObj.type === DiscountCodeTypes.NUMBER && discountCodeObj.applyOnceOnOrder) {
             const includesProducts = discountCodeObj.applyToAllProducts || order.products.some((curr) => discountCodeObj.products.includes(curr._id));
             discountCodeAmount = includesProducts ? discountCodeObj.value : 0;
@@ -21,7 +22,8 @@ export const calculateOrderTotal = (order, selectedCustomer, storeSettings, hasS
         let orderTotalWithOutCredit = +(totalImportWithDiscount + shippingCost - discountCodeAmount).toFixed(2);
         let creditApplied = getCreditApplied(selectedCustomer, orderTotalWithOutCredit);
         let orderTotal = +(orderTotalWithOutCredit - creditApplied).toFixed(2);
-        return Object.assign(Object.assign({}, order), { totalQuantity, customerDiscount: order.discountCode ? 0 : (_a = selectedCustomer === null || selectedCustomer === void 0 ? void 0 : selectedCustomer.customer) === null || _a === void 0 ? void 0 : _a.discount, productTotal: totalImportWithDiscount, taxesTotal: totalImporTaxes, total: orderTotal, creditApplied, productTotalWithoutDiscount: totalImportWithoutDiscount, totalDiscountAmount: totalDiscountAmount + discountCodeAmount, shippingServiceTotal: shippingCost, appliedOrderDiscounts });
+        return Object.assign(Object.assign({}, order), { totalQuantity, customerDiscount: order.discountCode ? 0 : (_a = selectedCustomer === null || selectedCustomer === void 0 ? void 0 : selectedCustomer.customer) === null || _a === void 0 ? void 0 : _a.discount, productTotal: totalImportWithDiscount, taxesTotal: totalImporTaxes, total: orderTotal, // Total final (ya sea sumando o no el IVA)
+            creditApplied, productTotalWithoutDiscount: totalImportWithoutDiscount, totalDiscountAmount: totalDiscountAmount + discountCodeAmount, shippingServiceTotal: shippingCost, appliedOrderDiscounts, subtotal: totalSubtotalAmount });
     }
     catch (error) {
         throw error;

package/dist/utils/orders/calculateTotalTaxesIncluded.js

@@ -58,7 +58,7 @@ export const calculateTotalTaxesIncluded = (order, selectedCustomer, storeSettin
         const productLineImportTotal = +(totalNetWithoutDiscount * taxFactor).toFixed(2);
         const productLineTotalWithDiscount = +(totalNetWithDiscount * taxFactor).toFixed(2);
         // Calculate the taxes as the difference between gross and net:
-        const totalTaxesApplied = +(productLineImportTotal - totalNetWithoutDiscount).toFixed(2);
+        const totalTaxesApplied = +(productLineTotalWithDiscount - totalNetWithDiscount).toFixed(2);
         const lineDiscount = +(discountAmountPerUnit * qty).toFixed(2);
         return {
             product: current,
@@ -66,7 +66,8 @@ export const calculateTotalTaxesIncluded = (order, selectedCustomer, storeSettin
             productLineImportTotal, // original gross total (no discount)
             productLineTotalWithDiscount, // gross total after discount on product (extra not discounted)
             productLineTaxesTotal: totalTaxesApplied,
-            lineDiscountAmount: lineDiscount
+            lineDiscountAmount: lineDiscount,
+            productLineSubtotal: totalNetWithoutDiscount // All line subtotal (extra amount considered, without discounts and taxes)
         };
     });
     return productTableImports;

package/dist/utils/orders/calculateTotalTaxesOverPrice.js

@@ -6,10 +6,10 @@ export const calculateTotalTaxesOverPrice = (order, selectedCustomer, storeSetti
         let discPercentageInteger = 0;
         let productPercentageDiscount = 0;
         let customerDiscount = 0;
-        let qty = current.qty;
-        // Precio base sin impuestos y sin extraAmount
+        const qty = current.qty; // cantidad
+        // Precio base sin impuestos (en modo over_price el precio es neto)
         const productBasePrice = order.express ? current.expressPrice : current.price;
-        // Calcular descuentos solo sobre el producto
+        // Cálculo de descuento sobre el producto (aplicable solo sobre el precio base)
         if (!order.discountCode) {
             const discountsToApply = storeDiscounts.filter((discount) => discount.products.includes(current._id) && discount.isActive);
             customerDiscount = ((_a = selectedCustomer === null || selectedCustomer === void 0 ? void 0 : selectedCustomer.customer) === null || _a === void 0 ? void 0 : _a.discount) || 0;
@@ -17,6 +17,7 @@ export const calculateTotalTaxesOverPrice = (order, selectedCustomer, storeSetti
                 return discount.type === 'percentage' ? acc + discount.value : acc;
             }, 0);
             discPercentageInteger = +((productPercentageDiscount + customerDiscount) / 100).toFixed(2);
+            discountsToApply.forEach((discount) => (appliedOrderDiscounts[discount._id] = discount));
         }
         else {
             if (discountCodeObj.type === DiscountCodeTypes.PERCENTAGE) {
@@ -34,27 +35,30 @@ export const calculateTotalTaxesOverPrice = (order, selectedCustomer, storeSetti
                 }
             }
         }
-        // Calcular descuento solo sobre el producto
+        // Calcular descuento por unidad y precio descontado
         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
+        // Subtotal para la línea (precio con descuento * cantidad + extraAmount) SIN impuestos
+        const subtotal = (discountedProductPrice * qty) + (current.extraAmount || 0);
+        // Calcular impuestos sobre el subtotal
         const taxPercentage = getProductTaxesPercentage(current, storeSettings) / 100;
         const taxes = subtotal * taxPercentage;
-        // Resultados finales
-        const totalTaxesApplied = +(taxes).toFixed(2);
+        // 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);
-        const prodLinePriceWithDiscount = +((((discountedProductPrice * qty) + current.extraAmount) * (1 + taxPercentage))).toFixed(2);
+        // Precio total con descuento, reaplicando el IVA (es el total final a cobrar)
+        const prodLinePriceWithDiscount = +((subtotal * (1 + taxPercentage))).toFixed(2);
         return {
             product: current,
             qty,
-            productLineImportTotal: (productBasePrice * qty) + current.extraAmount,
+            // Total bruto original sin descuento (precio base * cantidad + extraAmount)
+            productLineImportTotal: (productBasePrice * qty) + (current.extraAmount || 0),
+            // Total final con descuento, que se obtiene al sumar IVA al subtotal neto
             productLineTotalWithDiscount: prodLinePriceWithDiscount,
             productLineTaxesTotal: totalTaxesApplied,
-            lineDiscountAmount: lineDiscount
+            lineDiscountAmount: lineDiscount,
+            // Subtotal: precio base (neto, con descuento) sin aplicar IVA
+            productLineSubtotal: subtotal
         };
     });
     return productTableImports;

package/dist/utils/orders/helpers.js

@@ -31,12 +31,16 @@ export const getProductLineTotals = (productLinesTotals) => {
     const totalDiscountAmount = +productLinesTotals
         .reduce((acum, line) => acum + line.lineDiscountAmount, 0)
         .toFixed(2);
+    const totalSubtotalAmount = +productLinesTotals
+        .reduce((acum, line) => acum + line.productLineSubtotal, 0)
+        .toFixed(2);
     return {
         totalQuantity,
         totalImportWithDiscount,
         totalImportWithoutDiscount,
         totalImporTaxes,
-        totalDiscountAmount
+        totalDiscountAmount,
+        totalSubtotalAmount
     };
 };
 export const getShippingCost = (discountObject, requireShippingService, store) => {

package/package.json

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

package/src/interfaces/Product.ts

@@ -9,6 +9,7 @@ export interface ProductLineTotals {
     productLineTotalWithDiscount: number,
     productLineTaxesTotal: number,
     lineDiscountAmount: number
+    productLineSubtotal: number
 }
 
 

package/src/utils/orders/calculateOrderTotal.ts

@@ -24,13 +24,15 @@ export const calculateOrderTotal = (
       totalImportWithDiscount,
       totalImportWithoutDiscount,
       totalImporTaxes,
-      totalDiscountAmount
+      totalDiscountAmount,
+      totalSubtotalAmount
     } = getProductLineTotals(productTableImports);
 
     // DISCOUNT TOTAL AND SHIPPING SERVICE COST
     let discountCodeAmount = 0;
     let shippingCost = getShippingCost(discountCodeObj, hasShippingCost, storeSettings);
 
+    // TODO: MAYBE THIS KIND OF DISCOUNT IS WRONG BECAUSE TAXES ARE CALCULATED BEFORE THIS POINT;
     if (discountCodeObj && discountCodeObj.type === DiscountCodeTypes.NUMBER && discountCodeObj.applyOnceOnOrder) {
       const includesProducts = discountCodeObj.applyToAllProducts || order.products.some((curr: any) => discountCodeObj.products.includes(curr._id));
       discountCodeAmount = includesProducts ? discountCodeObj.value : 0;
@@ -45,14 +47,15 @@ export const calculateOrderTotal = (
       ...order,
       totalQuantity,
       customerDiscount: order.discountCode ? 0 : selectedCustomer?.customer?.discount,
-      productTotal: totalImportWithDiscount,
-      taxesTotal: totalImporTaxes,
-      total: orderTotal,
+      productTotal: totalImportWithDiscount, // Total neto con descuento, que luego se convierte a bruto según el método
+      taxesTotal: totalImporTaxes, // Monto de impuestos aplicado
+      total: orderTotal, // Total final (ya sea sumando o no el IVA)
       creditApplied,
-      productTotalWithoutDiscount: totalImportWithoutDiscount,
+      productTotalWithoutDiscount: totalImportWithoutDiscount, // Precio base (neto)
       totalDiscountAmount: totalDiscountAmount + discountCodeAmount,
       shippingServiceTotal: shippingCost,
-      appliedOrderDiscounts
+      appliedOrderDiscounts,
+      subtotal: totalSubtotalAmount
     };
   } catch (error) {
     throw error;

package/src/utils/orders/calculateTotalTaxesIncluded.ts

@@ -13,16 +13,16 @@ export const calculateTotalTaxesIncluded = (
     const qty = current.qty || 0;
     const taxPercentage = getProductTaxesPercentage(current, storeSettings);
     const taxFactor = 1 + taxPercentage / 100;
-    
+
     // Convert extraAmount from gross to net (assume extraAmount is not discounted)
     const extraAmountGross = current.extraAmount || 0;
     const extraAmountNet = extraAmountGross / taxFactor;
-    
+
     // Get the product’s gross price (excluding extraAmount)
     const productGrossPrice = order.express ? current.expressPrice : current.price;
     // Convert product gross price to net
     const unitNetPrice = productGrossPrice / taxFactor;
-    
+
     // Determine discount percentage (if any) – discount is applied only on product net price.
     let discPercentageInteger = 0;
     let productPercentageDiscount = 0;
@@ -54,13 +54,13 @@ export const calculateTotalTaxesIncluded = (
         }
       }
     }
-    
+
     // Calculate discount on product net price only.
     const discountAmountPerUnit = discPercentageInteger ? unitNetPrice * discPercentageInteger : 0;
     const discountedUnitNetPrice = unitNetPrice - discountAmountPerUnit;
     // Reapply VAT to get discounted product gross price.
     const discountedUnitGrossPrice = discountedUnitNetPrice * taxFactor;
-    
+
     // Now, calculate the final totals:
     // For the product part:
     const productNetTotalWithoutDiscount = unitNetPrice * qty;
@@ -68,23 +68,24 @@ export const calculateTotalTaxesIncluded = (
     // Add the extraAmount net (since it is not discounted):
     const totalNetWithoutDiscount = productNetTotalWithoutDiscount + extraAmountNet;
     const totalNetWithDiscount = productNetTotalWithDiscount + extraAmountNet;
-    
+
     // Reapply VAT to both totals:
     const productLineImportTotal = + (totalNetWithoutDiscount * taxFactor).toFixed(2);
     const productLineTotalWithDiscount = + (totalNetWithDiscount * taxFactor).toFixed(2);
-    
+
     // Calculate the taxes as the difference between gross and net:
-    const totalTaxesApplied = + (productLineImportTotal - totalNetWithoutDiscount).toFixed(2);
-    
+    const totalTaxesApplied = + (productLineTotalWithDiscount - totalNetWithDiscount).toFixed(2);
+
     const lineDiscount = + (discountAmountPerUnit * qty).toFixed(2);
-    
+
     return {
       product: current,
       qty,
       productLineImportTotal, // original gross total (no discount)
       productLineTotalWithDiscount, // gross total after discount on product (extra not discounted)
       productLineTaxesTotal: totalTaxesApplied,
-      lineDiscountAmount: lineDiscount
+      lineDiscountAmount: lineDiscount,
+      productLineSubtotal: totalNetWithoutDiscount // All line subtotal (extra amount considered, without discounts and taxes)
     };
   });
   return productTableImports;

package/src/utils/orders/calculateTotalTaxesOverPrice.ts

@@ -13,12 +13,12 @@ export const calculateTotalTaxesOverPrice = (
     let discPercentageInteger = 0;
     let productPercentageDiscount = 0;
     let customerDiscount = 0;
-    let qty = current.qty;
+    const qty = current.qty; // cantidad
 
-    // Precio base sin impuestos y sin extraAmount
+    // Precio base sin impuestos (en modo over_price el precio es neto)
     const productBasePrice = order.express ? current.expressPrice : current.price;
 
-    // Calcular descuentos solo sobre el producto
+    // Cálculo de descuento sobre el producto (aplicable solo sobre el precio base)
     if (!order.discountCode) {
       const discountsToApply = storeDiscounts.filter(
         (discount) => discount.products.includes(current._id) && discount.isActive
@@ -28,6 +28,7 @@ export const calculateTotalTaxesOverPrice = (
         return discount.type === 'percentage' ? acc + discount.value : acc;
       }, 0);
       discPercentageInteger = +((productPercentageDiscount + customerDiscount) / 100).toFixed(2);
+      discountsToApply.forEach((discount) => (appliedOrderDiscounts[discount._id] = discount));
     } else {
       if (discountCodeObj.type === DiscountCodeTypes.PERCENTAGE) {
         discPercentageInteger = +(discountCodeObj.value / 100).toFixed(2);
@@ -44,31 +45,35 @@ export const calculateTotalTaxesOverPrice = (
       }
     }
 
-    // Calcular descuento solo sobre el producto
+    // Calcular descuento por unidad y precio descontado
     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;
+    // Subtotal para la línea (precio con descuento * cantidad + extraAmount) SIN impuestos
+    const subtotal = (discountedProductPrice * qty) + (current.extraAmount || 0);
 
-    // Calcular impuestos sobre el subtotal final
+    // Calcular impuestos sobre el subtotal
     const taxPercentage = getProductTaxesPercentage(current, storeSettings) / 100;
     const taxes = subtotal * taxPercentage;
 
-    // Resultados finales
-    const totalTaxesApplied = +(taxes).toFixed(2);
+    // 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);
-    const prodLinePriceWithDiscount = +((((discountedProductPrice * qty) + current.extraAmount) * (1 + taxPercentage))).toFixed(2);
+    
+    // Precio total con descuento, reaplicando el IVA (es el total final a cobrar)
+    const prodLinePriceWithDiscount = +((subtotal * (1 + taxPercentage))).toFixed(2);
 
     return {
       product: current,
       qty,
-      productLineImportTotal: (productBasePrice * qty) + current.extraAmount,
+      // Total bruto original sin descuento (precio base * cantidad + extraAmount)
+      productLineImportTotal: (productBasePrice * qty) + (current.extraAmount || 0),
+      // Total final con descuento, que se obtiene al sumar IVA al subtotal neto
       productLineTotalWithDiscount: prodLinePriceWithDiscount,
       productLineTaxesTotal: totalTaxesApplied,
-      lineDiscountAmount: lineDiscount
+      lineDiscountAmount: lineDiscount,
+      // Subtotal: precio base (neto, con descuento) sin aplicar IVA
+      productLineSubtotal: subtotal
     };
   });
   return productTableImports;

package/src/utils/orders/helpers.ts

@@ -4,70 +4,74 @@ import { IOrderProduct, ProductLineTotals } from "../../interfaces/Product";
 import { IStore, ITaxConfig } from "../../interfaces/Store";
 
 export const getProductTaxesPercentage = (productObj: IOrderProduct, store: IStore): number => {
-    const getTaxValue = (tax: ITaxConfig | null | undefined, isTaxExempt: boolean): number => {
-        if (!tax) {
-            // If no store tax configured, always return 0
-            return 0;
-        }
+  const getTaxValue = (tax: ITaxConfig | null | undefined, isTaxExempt: boolean): number => {
+    if (!tax) {
+      // If no store tax configured, always return 0
+      return 0;
+    }
 
-        if (isTaxExempt) {
-            // If store tax is configured and taxExempt is true, return 0
-            return 0;
-        }
+    if (isTaxExempt) {
+      // If store tax is configured and taxExempt is true, return 0
+      return 0;
+    }
 
-        // If store tax configured and taxExempt is false, return store tax
-        return tax.value;
-    };
+    // If store tax configured and taxExempt is false, return store tax
+    return tax.value;
+  };
 
-    const tax1 = getTaxValue(store.taxOne, productObj.taxExemptOne);
-    const tax2 = getTaxValue(store.taxTwo, productObj.taxExemptTwo);
-    const tax3 = getTaxValue(store.taxThree, productObj.taxExemptThree);
+  const tax1 = getTaxValue(store.taxOne, productObj.taxExemptOne);
+  const tax2 = getTaxValue(store.taxTwo, productObj.taxExemptTwo);
+  const tax3 = getTaxValue(store.taxThree, productObj.taxExemptThree);
 
-    return tax1 + tax2 + tax3;
+  return tax1 + tax2 + tax3;
 };
 
 export const getProductLineTotals = (productLinesTotals: ProductLineTotals[]) => {
-    const totalQuantity = +productLinesTotals.reduce((acum, line) => acum + line.qty, 0).toFixed(2);
-    const totalImportWithDiscount = +productLinesTotals
-        .reduce((acum, line) => acum + line.productLineTotalWithDiscount, 0)
-        .toFixed(2);
-    const totalImportWithoutDiscount = +productLinesTotals
-        .reduce((acum, line) => acum + line.productLineImportTotal, 0)
-        .toFixed(2);
-    const totalImporTaxes = +productLinesTotals
-        .reduce((acum, line) => acum + line.productLineTaxesTotal, 0)
-        .toFixed(2);
-    const totalDiscountAmount = +productLinesTotals
-        .reduce((acum, line) => acum + line.lineDiscountAmount, 0)
-        .toFixed(2);
-
-    return {
-        totalQuantity,
-        totalImportWithDiscount,
-        totalImportWithoutDiscount,
-        totalImporTaxes,
-        totalDiscountAmount
-    };
+  const totalQuantity = +productLinesTotals.reduce((acum, line) => acum + line.qty, 0).toFixed(2);
+  const totalImportWithDiscount = +productLinesTotals
+    .reduce((acum, line) => acum + line.productLineTotalWithDiscount, 0)
+    .toFixed(2);
+  const totalImportWithoutDiscount = +productLinesTotals
+    .reduce((acum, line) => acum + line.productLineImportTotal, 0)
+    .toFixed(2);
+  const totalImporTaxes = +productLinesTotals
+    .reduce((acum, line) => acum + line.productLineTaxesTotal, 0)
+    .toFixed(2);
+  const totalDiscountAmount = +productLinesTotals
+    .reduce((acum, line) => acum + line.lineDiscountAmount, 0)
+    .toFixed(2);
+  const totalSubtotalAmount = +productLinesTotals
+    .reduce((acum, line) => acum + line.productLineSubtotal, 0)
+    .toFixed(2);
+
+  return {
+    totalQuantity,
+    totalImportWithDiscount,
+    totalImportWithoutDiscount,
+    totalImporTaxes,
+    totalDiscountAmount,
+    totalSubtotalAmount
+  };
 };
 
 export const getShippingCost = (discountObject: any, requireShippingService: boolean, store: IStore): number => {
-    const shippingCost = requireShippingService ? store?.orderPageConfig?.shippingServiceCost ?? 0 : 0;
+  const shippingCost = requireShippingService ? store?.orderPageConfig?.shippingServiceCost ?? 0 : 0;
 
-    if (discountObject?.type === DiscountCodeTypes.FREE_DELIVERY) {
-        return 0;
-    }
+  if (discountObject?.type === DiscountCodeTypes.FREE_DELIVERY) {
+    return 0;
+  }
 
-    return shippingCost;
+  return shippingCost;
 };
 
 export const getCreditApplied = (selectedCustomer: { customer: ICustomer } | undefined, orderTotal: number): number => {
-    const customerCredit = selectedCustomer?.customer?.credit ?? 0;
+  const customerCredit = selectedCustomer?.customer?.credit ?? 0;
 
-    if (customerCredit === 0 || !selectedCustomer) {
-        return 0;
-    }
+  if (customerCredit === 0 || !selectedCustomer) {
+    return 0;
+  }
 
-    return Math.min(customerCredit, orderTotal);
+  return Math.min(customerCredit, orderTotal);
 };
 
 export const applyDiscountToProducts = (