washday-sdk 0.0.194 → 0.0.196

package/dist/utils/orders/calculateOrderTotal.js

@@ -2,28 +2,39 @@ import { DiscountCodeTypes } from "../../enum";
 import { calculateTotalTaxesIncluded } from "./calculateTotalTaxesIncluded";
 import { calculateTotalTaxesOverPrice } from "./calculateTotalTaxesOverPrice";
 import { getCreditApplied, getProductLineTotals, getShippingCost } from "./helpers";
-export const calculateOrderTotal = (order, selectedCustomer, storeSettings, hasShippingCost, storeDiscounts = [], discountCodeObj) => {
+export const calculateOrderTotal = (order, selectedCustomer, storeSettings, hasShippingCost, storeDiscounts = [], discountCodeObj, redeemPointsDiscount = 0 // 💡 NUEVO parámetro
+) => {
     var _a;
     try {
         const appliedOrderDiscounts = {};
-        const productTableCalculator = (storeSettings === null || storeSettings === void 0 ? void 0 : storeSettings.taxesType) === 'over_price' ? calculateTotalTaxesOverPrice : calculateTotalTaxesIncluded;
+        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
+        // === PRODUCT LINE TOTALS ===
         const { totalQuantity, totalImportWithDiscount, totalImportWithoutDiscount, totalImporTaxes, totalDiscountAmount, totalSubtotalAmount } = getProductLineTotals(productTableImports);
-        // DISCOUNT TOTAL AND SHIPPING SERVICE COST
+        // === DISCOUNT CODE (monetario tipo NUMBER que se aplica una sola vez) ===
         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));
+        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;
         }
-        // ORDER TOTAL CALCULATION AND CREDIT APPLIED
-        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, // Total final (ya sea sumando o no el IVA)
-            creditApplied, productTotalWithoutDiscount: totalImportWithoutDiscount, totalDiscountAmount: totalDiscountAmount + discountCodeAmount, shippingServiceTotal: shippingCost, appliedOrderDiscounts, subtotal: totalSubtotalAmount });
+        // === SHIPPING COST ===
+        const shippingCost = getShippingCost(discountCodeObj, hasShippingCost, storeSettings);
+        // === TOTAL ANTES DE CRÉDITOS/PUNTOS ===
+        const orderTotalWithOutCredit = +(totalImportWithDiscount +
+            shippingCost -
+            discountCodeAmount).toFixed(2);
+        // === APLICAR CRÉDITO Y PUNTOS REDIMIDOS ===
+        const creditApplied = getCreditApplied(selectedCustomer, orderTotalWithOutCredit);
+        const orderTotal = +(orderTotalWithOutCredit -
+            creditApplied -
+            redeemPointsDiscount).toFixed(2);
+        // === RETURN FINAL OBJECT ===
+        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, redeemPointsApplied: redeemPointsDiscount, productTotalWithoutDiscount: totalImportWithoutDiscount, totalDiscountAmount: totalDiscountAmount + discountCodeAmount, shippingServiceTotal: shippingCost, appliedOrderDiscounts, subtotal: totalSubtotalAmount });
     }
     catch (error) {
         throw error;

package/dist/utils/orders/calculateTotalTaxesIncluded.js

@@ -1,3 +1,4 @@
+import { DiscountCodeTypes } from "../../enum";
 import { getProductTaxesPercentage } from "./helpers";
 export const calculateTotalTaxesIncluded = (order, selectedCustomer, storeSettings, storeDiscounts, appliedOrderDiscounts, discountCodeObj) => {
     const productTableImports = [...order.products, ...order.buyAndGetProducts].map((current) => {
@@ -52,6 +53,9 @@ export const calculateTotalTaxesIncluded = (order, selectedCustomer, storeSettin
                     discPercentageInteger = 1;
                 }
             }
+            else if (discountCodeObj.type === DiscountCodeTypes.FREE_ITEM && (current.isFreeItem)) {
+                discPercentageInteger = 1;
+            }
         }
         // === NUEVO: Aplicar descuento sobre el precio total ajustado (producto base + extra prorrateado) ===
         // Si hay cantidad, repartir el extra neto entre cada unidad

package/dist/utils/orders/calculateTotalTaxesOverPrice.js

@@ -51,6 +51,9 @@ export const calculateTotalTaxesOverPrice = (order, selectedCustomer, storeSetti
                     discPercentageInteger = 1;
                 }
             }
+            else if (discountCodeObj.type === DiscountCodeTypes.FREE_ITEM && current.isFreeItem) {
+                discPercentageInteger = 1;
+            }
         }
         // Calcular el descuento por unidad sobre el precio ajustado
         const productDiscount = adjustedPrice * discPercentageInteger;

package/package.json

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

package/src/utils/orders/calculateOrderTotal.ts

