washday-sdk 0.0.193 → 0.0.195

package/dist/api/index.js

@@ -124,6 +124,7 @@ const WashdayClient = function WashdayClient(apiToken) {
         createOrderUsersApp: ordersEndpoints.postModule.createOrderUsersApp,
         bulkCreatePaymentLines: ordersEndpoints.postModule.bulkCreatePaymentLines,
         createOrderEvidence: ordersEndpoints.postModule.createOrderEvidence,
+        getRedeemPointsPreview: ordersEndpoints.postModule.getRedeemPointsPreview,
         deletePaymentLineById: ordersEndpoints.deleteModule.deletePaymentLineById,
         getListCustomersApp: ordersEndpoints.getModule.getListCustomersApp,
         getByIdCustomersApp: ordersEndpoints.getModule.getByIdCustomersApp,

package/dist/api/order/post.js

@@ -99,3 +99,17 @@ export const createOrderEvidence = function (orderId, data) {
         }
     });
 };
+export const getRedeemPointsPreview = function (data) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const config = {
+                headers: { Authorization: `Bearer ${this.apiToken}` }
+            };
+            return yield axiosInstance.post(`${GET_SET_ORDER}/redeemPointsPreview`, data, config);
+        }
+        catch (error) {
+            console.error('Error fetching getRedeemPointsPreview:', error);
+            throw error;
+        }
+    });
+};

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/package.json

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

package/src/api/index.ts

@@ -131,6 +131,7 @@ const WashdayClient: WashdayClientConstructor = function WashdayClient(this: Was
         createOrderUsersApp: ordersEndpoints.postModule.createOrderUsersApp,
         bulkCreatePaymentLines: ordersEndpoints.postModule.bulkCreatePaymentLines,
         createOrderEvidence: ordersEndpoints.postModule.createOrderEvidence,
+        getRedeemPointsPreview: ordersEndpoints.postModule.getRedeemPointsPreview,
         deletePaymentLineById: ordersEndpoints.deleteModule.deletePaymentLineById,
         getListCustomersApp: ordersEndpoints.getModule.getListCustomersApp,
         getByIdCustomersApp: ordersEndpoints.getModule.getByIdCustomersApp,

package/src/api/order/post.ts

@@ -97,4 +97,20 @@ export const createOrderEvidence = async function (this: WashdayClientInstance,
         console.error('Error fetching createOrderEvidence:', error);
         throw error;
     }
+};
+
+export const getRedeemPointsPreview = async function (this: WashdayClientInstance, data: {
+    customerId: string;
+    storeId: string;
+    orderTotal: number;
+}): Promise<any> {
+    try {
+        const config = {
+            headers: { Authorization: `Bearer ${this.apiToken}` }
+        };
+        return await axiosInstance.post(`${GET_SET_ORDER}/redeemPointsPreview`, data, config);
+    } catch (error) {
+        console.error('Error fetching getRedeemPointsPreview:', error);
+        throw error;
+    }
 };

package/src/interfaces/Api.ts

@@ -116,6 +116,7 @@ export interface WashdayClientInstance {
         createOrderUsersApp: typeof ordersEndpoints.postModule.createOrderUsersApp,
         bulkCreatePaymentLines: typeof ordersEndpoints.postModule.bulkCreatePaymentLines,
         createOrderEvidence: typeof ordersEndpoints.postModule.createOrderEvidence,
+        getRedeemPointsPreview: typeof ordersEndpoints.postModule.getRedeemPointsPreview,
         deletePaymentLineById: typeof ordersEndpoints.deleteModule.deletePaymentLineById;
         getListCustomersApp: typeof ordersEndpoints.getModule.getListCustomersApp;
         getByIdCustomersApp: typeof ordersEndpoints.getModule.getByIdCustomersApp;

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;
   }
-};
+};