washday-sdk 1.0.2 → 1.1.0

package/dist/api/supplies/get.js

@@ -0,0 +1,62 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import axiosInstance from "../axiosInstance";
+const GET_SET_SUPPLY = (storeId) => `api/store/${storeId}/supply`;
+export const getSupplies = function (storeId, queryParams) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const config = {
+                headers: { Authorization: `Bearer ${this.apiToken}` }
+            };
+            const response = yield axiosInstance.get(`${GET_SET_SUPPLY(storeId)}?${queryParams}`, config);
+            return response;
+        }
+        catch (error) {
+            console.error('Error fetching getSupplies:', error);
+            throw error;
+        }
+    });
+};
+export const getSupplyById = function (storeId, id) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const config = {
+                headers: { Authorization: `Bearer ${this.apiToken}` }
+            };
+            return yield axiosInstance.get(`${GET_SET_SUPPLY(storeId)}/${id}`, config);
+        }
+        catch (error) {
+            console.error('Error fetching getStoreSupplyById:', error);
+            throw error;
+        }
+    });
+};
+export const getSupplyHistory = function (storeId, id, params) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const config = {
+                headers: { Authorization: `Bearer ${this.apiToken}` }
+            };
+            let queryParams = '';
+            if (params === null || params === void 0 ? void 0 : params.hasOwnProperty('pageNum')) {
+                queryParams += `pageNum=${params === null || params === void 0 ? void 0 : params.pageNum}`;
+            }
+            if (params === null || params === void 0 ? void 0 : params.hasOwnProperty('limit')) {
+                queryParams += `&limit=${params === null || params === void 0 ? void 0 : params.limit}`;
+            }
+            const response = yield axiosInstance.get(`${GET_SET_SUPPLY(storeId)}/${id}/history?${queryParams}`, config);
+            return response;
+        }
+        catch (error) {
+            console.error('Error fetching getCashierBoxMovementsHistory:', error);
+            throw error;
+        }
+    });
+};

package/dist/api/supplies/post.js

@@ -0,0 +1,26 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import axiosInstance from "../axiosInstance";
+const GET_SET_SUPPLY = (storeId) => `api/store/${storeId}/supply`;
+export const createSupply = function (storeId, data) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const config = {
+                headers: { Authorization: `Bearer ${this.apiToken}` }
+            };
+            const response = yield axiosInstance.post(`${GET_SET_SUPPLY(storeId)}`, data, config);
+            return response;
+        }
+        catch (error) {
+            console.error('Error fetching createSupply:', error);
+            throw error;
+        }
+    });
+};

package/dist/api/supplies/put.js

@@ -0,0 +1,41 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import axiosInstance from "../axiosInstance";
+const GET_SET_SUPPLY = (storeId) => `api/store/${storeId}/supply`;
+export const updateSupplyById = function (storeId, id, data) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const config = {
+                headers: { Authorization: `Bearer ${this.apiToken}` }
+            };
+            const response = yield axiosInstance.put(`${GET_SET_SUPPLY(storeId)}/${id}`, data, config);
+            return response;
+        }
+        catch (error) {
+            console.error('Error fetching getStoreById:', error);
+            throw error;
+        }
+    });
+};
+export const addSupplyStock = function (storeId, id, data) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const config = {
+                headers: { Authorization: `Bearer ${this.apiToken}` }
+            };
+            const response = yield axiosInstance.put(`${GET_SET_SUPPLY(storeId)}/${id}/addStock`, data, config);
+            return response;
+        }
+        catch (error) {
+            console.error('Error fetching addSupplyStock:', error);
+            throw error;
+        }
+    });
+};

package/dist/api/users/delete.js

@@ -0,0 +1,26 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import axiosInstance from "../axiosInstance";
+const GET_SET_USER = 'api/user';
+export const deleteUserById = function (id) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const config = {
+                headers: { Authorization: `Bearer ${this.apiToken}` }
+            };
+            const response = yield axiosInstance.delete(`${GET_SET_USER}/${id}`, config);
+            return response;
+        }
+        catch (error) {
+            console.error('Error fetching deleteUserById:', error);
+            throw error;
+        }
+    });
+};

package/dist/api/users/post.js