@@ -11,14 +11,27 @@ export const calculateOrderTotal = (
   storeSettings: IStore,
   hasShippingCost: boolean,
   storeDiscounts: any[] = [],
-  discountCodeObj: any
+  discountCodeObj: any,
+  redeemPointsDiscount: number = 0 // 💡 NUEVO parámetro
 ): any => {
   try {
     const appliedOrderDiscounts: any = {};
-    const productTableCalculator = storeSettings?.taxesType === 'over_price' ? calculateTotalTaxesOverPrice : calculateTotalTaxesIncluded;
-    const productTableImports = productTableCalculator(order, selectedCustomer, storeSettings, storeDiscounts, appliedOrderDiscounts, discountCodeObj);
 
-    // PRODUCT LINE TOTALS
+    const productTableCalculator =
+      storeSettings?.taxesType === 'over_price'
+        ? calculateTotalTaxesOverPrice
+        : calculateTotalTaxesIncluded;
+
+    const productTableImports = productTableCalculator(
+      order,
+      selectedCustomer,
+      storeSettings,
+      storeDiscounts,
+      appliedOrderDiscounts,
+      discountCodeObj
+    );
+
+    // === PRODUCT LINE TOTALS ===
     const {
       totalQuantity,
       totalImportWithDiscount,
@@ -28,30 +41,59 @@ export const calculateOrderTotal = (
       totalSubtotalAmount
     } = getProductLineTotals(productTableImports);
 
-    // DISCOUNT TOTAL AND SHIPPING SERVICE COST
+    // === DISCOUNT CODE (monetario tipo NUMBER que se aplica una sola vez) ===
     let discountCodeAmount = 0;
-    let shippingCost = getShippingCost(discountCodeObj, hasShippingCost, storeSettings);
+    if (
+      discountCodeObj &&
+      discountCodeObj.type === DiscountCodeTypes.NUMBER &&
+      discountCodeObj.applyOnceOnOrder
+    ) {
+      const includesProducts =
+        discountCodeObj.applyToAllProducts ||
+        order.products.some((curr: any) =>
+          discountCodeObj.products.includes(curr._id)
+        );
 
-    // 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;
     }
 
-    // ORDER TOTAL CALCULATION AND CREDIT APPLIED
-    let orderTotalWithOutCredit = +(totalImportWithDiscount + shippingCost - discountCodeAmount).toFixed(2);
-    let creditApplied = getCreditApplied(selectedCustomer, orderTotalWithOutCredit);
-    let orderTotal = +(orderTotalWithOutCredit - creditApplied).toFixed(2);
+    // === SHIPPING COST ===
+    const shippingCost = getShippingCost(
+      discountCodeObj,
+      hasShippingCost,
+      storeSettings
+    );
+
+    // === TOTAL ANTES DE CRÉDITOS/PUNTOS ===
+    const orderTotalWithOutCredit = +(
+      totalImportWithDiscount +
+      shippingCost -
+      discountCodeAmount
+    ).toFixed(2);
+
+    // === APLICAR CRÉDITO Y PUNTOS REDIMIDOS ===
+    const creditApplied = getCreditApplied(
+      selectedCustomer,
+      orderTotalWithOutCredit
+    );
+
+    const orderTotal = +(
+      orderTotalWithOutCredit -
+      creditApplied -
+      redeemPointsDiscount
+    ).toFixed(2);
 
+    // === RETURN FINAL OBJECT ===
     return {
       ...order,
       totalQuantity,
       customerDiscount: order.discountCode ? 0 : selectedCustomer?.customer?.discount,
-      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)
+      productTotal: totalImportWithDiscount,
+      taxesTotal: totalImporTaxes,
+      total: orderTotal,
       creditApplied,
-      productTotalWithoutDiscount: totalImportWithoutDiscount, // Precio base (neto)
+      redeemPointsApplied: redeemPointsDiscount, // ✅ NUEVO CAMPO
+      productTotalWithoutDiscount: totalImportWithoutDiscount,
       totalDiscountAmount: totalDiscountAmount + discountCodeAmount,
       shippingServiceTotal: shippingCost,
       appliedOrderDiscounts,
@@ -60,4 +102,4 @@ export const calculateOrderTotal = (
   } catch (error) {
     throw error;
   }
-};
+};

package/src/utils/orders/calculateTotalTaxesIncluded.ts

@@ -1,3 +1,4 @@
+import { DiscountCodeTypes } from "../../enum";
 import { IOrderProduct } from "../../interfaces/Product";
 import { getProductTaxesPercentage } from "./helpers";
 
@@ -62,6 +63,8 @@ export const calculateTotalTaxesIncluded = (
         if (discountType === 'free' && current.isBuyAndGetProduct) {
           discPercentageInteger = 1;
         }
+      } else if (discountCodeObj.type === DiscountCodeTypes.FREE_ITEM && ((current as any).isFreeItem)) {
+        discPercentageInteger = 1;
       }
     }
 

package/src/utils/orders/calculateTotalTaxesOverPrice.ts

@@ -29,9 +29,9 @@ export const calculateTotalTaxesOverPrice = (
     if (!order.discountCode) {
       const discountsToApply = storeDiscounts.filter(
         (discount: any) => discount.isActive && discount.products.some((p: any) => {
-          if(typeof p === 'string') {
+          if (typeof p === 'string') {
             return p === current._id
-          } else if(typeof p === 'object') {
+          } else if (typeof p === 'object') {
             return p._id === current._id
           }
           return false
@@ -59,6 +59,8 @@ export const calculateTotalTaxesOverPrice = (
         if (condition.getDiscountType === BuyAndGetConditionsTypes.FREE && current.isBuyAndGetProduct) {
           discPercentageInteger = 1;
         }
+      } else if (discountCodeObj.type === DiscountCodeTypes.FREE_ITEM && current.isFreeItem) {
+        discPercentageInteger = 1;
       }
     }