washday-sdk 0.0.165 → 0.0.167

package/dist/api/axiosInstance.js

@@ -1,8 +1,8 @@
 import axios from 'axios';
 // Define the type for the Axios instance
 let axiosInstance = null;
-// const BASE_URL: string = 'http://localhost:5555/';
-const BASE_URL = 'https://washday-backend.herokuapp.com/';
+const BASE_URL = 'http://localhost:5555/';
+//const BASE_URL: string = 'https://washday-backend.herokuapp.com/';
 // Function to create or return the singleton instance
 const getAxiosInstance = () => {
     if (!axiosInstance) {

package/dist/api/index.js

@@ -73,6 +73,14 @@ const WashdayClient = function WashdayClient(apiToken) {
         getStoreRoutesList: routesEndpoints.getModule.getStoreRoutesList,
         createRoute: routesEndpoints.postModule.createRoute,
         closeStoreRoutes: routesEndpoints.putModule.closeStoreRoutes,
+        //NEW V2 ENDPOINTS
+        getRoutesByStore: routesEndpoints.getModule.getRoutesByStore,
+        createRouteV2: routesEndpoints.postModule.createRouteV2,
+        getRouteByIdV2: routesEndpoints.getModule.getRouteByIdV2,
+        deleteRouteById: routesEndpoints.deleteModule.deleteRouteById,
+        closeRouteById: routesEndpoints.putModule.closeRouteById,
+        updateRouteById: routesEndpoints.putModule.updateRouteById,
+        getRoutesByDriver: routesEndpoints.getModule.getRoutesByDriver,
     });
     this.auth = bindMethods(this, {
         customerLoginToken: authEndpoints.postModule.customerLoginToken,

package/dist/api/order/get.js

@@ -36,6 +36,10 @@ export const getList = function (params) {
                 'readyDateTime',
                 'collectedDateTime',
                 'q',
+                'pickupFromDate',
+                'pickupToDate',
+                'deliveryFromDate',
+                'deliveryToDate',
             ], params);
             // ], { ...params, q: params.q ? encodeURIComponent(params.q) : undefined });
             return yield axiosInstance.get(`${GET_SET_ORDER}?${queryParams}`, config);

package/dist/api/routes/delete.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_ROUTES = 'api/routes';
+export const deleteRouteById = function (id) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const config = {
+                headers: { Authorization: `Bearer ${this.apiToken}` }
+            };
+            return yield axiosInstance.delete(`${GET_SET_ROUTES}/${id}`, config);
+        }
+        catch (error) {
+            console.error('Error fetching deleteRouteById:', error);
+            throw error;
+        }
+    });
+};

package/dist/api/routes/get.js

@@ -11,6 +11,9 @@ import { generateQueryParamsStr } from "../../utils/apiUtils";
 import axiosInstance from "../axiosInstance";
 const GET_SET_ROUTES_ORDERS = 'api/routes/orders';
 const GET_STORE_ROUTES = 'api/storeRoutes';
+const GET_STORE_ROUTES_BY_ID = 'api/stores/:id/routes';
+const GET_ROUTE = 'api/routes';
+//@deprecated
 export const getOrdersForRoute = function (params) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
@@ -29,6 +32,7 @@ export const getOrdersForRoute = function (params) {
         }
     });
 };
+//@deprecated
 export const getStoreRoutesList = function (storeId) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
@@ -43,3 +47,49 @@ export const getStoreRoutesList = function (storeId) {
         }
     });
 };