@@ -0,0 +1,25 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import axiosInstance from "../axiosInstance";
+const GET_SET_USER = 'api/users';
+export const validateUserPin = function (data) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const config = {
+                headers: { Authorization: `Bearer ${this.apiToken}` }
+            };
+            return yield axiosInstance.post(`${GET_SET_USER}/validate-pin`, data, config);
+        }
+        catch (error) {
+            console.error('Error fetching validateUserPin:', error);
+            throw error;
+        }
+    });
+};

package/dist/api/users/put.js

@@ -0,0 +1,29 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import axiosInstance from "../axiosInstance";
+const GET_SET_USER = 'api/user';
+const REQUEST_PARAMS = {
+    token: 'LOGGED_USER_TOKEN',
+};
+export const updateUserById = function (userId, data) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const config = {
+                headers: { Authorization: `Bearer ${this.apiToken}` }
+            };
+            const response = yield axiosInstance.put(`${GET_SET_USER}/${userId}`, data, config);
+            return response.data || {};
+        }
+        catch (error) {
+            console.error('Error fetching updateUserById:', error);
+            throw error;
+        }
+    });
+};

package/dist/enum/index.js

@@ -1,15 +1,20 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BuyAndGetConditionsTypes = exports.DiscountCodeTypes = void 0;
-var DiscountCodeTypes;
+export var DiscountCodeTypes;
 (function (DiscountCodeTypes) {
     DiscountCodeTypes["PERCENTAGE"] = "percentage";
     DiscountCodeTypes["NUMBER"] = "number";
     DiscountCodeTypes["FREE_DELIVERY"] = "freeDelivery";
     DiscountCodeTypes["BUY_X_GET_Y"] = "buyXGetY";
-})(DiscountCodeTypes || (exports.DiscountCodeTypes = DiscountCodeTypes = {}));
-var BuyAndGetConditionsTypes;
+    DiscountCodeTypes["FREE_ITEM"] = "freeItem";
+})(DiscountCodeTypes || (DiscountCodeTypes = {}));
+export var BuyAndGetConditionsTypes;
 (function (BuyAndGetConditionsTypes) {
     BuyAndGetConditionsTypes["PERCENTAGE"] = "percentage";
     BuyAndGetConditionsTypes["FREE"] = "free";
-})(BuyAndGetConditionsTypes || (exports.BuyAndGetConditionsTypes = BuyAndGetConditionsTypes = {}));
+})(BuyAndGetConditionsTypes || (BuyAndGetConditionsTypes = {}));
+export var PaymentMethodsEnum;
+(function (PaymentMethodsEnum) {
+    PaymentMethodsEnum["Cash"] = "cash";
+    PaymentMethodsEnum["Card"] = "card";
+    PaymentMethodsEnum["Delivery"] = "delivery";
+    PaymentMethodsEnum["Transfer"] = "transfer";
+})(PaymentMethodsEnum || (PaymentMethodsEnum = {}));

package/dist/index.js

@@ -1,33 +1,3 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WashdayClient = exports.utils = void 0;
-const utils = __importStar(require("./utils"));
-exports.utils = utils;
-const api_1 = __importDefault(require("./api"));
-exports.WashdayClient = api_1.default;
+import * as utils from './utils';
+import WashdayClient from './api';
+export { WashdayClient, utils };

package/dist/interfaces/Api.js

@@ -1,3 +1 @@
-export type WashdayClientInstance = {
-    apiToken: string;
-};
+export {};

package/dist/interfaces/Apple.js

@@ -0,0 +1,16 @@
+var AppleAuthenticationUserDetectionStatus;
+(function (AppleAuthenticationUserDetectionStatus) {
+    /**
+     * The system does not support this determination and there is no data.
+     */
+    AppleAuthenticationUserDetectionStatus[AppleAuthenticationUserDetectionStatus["UNSUPPORTED"] = 0] = "UNSUPPORTED";
+    /**
+     * The system has not determined whether the user might be a real person.
+     */
+    AppleAuthenticationUserDetectionStatus[AppleAuthenticationUserDetectionStatus["UNKNOWN"] = 1] = "UNKNOWN";
+    /**
+     * The user appears to be a real person.
+     */
+    AppleAuthenticationUserDetectionStatus[AppleAuthenticationUserDetectionStatus["LIKELY_REAL"] = 2] = "LIKELY_REAL";
+})(AppleAuthenticationUserDetectionStatus || (AppleAuthenticationUserDetectionStatus = {}));
+export {};

package/dist/interfaces/Attendance.js

@@ -0,0 +1 @@
+export {};