+//NEW V2 ENDPOINTS
+export const getRoutesByStore = function (storeId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const config = {
+                headers: { Authorization: `Bearer ${this.apiToken}` }
+            };
+            return yield axiosInstance.get(`${GET_STORE_ROUTES_BY_ID.replace(':id', storeId)}`, config);
+        }
+        catch (error) {
+            console.error('Error fetching getRoutesByStore:', error);
+            throw error;
+        }
+    });
+};
+export const getRouteByIdV2 = function (routeId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const config = {
+                headers: { Authorization: `Bearer ${this.apiToken}` }
+            };
+            return yield axiosInstance.get(`${GET_ROUTE}/${routeId}`, config);
+        }
+        catch (error) {
+            console.error('Error fetching getRouteByIdV2:', error);
+            throw error;
+        }
+    });
+};
+export const getRoutesByDriver = function (query) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const config = {
+                headers: { Authorization: `Bearer ${this.apiToken}` }
+            };
+            const queryParams = generateQueryParamsStr([
+                'status',
+            ], query);
+            return yield axiosInstance.get(`${GET_ROUTE}?${queryParams}`, config);
+        }
+        catch (error) {
+            console.error('Error fetching getRoutesByDriver:', error);
+            throw error;
+        }
+    });
+};

package/dist/api/routes/index.js

@@ -1,3 +1,4 @@
 export * as getModule from './get';
 export * as postModule from './post';
 export * as putModule from './put';
+export * as deleteModule from './delete';

package/dist/api/routes/post.js

@@ -7,8 +7,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 import axiosInstance from "../axiosInstance";
 const GET_SET_ROUTES = 'api/routes';
+const GET_STORE_ROUTES_BY_ID = 'api/stores/:id/routes';
+//@deprecated
 export const createRoute = function (data) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
@@ -23,3 +36,18 @@ export const createRoute = function (data) {
         }
     });
 };
+export const createRouteV2 = function (data) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const config = {
+                headers: { Authorization: `Bearer ${this.apiToken}` }
+            };
+            const { storeId } = data, rest = __rest(data, ["storeId"]);
+            return yield axiosInstance.post(GET_STORE_ROUTES_BY_ID.replace(':id', storeId), rest, config);
+        }
+        catch (error) {
+            console.error('Error fetching createRouteV2:', error);
+            throw error;
+        }
+    });
+};

package/dist/api/routes/put.js

@@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import axiosInstance from "../axiosInstance";
 const GET_STORE_ROUTES = 'api/storeRoutes';
+const GET_ROUTE = 'api/routes';
 export const closeStoreRoutes = function (storeId, data) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
@@ -23,3 +24,31 @@ export const closeStoreRoutes = function (storeId, data) {
         }
     });
 };
+export const closeRouteById = function (routeId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const config = {
+                headers: { Authorization: `Bearer ${this.apiToken}` }
+            };
+            return yield axiosInstance.put(`${GET_ROUTE}/${routeId}/close`, {}, config);
+        }
+        catch (error) {
+            console.error('Error fetching closeRouteById:', error);
+            throw error;
+        }
+    });
+};
+export const updateRouteById = function (routeId, data) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const config = {
+                headers: { Authorization: `Bearer ${this.apiToken}` }
+            };
+            return yield axiosInstance.put(`${GET_ROUTE}/${routeId}`, data, config);
+        }
+        catch (error) {
+            console.error('Error fetching updateRouteById:', error);
+            throw error;
+        }
+    });
+};

package/dist/utils/orders/calculateTotalTaxesIncluded.js

@@ -5,14 +5,14 @@ export const calculateTotalTaxesIncluded = (order, selectedCustomer, storeSettin
         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)
+        // Convertir extraAmount de bruto a neto
         const extraAmountGross = current.extraAmount || 0;
         const extraAmountNet = extraAmountGross / taxFactor;
-        // Get the product’s gross price (excluding extraAmount)
+        // Precio bruto del producto (sin extraAmount)
         const productGrossPrice = order.express ? current.expressPrice : current.price;
-        // Convert product gross price to net
+        // Convertir precio bruto a neto
         const unitNetPrice = productGrossPrice / taxFactor;
-        // Determine discount percentage (if any) – discount is applied only on product net price.
+        // Determinar el porcentaje de descuento (si aplica)
         let discPercentageInteger = 0;
         let productPercentageDiscount = 0;
         let customerDiscount = 0;
@@ -42,32 +42,34 @@ export const calculateTotalTaxesIncluded = (order, selectedCustomer, storeSettin
                 }
             }
         }