package/dist/interfaces/Customer.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/interfaces/Order.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/interfaces/Permission.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/interfaces/Product.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/interfaces/Section.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/interfaces/Store.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/interfaces/StoreImage.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/interfaces/User.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/utils/apiUtils.js

@@ -0,0 +1,9 @@
+export const generateQueryParamsStr = (availableQueryParamsList = [], receivedParamsObj = {}) => {
+    let queryParams = [];
+    for (let availableParam of availableQueryParamsList) {
+        if (receivedParamsObj.hasOwnProperty(availableParam)) {
+            queryParams.push(`${availableParam}=${receivedParamsObj[availableParam]}`);
+        }
+    }
+    return queryParams.join('&');
+};

package/dist/utils/index.js

@@ -1,17 +1,2 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./orders"), exports);
+export { applyDiscountToProducts, calculateOrderTotal } from './orders';
+export { getFormattedAddress } from './util';

package/dist/utils/orders/calculateOrderTotal.js

@@ -1,33 +1,42 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateOrderTotal = void 0;
-const enum_1 = require("../../enum");
-const calculateTotalTaxesIncluded_1 = require("./calculateTotalTaxesIncluded");
-const calculateTotalTaxesOverPrice_1 = require("./calculateTotalTaxesOverPrice");
-const helpers_1 = require("./helpers");
-const calculateOrderTotal = (order, selectedCustomer, storeSettings, hasShippingCost, storeDiscounts = [], discountCodeObj) => {
+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, redeemPointsDiscount = 0 // 💡 NUEVO parámetro
+) => {
     var _a;
     try {
         const appliedOrderDiscounts = {};
-        const productTableCalculator = (storeSettings === null || storeSettings === void 0 ? void 0 : storeSettings.taxesType) === 'over_price' ? calculateTotalTaxesOverPrice_1.calculateTotalTaxesOverPrice : calculateTotalTaxesIncluded_1.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
-        const { totalQuantity, totalImportWithDiscount, totalImportWithoutDiscount, totalImporTaxes, totalDiscountAmount } = (0, helpers_1.getProductLineTotals)(productTableImports);
-        // DISCOUNT TOTAL AND SHIPPING SERVICE COST
+        // === PRODUCT LINE TOTALS ===
+        const { totalQuantity, totalImportWithDiscount, totalImportWithoutDiscount, totalImporTaxes, totalDiscountAmount, totalSubtotalAmount } = getProductLineTotals(productTableImports);
+        // === DISCOUNT CODE (monetario tipo NUMBER que se aplica una sola vez) ===
         let discountCodeAmount = 0;
-        let shippingCost = (0, helpers_1.getShippingCost)(discountCodeObj, hasShippingCost, storeSettings);
-        if (discountCodeObj && discountCodeObj.type === enum_1.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 + totalImporTaxes + shippingCost - discountCodeAmount).toFixed(2);
-        let creditApplied = (0, helpers_1.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 });
+        // === 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;
     }
 };
-exports.calculateOrderTotal = calculateOrderTotal;

package/dist/utils/orders/calculateTotalTaxesIncluded.js

@@ -1,24 +1,35 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateTotalTaxesIncluded = void 0;
-const helpers_1 = require("./helpers");
-const calculateTotalTaxesIncluded = (order, selectedCustomer, storeSettings, storeDiscounts, appliedOrderDiscounts, discountCodeObj) => {
+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) => {
         var _a, _b;
+        const qty = current.qty || 0;
+        const taxPercentage = getProductTaxesPercentage(current, storeSettings);
+        const taxFactor = 1 + taxPercentage / 100;
+        // Convertir extraAmount de bruto a neto
+        const extraAmountGross = current.extraAmount || 0;
+        const extraAmountNet = extraAmountGross / taxFactor;
+        // Precio bruto del producto (sin extraAmount)
+        const productGrossPrice = order.express ? current.expressPrice : current.price;
+        // Convertir precio bruto a neto
+        const unitNetPrice = productGrossPrice / taxFactor;
+        // Determinar el porcentaje de descuento (si aplica)
         let discPercentageInteger = 0;
         let productPercentageDiscount = 0;
         let customerDiscount = 0;
-        let qty = current.qty || 0;
-        const extraAmountPerUnit = current.extraAmount / qty;
-        const prodPrice = (order.express ? current.expressPrice : current.price) + extraAmountPerUnit;
         if (!order.discountCode) {
-            const discountsToApply = storeDiscounts.filter((discount) => discount.products.includes(current._id) && discount.isActive);
+            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;
+            }));
             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) => {
-                if (next.type === 'percentage') {
-                    return prev + next.value;
-                }
-                return prev;
+                return next.type === 'percentage' ? prev + next.value : prev;
             }, 0);
             discPercentageInteger = +((productPercentageDiscount + customerDiscount) / 100).toFixed(2);
             discountsToApply.forEach((discount) => (appliedOrderDiscounts[discount._id] = discount));