-        // 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;
+        // === 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;
-        // 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 = +(productLineTotalWithDiscount - totalNetWithDiscount).toFixed(2);
+        // 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,
-            productLineImportTotal, // original gross total (no discount)
-            productLineTotalWithDiscount, // gross total after discount on product (extra not discounted)
+            productLineImportTotal, // Total bruto sin descuento (incluye extra y IVA)
+            productLineTotalWithDiscount, // Total bruto con descuento aplicado sobre el precio ajustado
             productLineTaxesTotal: totalTaxesApplied,
             lineDiscountAmount: lineDiscount,
-            productLineSubtotal: totalNetWithoutDiscount // All line subtotal (extra amount considered, without discounts and taxes)
+            productLineSubtotal: productNetTotalWithoutDiscount // Subtotal neto (sin IVA)
         };
     });
     return productTableImports;

package/dist/utils/orders/calculateTotalTaxesOverPrice.js

@@ -6,10 +6,16 @@ export const calculateTotalTaxesOverPrice = (order, selectedCustomer, storeSetti
         let discPercentageInteger = 0;
         let productPercentageDiscount = 0;
         let customerDiscount = 0;
-        const qty = current.qty; // cantidad
+        const qty = current.qty || current.quantity; // cantidad
         // Precio base sin impuestos (en modo over_price el precio es neto)
         const productBasePrice = order.express ? current.expressPrice : current.price;
-        // Cálculo de descuento sobre el producto (aplicable solo sobre el precio base)
+        // === NUEVO: Considerar extraAmount en el precio a descontar ===
+        // extraAmount es el ajuste total para la línea; se reparte por unidad
+        const extraAmount = current.extraAmount || 0;
+        const unitExtra = qty > 0 ? extraAmount / qty : 0;
+        // Precio ajustado: suma del precio base y el extra por unidad
+        const adjustedPrice = productBasePrice + unitExtra;
+        // Cálculo de descuento sobre el precio ajustado
         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;
@@ -35,29 +41,29 @@ export const calculateTotalTaxesOverPrice = (order, selectedCustomer, storeSetti
                 }
             }
         }
-        // Calcular descuento por unidad y precio descontado
-        const productDiscount = productBasePrice * discPercentageInteger;
-        const discountedProductPrice = productBasePrice - productDiscount;
-        // Subtotal para la línea (precio con descuento * cantidad + extraAmount) SIN impuestos
-        const subtotal = (discountedProductPrice * qty) + (current.extraAmount || 0);
+        // Calcular el descuento por unidad sobre el precio ajustado
+        const productDiscount = adjustedPrice * discPercentageInteger;
+        const discountedAdjustedPrice = adjustedPrice - productDiscount;
+        // Subtotal para la línea (precio descontado por unidad * cantidad) SIN impuestos
+        const subtotal = discountedAdjustedPrice * qty;
         // Calcular impuestos sobre el subtotal
         const taxPercentage = getProductTaxesPercentage(current, storeSettings) / 100;
         const taxes = subtotal * taxPercentage;
         // Resultados finales:
         const totalTaxesApplied = +taxes.toFixed(2);
         const lineDiscount = +(productDiscount * qty).toFixed(2);
-        // Precio total con descuento, reaplicando el IVA (es el total final a cobrar)
+        // Precio total con descuento, reaplicando impuestos
         const prodLinePriceWithDiscount = +((subtotal * (1 + taxPercentage))).toFixed(2);
         return {
             product: current,
             qty,
-            // 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
+            // Total bruto original sin descuento: (precio base * cantidad) + extraAmount
+            productLineImportTotal: (productBasePrice * qty) + extraAmount,
+            // Total final con descuento, con impuestos incluidos
             productLineTotalWithDiscount: prodLinePriceWithDiscount,
             productLineTaxesTotal: totalTaxesApplied,
             lineDiscountAmount: lineDiscount,
-            // Subtotal: precio base (neto, con descuento) sin aplicar IVA
+            // Subtotal neto (sin impuestos) con descuento aplicado
             productLineSubtotal: subtotal
         };
     });

package/package.json

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

package/src/api/axiosInstance.ts

@@ -3,8 +3,8 @@ import axios, { AxiosInstance, AxiosRequestConfig } from 'axios';
 // Define the type for the Axios instance
 let axiosInstance: AxiosInstance | null = null;
 
-// const BASE_URL: string = 'http://localhost:5555/';
-const BASE_URL: string = 'https://washday-backend.herokuapp.com/';
+ const BASE_URL: string = 'http://localhost:5555/';
+//const BASE_URL: string = 'https://washday-backend.herokuapp.com/';
 
 // Function to create or return the singleton instance
 const getAxiosInstance = (): AxiosInstance => {

package/src/api/index.ts

@@ -80,6 +80,14 @@ const WashdayClient: WashdayClientConstructor = function WashdayClient(this: Was
         getStoreRoutesList: routesEndpoints.getModule.getStoreRoutesList,
         createRoute: routesEndpoints.postModule.createRoute,
         closeStoreRoutes: routesEndpoints.putModule.closeStoreRoutes,
+        //NEW V2 ENDPOINTS
+        getRoutesByStore: routesEndpoints.getModule.getRoutesByStore,
+        createRouteV2: routesEndpoints.postModule.createRouteV2,
+        getRouteByIdV2: routesEndpoints.getModule.getRouteByIdV2,
+        deleteRouteById: routesEndpoints.deleteModule.deleteRouteById,
+        closeRouteById: routesEndpoints.putModule.closeRouteById,
+        updateRouteById: routesEndpoints.putModule.updateRouteById,
+        getRoutesByDriver: routesEndpoints.getModule.getRoutesByDriver,
     });
     this.auth = bindMethods(this, {
         customerLoginToken: authEndpoints.postModule.customerLoginToken,

package/src/api/order/get.ts

@@ -23,7 +23,12 @@ export const getList = async function (this: WashdayClientInstance, params: {
     cleanedDateTime: string | undefined,
     readyDateTime: string | undefined,
     collectedDateTime: string | undefined,
-    q: string | undefined
+    q: string | undefined,
+    pickupFromDate: string | undefined,
+    pickupToDate: string | undefined,
+    deliveryFromDate: string | undefined,
+    deliveryToDate: string | undefined,
+
 }): Promise<any> {
     try {
         const config = {
@@ -46,6 +51,10 @@ export const getList = async function (this: WashdayClientInstance, params: {
             'readyDateTime',
             'collectedDateTime',
             'q',
+            'pickupFromDate',
+            'pickupToDate',
+            'deliveryFromDate',
+            'deliveryToDate',
         ], params);
         // ], { ...params, q: params.q ? encodeURIComponent(params.q) : undefined });
         return await axiosInstance.get(`${GET_SET_ORDER}?${queryParams}`, config);

package/src/api/routes/delete.ts

@@ -0,0 +1,15 @@
+import { WashdayClientInstance } from "../../interfaces/Api";
+import axiosInstance from "../axiosInstance";
+const GET_SET_ROUTES = 'api/routes';
+
+export const deleteRouteById = async function (this: WashdayClientInstance, id: string): Promise<any> {
+    try {
+        const config = {
+            headers: { Authorization: `Bearer ${this.apiToken}` }
+        };
+        return await axiosInstance.delete(`${GET_SET_ROUTES}/${id}`, config);
+    } catch (error) {
+        console.error('Error fetching deleteRouteById:', error);
+        throw error;
+    }
+};

package/src/api/routes/get.ts

@@ -4,7 +4,10 @@ import { generateQueryParamsStr } from "../../utils/apiUtils";
 import axiosInstance from "../axiosInstance";
 const GET_SET_ROUTES_ORDERS = 'api/routes/orders';
 const GET_STORE_ROUTES = 'api/storeRoutes';
+const GET_STORE_ROUTES_BY_ID = 'api/stores/:id/routes';
+const GET_ROUTE = 'api/routes';
 
+//@deprecated
 export const getOrdersForRoute = async function (this: WashdayClientInstance, params: {
     store: string | undefined,
     routeDate: string | undefined,
@@ -24,6 +27,7 @@ export const getOrdersForRoute = async function (this: WashdayClientInstance, pa
     }
 };
 
+//@deprecated
 export const getStoreRoutesList = async function (this: WashdayClientInstance, storeId: string): Promise<any> {
     try {
         const config = {
@@ -34,4 +38,49 @@ export const getStoreRoutesList = async function (this: WashdayClientInstance, s
         console.error('Error fetching getStoreRoutesList:', error);
         throw error;
     }
-};
+};
+
+
+//NEW V2 ENDPOINTS
+export const getRoutesByStore = async function (this: WashdayClientInstance, storeId: string): Promise<any> {
+    try {
+        const config = {
+            headers: { Authorization: `Bearer ${this.apiToken}` }
+        };
+        return await axiosInstance.get(`${GET_STORE_ROUTES_BY_ID.replace(':id', storeId)}`, config);
+    } catch (error) {
+        console.error('Error fetching getRoutesByStore:', error);
+        throw error;
+    }
+};
+
+export const getRouteByIdV2 = async function (this: WashdayClientInstance, routeId: string): Promise<any> {
+    try {
+        const config = {
+            headers: { Authorization: `Bearer ${this.apiToken}` }
+        };
+        return await axiosInstance.get(`${GET_ROUTE}/${routeId}`, config);
+    } catch (error) {
+        console.error('Error fetching getRouteByIdV2:', error);
+        throw error;
+    }
+};
+
+export const getRoutesByDriver = async function (this: WashdayClientInstance, query: {
+    status?: string,
+}): Promise<any> {
+    try {
+        const config = {
+            headers: { Authorization: `Bearer ${this.apiToken}` }
+        };
+        const queryParams = generateQueryParamsStr([
+            'status',
+        ], query);
+        return await axiosInstance.get(`${GET_ROUTE}?${queryParams}`, config);
+    } catch (error) {
+        console.error('Error fetching getRoutesByDriver:', error);
+        throw error;
+    }
+};
+
+

package/src/api/routes/index.ts

@@ -1,3 +1,4 @@
 export * as getModule from './get';
 export * as postModule from './post';
 export * as putModule from './put';
+export * as deleteModule from './delete';

package/src/api/routes/post.ts

@@ -1,7 +1,9 @@
 import { WashdayClientInstance } from "../../interfaces/Api";
 import axiosInstance from "../axiosInstance";
 const GET_SET_ROUTES = 'api/routes';
+const GET_STORE_ROUTES_BY_ID = 'api/stores/:id/routes';
 
+//@deprecated
 export const createRoute = async function (this: WashdayClientInstance, data: {
     driver: string;
     store: string;
@@ -25,3 +27,21 @@ export const createRoute = async function (this: WashdayClientInstance, data: {
         throw error;
     }
 };
+
+
+export const createRouteV2 = async function (this: WashdayClientInstance, data: {
+    storeId: string,
+    driver: string,
+    orders: Array<string>,
+}): Promise<any> {
+    try {
+        const config = {
+            headers: { Authorization: `Bearer ${this.apiToken}` }
+        };
+        const { storeId, ...rest } = data;
+        return await axiosInstance.post(GET_STORE_ROUTES_BY_ID.replace(':id', storeId), rest, config);
+    } catch (error) {
+        console.error('Error fetching createRouteV2:', error);
+        throw error;
+    }
+};

package/src/api/routes/put.ts

@@ -1,6 +1,7 @@
 import { WashdayClientInstance } from "../../interfaces/Api";
 import axiosInstance from "../axiosInstance";
 const GET_STORE_ROUTES = 'api/storeRoutes';
+const GET_ROUTE = 'api/routes';
 
 export const closeStoreRoutes = async function (this: WashdayClientInstance, storeId: string, data: {
     routes: string[],
@@ -15,3 +16,29 @@ export const closeStoreRoutes = async function (this: WashdayClientInstance, sto
         throw error;
     }
 };
+
+export const closeRouteById = async function (this: WashdayClientInstance, routeId: string): Promise<any> {
+    try {
+        const config = {
+            headers: { Authorization: `Bearer ${this.apiToken}` }
+        };
+        return await axiosInstance.put(`${GET_ROUTE}/${routeId}/close`, {}, config);
+    } catch (error) {
+        console.error('Error fetching closeRouteById:', error);
+        throw error;
+    }
+};
+
+export const updateRouteById = async function (this: WashdayClientInstance, routeId: string, data: {
+    driver?: string,
+}): Promise<any> {
+    try {
+        const config = {
+            headers: { Authorization: `Bearer ${this.apiToken}` }
+        };
+        return await axiosInstance.put(`${GET_ROUTE}/${routeId}`, data, config);
+    } catch (error) {
+        console.error('Error fetching updateRouteById:', error);
+        throw error;
+    }
+};

package/src/interfaces/Api.ts

@@ -80,6 +80,14 @@ export interface WashdayClientInstance {
         getStoreRoutesList: typeof routesEndpoints.getModule.getStoreRoutesList,
         createRoute: typeof routesEndpoints.postModule.createRoute,
         closeStoreRoutes: typeof routesEndpoints.putModule.closeStoreRoutes,
+        //NEW V2 ENDPOINTS
+        getRoutesByStore: typeof routesEndpoints.getModule.getRoutesByStore,
+        createRouteV2: typeof routesEndpoints.postModule.createRouteV2,
+        getRouteByIdV2: typeof routesEndpoints.getModule.getRouteByIdV2,
+        deleteRouteById: typeof routesEndpoints.deleteModule.deleteRouteById,
+        closeRouteById: typeof routesEndpoints.putModule.closeRouteById,
+        updateRouteById: typeof routesEndpoints.putModule.updateRouteById,
+        getRoutesByDriver: typeof routesEndpoints.getModule.getRoutesByDriver,
     },
     orders: {
         getList: typeof ordersEndpoints.getModule.getList;

package/src/utils/orders/calculateTotalTaxesIncluded.ts

@@ -14,16 +14,16 @@ export const calculateTotalTaxesIncluded = (
     const taxPercentage = getProductTaxesPercentage(current, storeSettings);
     const taxFactor = 1 + taxPercentage / 100;
 
-    // Convert extraAmount from gross to net (assume extraAmount is not discounted)
+    // Convertir extraAmount de bruto a neto
     const extraAmountGross = current.extraAmount || 0;
     const extraAmountNet = extraAmountGross / taxFactor;
 
-    // Get the product’s gross price (excluding extraAmount)
+    // Precio bruto del producto (sin extraAmount)
     const productGrossPrice = order.express ? current.expressPrice : current.price;
-    // Convert product gross price to net
+    // Convertir precio bruto a neto
     const unitNetPrice = productGrossPrice / taxFactor;
 
-    // Determine discount percentage (if any) – discount is applied only on product net price.
+    // Determinar el porcentaje de descuento (si aplica)
     let discPercentageInteger = 0;
     let productPercentageDiscount = 0;
     let customerDiscount = 0;
@@ -32,7 +32,7 @@ export const calculateTotalTaxesIncluded = (
         (discount) => discount.products.includes(current._id) && discount.isActive
       );
       customerDiscount = selectedCustomer?.customer?.discount || 0;
-      productPercentageDiscount = discountsToApply.reduce((prev: number, next: any) => {
+      productPercentageDiscount = discountsToApply.reduce((prev, next) => {
         return next.type === 'percentage' ? prev + next.value : prev;
       }, 0);
       discPercentageInteger = +((productPercentageDiscount + customerDiscount) / 100).toFixed(2);
@@ -55,37 +55,39 @@ 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;
+    // === 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;
 
-    // Now, calculate the final totals:
-    // For the product part:
-    const productNetTotalWithoutDiscount = unitNetPrice * qty;
+    // === 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;
-    // 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);
+    // Reaplicar IVA a ambos totales
+    const productLineImportTotal = +(productNetTotalWithoutDiscount * taxFactor).toFixed(2);
+    const productLineTotalWithDiscount = +(productNetTotalWithDiscount * taxFactor).toFixed(2);
 
-    // Calculate the taxes as the difference between gross and net:
-    const totalTaxesApplied = + (productLineTotalWithDiscount - totalNetWithDiscount).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);
+    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)
+      productLineImportTotal,           // Total bruto sin descuento (incluye extra y IVA)
+      productLineTotalWithDiscount,     // Total bruto con descuento aplicado sobre el precio ajustado
       productLineTaxesTotal: totalTaxesApplied,
       lineDiscountAmount: lineDiscount,
-      productLineSubtotal: totalNetWithoutDiscount // All line subtotal (extra amount considered, without discounts and taxes)
+      productLineSubtotal: productNetTotalWithoutDiscount // Subtotal neto (sin IVA)
     };
   });
   return productTableImports;

package/src/utils/orders/calculateTotalTaxesOverPrice.ts

@@ -13,12 +13,19 @@ export const calculateTotalTaxesOverPrice = (
     let discPercentageInteger = 0;
     let productPercentageDiscount = 0;
     let customerDiscount = 0;
-    const qty = current.qty; // cantidad
+    const qty = current.qty || current.quantity; // cantidad
 
     // Precio base sin impuestos (en modo over_price el precio es neto)
     const productBasePrice = order.express ? current.expressPrice : current.price;
 
-    // Cálculo de descuento sobre el producto (aplicable solo sobre el precio base)
+    // === NUEVO: Considerar extraAmount en el precio a descontar ===
+    // extraAmount es el ajuste total para la línea; se reparte por unidad
+    const extraAmount = current.extraAmount || 0;
+    const unitExtra = qty > 0 ? extraAmount / qty : 0;
+    // Precio ajustado: suma del precio base y el extra por unidad
+    const adjustedPrice = productBasePrice + unitExtra;
+
+    // Cálculo de descuento sobre el precio ajustado
     if (!order.discountCode) {
       const discountsToApply = storeDiscounts.filter(
         (discount) => discount.products.includes(current._id) && discount.isActive
@@ -45,12 +52,12 @@ export const calculateTotalTaxesOverPrice = (
       }
     }
 
-    // Calcular descuento por unidad y precio descontado
-    const productDiscount = productBasePrice * discPercentageInteger;
-    const discountedProductPrice = productBasePrice - productDiscount;
+    // Calcular el descuento por unidad sobre el precio ajustado
+    const productDiscount = adjustedPrice * discPercentageInteger;
+    const discountedAdjustedPrice = adjustedPrice - productDiscount;
 
-    // Subtotal para la línea (precio con descuento * cantidad + extraAmount) SIN impuestos
-    const subtotal = (discountedProductPrice * qty) + (current.extraAmount || 0);
+    // Subtotal para la línea (precio descontado por unidad * cantidad) SIN impuestos
+    const subtotal = discountedAdjustedPrice * qty;
 
     // Calcular impuestos sobre el subtotal
     const taxPercentage = getProductTaxesPercentage(current, storeSettings) / 100;
@@ -60,19 +67,19 @@ export const calculateTotalTaxesOverPrice = (
     const totalTaxesApplied = +taxes.toFixed(2);
     const lineDiscount = +(productDiscount * qty).toFixed(2);
     
-    // Precio total con descuento, reaplicando el IVA (es el total final a cobrar)
+    // Precio total con descuento, reaplicando impuestos
     const prodLinePriceWithDiscount = +((subtotal * (1 + taxPercentage))).toFixed(2);
 
     return {
       product: current,
       qty,
-      // 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
+      // Total bruto original sin descuento: (precio base * cantidad) + extraAmount
+      productLineImportTotal: (productBasePrice * qty) + extraAmount,
+      // Total final con descuento, con impuestos incluidos
       productLineTotalWithDiscount: prodLinePriceWithDiscount,
       productLineTaxesTotal: totalTaxesApplied,
       lineDiscountAmount: lineDiscount,
-      // Subtotal: precio base (neto, con descuento) sin aplicar IVA
+      // Subtotal neto (sin impuestos) con descuento aplicado
       productLineSubtotal: subtotal
     };
   });