@@ -38,28 +49,43 @@ const calculateTotalTaxesIncluded = (order, selectedCustomer, storeSettings, sto
                 if (discountType === 'percentage' && current.isBuyAndGetProduct) {
                     discPercentageInteger = +(discountValue / 100).toFixed(2);
                 }
+                if (discountType === 'free' && current.isBuyAndGetProduct) {
+                    discPercentageInteger = 1;
+                }
+            }
+            else if (discountCodeObj.type === DiscountCodeTypes.FREE_ITEM && (current.isFreeItem)) {
+                discPercentageInteger = 1;
             }
         }
-        const taxPercentage = (0, helpers_1.getProductTaxesPercentage)(current, storeSettings);
-        const taxPercentageInteger = taxPercentage / 100;
-        const unitPrice = prodPrice / (1 + taxPercentageInteger);
-        const discountAmountPerUnit = discPercentageInteger
-            ? unitPrice * discPercentageInteger
-            : (current.discountAmount || 0) / (1 + taxPercentageInteger);
-        const prodPriceWithDiscountPerUnit = unitPrice - discountAmountPerUnit;
-        const taxesAmountPerUnit = prodPriceWithDiscountPerUnit * taxPercentageInteger;
-        const totalTaxesApplied = +(taxesAmountPerUnit * qty).toFixed(2);
-        const lineDiscount = qty * discountAmountPerUnit;
-        const prodLinePriceWithDiscount = +(qty * prodPriceWithDiscountPerUnit).toFixed(2);
+        // === NUEVO: Aplicar descuento sobre el precio total ajustado (producto base + extra prorrateado) ===
+        // Si hay cantidad, repartir el extra neto entre cada unidad
+        const unitExtraNet = qty > 0 ? extraAmountNet / qty : 0;
+        // Precio neto ajustado: precio base + extra (por unidad)
+        const adjustedUnitNetPrice = unitNetPrice + unitExtraNet;
+        // Calcular el descuento sobre el precio ajustado
+        const discountAmountPerUnit = discPercentageInteger ? adjustedUnitNetPrice * discPercentageInteger : 0;
+        // Precio neto con descuento aplicado por unidad
+        const discountedUnitNetPrice = adjustedUnitNetPrice - discountAmountPerUnit;
+        // === Totales de la línea ===
+        // Total neto sin descuento: precio base total + extra (ya prorrateado en el total)
+        const productNetTotalWithoutDiscount = (unitNetPrice * qty) + extraAmountNet;
+        // Total neto con descuento: se aplica el descuento sobre el precio ajustado por unidad
+        const productNetTotalWithDiscount = discountedUnitNetPrice * qty;
+        // Reaplicar IVA a ambos totales
+        const productLineImportTotal = +(productNetTotalWithoutDiscount * taxFactor).toFixed(2);
+        const productLineTotalWithDiscount = +(productNetTotalWithDiscount * taxFactor).toFixed(2);
+        // Calcular el total de impuestos como la diferencia entre bruto y neto con descuento
+        const totalTaxesApplied = +(productLineTotalWithDiscount - productNetTotalWithDiscount).toFixed(2);
+        const lineDiscount = +(discountAmountPerUnit * qty).toFixed(2);
         return {
             product: current,
-            qty: qty,
-            productLineImportTotal: unitPrice * qty,
-            productLineTotalWithDiscount: prodLinePriceWithDiscount,
+            qty,
+            productLineImportTotal, // Total bruto sin descuento (incluye extra y IVA)
+            productLineTotalWithDiscount, // Total bruto con descuento aplicado sobre el precio ajustado
             productLineTaxesTotal: totalTaxesApplied,
-            lineDiscountAmount: lineDiscount
+            lineDiscountAmount: lineDiscount,
+            productLineSubtotal: productNetTotalWithoutDiscount // Subtotal neto (sin IVA)
         };
     });
     return productTableImports;
 };
-exports.calculateTotalTaxesIncluded = calculateTotalTaxesIncluded;