washday-sdk 1.6.71 → 1.6.73

package/dist/api/index.js

@@ -356,6 +356,7 @@ const WashdayClient = function WashdayClient(apiToken, env = 'PROD', clientId, c
         getSuppliesReport: reportsExportEndpoints.getModule.getSuppliesReport,
         getDiscountCodesReport: reportsExportEndpoints.getModule.getDiscountCodesReport,
         getStaffReport: reportsExportEndpoints.getModule.getStaffReport,
+        getStaffActivityDetails: reportsExportEndpoints.getModule.getStaffActivityDetails,
         getProductSalesReport: reportsExportEndpoints.getModule.getProductSalesReport,
         getProductSalesDrillDown: reportsExportEndpoints.getModule.getProductSalesDrillDown,
         getPaymentLinesReport: reportsExportEndpoints.getModule.getPaymentLinesReport,

package/dist/api/reports/get.js

@@ -145,6 +145,25 @@ export const getStaffReport = function (storeId, params) {
         }
     });
 };
+export const getStaffActivityDetails = function (storeId, params) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const config = {
+                headers: { Authorization: `Bearer ${this.apiToken}` }
+            };
+            const queryParams = generateQueryParamsStr([
+                'fromDate',
+                'toDate',
+                'employeeId',
+            ], params);
+            return yield this.axiosInstance.get(`${GET_SET_REPORTS}/${storeId}/staff/details?${queryParams}`, config);
+        }
+        catch (error) {
+            console.error('Error fetching getStaffActivityDetails:', error);
+            throw error;
+        }
+    });
+};
 export const getProductSalesReport = function (storeId, params) {
     return __awaiter(this, void 0, void 0, function* () {
         try {

package/dist/utils/orders/calculateOrderTotal.js

@@ -59,7 +59,7 @@ export const calculateOrderTotal = (order, selectedCustomer, storeSettings, hasS
             : calculateTotalTaxesIncluded;
         const productTableImports = productTableCalculator(processedOrder, selectedCustomer, storeSettings, storeDiscounts, appliedOrderDiscounts, discountCodeObj);
         // === PRODUCT LINE TOTALS ===
-        const { totalQuantity, totalImportWithDiscount, totalImportWithoutDiscount, totalImporTaxes, totalDiscountAmount, totalSubtotalAmount, taxBreakdown } = getProductLineTotals(productTableImports);
+        const { totalQuantity, totalImportWithDiscount, totalImportWithoutDiscount, totalImporTaxes, totalDiscountAmount, totalSubtotalAmount, taxBreakdown, totalNetAfterDiscount, totalGrossBeforeDiscount, } = getProductLineTotals(productTableImports);
         // NOTE: the old post-tax "discountCodeAmount" subtraction was removed.
         // NUMBER coupons (both `applyOnceOnOrder=true` and `=false`) are now
         // applied pre-tax via per-line `discountAmount` baked above, so
@@ -76,8 +76,45 @@ export const calculateOrderTotal = (order, selectedCustomer, storeSettings, hasS
         const orderTotal = +(orderTotalWithOutCredit -
             creditApplied -
             redeemPointsDiscount).toFixed(2);
+        // === PRICING BREAKDOWN ===
+        // For included: totalImportWithoutDiscount=gross-before-discount, totalSubtotalAmount=net-before-discount
+        // For over_price: totalImportWithoutDiscount=net-before-discount, totalSubtotalAmount=net-after-discount
+        const taxMode = (storeSettings === null || storeSettings === void 0 ? void 0 : storeSettings.taxesType) === 'over_price' ? 'over_price' : 'included';
+        const subtotalBeforeDiscountNet = taxMode === 'included' ? totalSubtotalAmount : totalImportWithoutDiscount;
+        const subtotalAfterDiscountNet = taxMode === 'included' ? totalNetAfterDiscount : totalSubtotalAmount;
+        const subtotalBeforeDiscountGross = taxMode === 'included' ? totalImportWithoutDiscount : totalGrossBeforeDiscount;
+        const subtotalAfterDiscountGross = totalImportWithDiscount;
+        const pricingBreakdown = {
+            subtotalBeforeDiscountNet,
+            subtotalAfterDiscountNet,
+            subtotalBeforeDiscountGross,
+            subtotalAfterDiscountGross,
+            discountTotalNet: +(subtotalBeforeDiscountNet - subtotalAfterDiscountNet).toFixed(2),
+            discountTotalGross: +(subtotalBeforeDiscountGross - subtotalAfterDiscountGross).toFixed(2),
+            taxesTotal: totalImporTaxes,
+            shippingServiceTotal: shippingCost,
+            creditApplied,
+            redeemPointsApplied: redeemPointsDiscount,
+            totalBeforePaymentsGross: orderTotalWithOutCredit,
+            total: orderTotal,
+        };
+        // For included: non-NUMBER lineDiscountAmount is net (discountAmountPerUnit*qty), so
+        // totalDiscountAmount is mixed-semantic. Use discountTotalGross (gross-before minus gross-after)
+        // which is unambiguously user-facing in both modes.
+        const displayDiscount = taxMode === 'included' ? pricingBreakdown.discountTotalGross : pricingBreakdown.discountTotalNet;
+        const displayTotals = {
+            subtotal: totalImportWithoutDiscount, // display-safe: gross (included) or net (over_price) — both equal the price-tag amount
+            discount: displayDiscount,
+            taxesTotal: totalImporTaxes,
+            taxesLabel: taxMode === 'included' ? 'taxesIncluded' : 'taxesTotal',
+            shippingServiceTotal: shippingCost,
+            creditApplied,
+            redeemPointsApplied: redeemPointsDiscount,
+            total: orderTotal,
+        };
         // === RETURN FINAL OBJECT ===
-        return Object.assign(Object.assign({}, order), { totalQuantity, customerDiscount: order.discountCode ? 0 : (_c = selectedCustomer === null || selectedCustomer === void 0 ? void 0 : selectedCustomer.customer) === null || _c === void 0 ? void 0 : _c.discount, productTotal: totalImportWithDiscount, taxesTotal: totalImporTaxes, taxBreakdown, total: orderTotal, creditApplied, redeemPointsApplied: redeemPointsDiscount, productTotalWithoutDiscount: totalImportWithoutDiscount, totalDiscountAmount: totalDiscountAmount, shippingServiceTotal: shippingCost, appliedOrderDiscounts, subtotal: totalSubtotalAmount });
+        return Object.assign(Object.assign({}, order), { totalQuantity, customerDiscount: order.discountCode ? 0 : (_c = selectedCustomer === null || selectedCustomer === void 0 ? void 0 : selectedCustomer.customer) === null || _c === void 0 ? void 0 : _c.discount, productTotal: totalImportWithDiscount, taxesTotal: totalImporTaxes, taxBreakdown, total: orderTotal, creditApplied, redeemPointsApplied: redeemPointsDiscount, productTotalWithoutDiscount: totalImportWithoutDiscount, totalDiscountAmount: totalDiscountAmount, shippingServiceTotal: shippingCost, appliedOrderDiscounts, subtotal: totalSubtotalAmount, pricingBreakdown,
+            displayTotals });
     }
     catch (error) {
         throw error;

package/dist/utils/orders/calculateTotalTaxesIncluded.js

@@ -138,7 +138,8 @@ export const calculateTotalTaxesIncluded = (order, selectedCustomer, storeSettin
             productLineTaxesTotal: totalTaxesApplied,
             taxBreakdown,
             lineDiscountAmount: lineDiscount,
-            productLineSubtotal: productNetTotalWithoutDiscount // Subtotal neto (sin IVA)
+            productLineSubtotal: productNetTotalWithoutDiscount, // Subtotal neto (sin IVA) — for included this is NET before discount
+            lineNetAfterDiscount: productNetTotalWithDiscount, // NET after discount — needed to derive pricingBreakdown
         };
     });
     return productTableImports;

package/dist/utils/orders/calculateTotalTaxesOverPrice.js

@@ -115,18 +115,21 @@ export const calculateTotalTaxesOverPrice = (order, selectedCustomer, storeSetti
         const lineDiscount = +(productDiscount * qty).toFixed(2);
         // Precio total con descuento, reaplicando impuestos
         const prodLinePriceWithDiscount = +((subtotal * (1 + taxPercentage))).toFixed(2);
+        // GROSS before discount: net-before-discount * (1 + tax). Needed to derive pricingBreakdown.
+        const lineGrossBeforeDiscount = +((productBasePrice * qty + extraAmount) * (1 + taxPercentage)).toFixed(2);
         return {
             product: current,
             qty,
-            // Total bruto original sin descuento: (precio base * cantidad) + extraAmount
+            // Total neto original sin descuento: (precio base * cantidad) + extraAmount
             productLineImportTotal: (productBasePrice * qty) + extraAmount,
             // Total final con descuento, con impuestos incluidos
             productLineTotalWithDiscount: prodLinePriceWithDiscount,
             productLineTaxesTotal: totalTaxesApplied,
             taxBreakdown,
             lineDiscountAmount: lineDiscount,
-            // Subtotal neto (sin impuestos) con descuento aplicado
-            productLineSubtotal: subtotal
+            // Subtotal neto (sin impuestos) con descuento aplicado — for over_price this is NET after discount
+            productLineSubtotal: subtotal,
+            lineGrossBeforeDiscount, // GROSS before discount — needed to derive pricingBreakdown
         };
     });
     return productTableImports;

package/dist/utils/orders/helpers.js

@@ -236,6 +236,14 @@ export const getProductLineTotals = (productLinesTotals) => {
         .reduce((acum, line) => acum + line.productLineSubtotal, 0)
         .toFixed(2);
     const taxBreakdown = normalizeTaxBreakdownToTotal(productLinesTotals.flatMap((line) => line.taxBreakdown || []), totalImporTaxes);
+    // lineNetAfterDiscount is set by the included calculator (for over_price, productLineSubtotal IS net-after-discount)
+    // lineGrossBeforeDiscount is set by the over_price calculator (for included, productLineImportTotal IS gross-before-discount)
+    const totalNetAfterDiscount = +productLinesTotals
+        .reduce((acum, line) => { var _a; return acum + ((_a = line.lineNetAfterDiscount) !== null && _a !== void 0 ? _a : line.productLineSubtotal); }, 0)
+        .toFixed(2);
+    const totalGrossBeforeDiscount = +productLinesTotals
+        .reduce((acum, line) => { var _a; return acum + ((_a = line.lineGrossBeforeDiscount) !== null && _a !== void 0 ? _a : line.productLineImportTotal); }, 0)
+        .toFixed(2);
     return {
         totalQuantity,
         totalImportWithDiscount,
@@ -243,7 +251,9 @@ export const getProductLineTotals = (productLinesTotals) => {
         totalImporTaxes,
         totalDiscountAmount,
         totalSubtotalAmount,
-        taxBreakdown
+        taxBreakdown,
+        totalNetAfterDiscount,
+        totalGrossBeforeDiscount,
     };
 };
 export const getShippingCost = (discountObject, requireShippingService, store) => {

package/package.json

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

package/src/api/index.ts

@@ -363,6 +363,7 @@ const WashdayClient: WashdayClientConstructor = function WashdayClient(this: Was
         getSuppliesReport: reportsExportEndpoints.getModule.getSuppliesReport,
         getDiscountCodesReport: reportsExportEndpoints.getModule.getDiscountCodesReport,
         getStaffReport: reportsExportEndpoints.getModule.getStaffReport,
+        getStaffActivityDetails: reportsExportEndpoints.getModule.getStaffActivityDetails,
         getProductSalesReport: reportsExportEndpoints.getModule.getProductSalesReport,
         getProductSalesDrillDown: reportsExportEndpoints.getModule.getProductSalesDrillDown,
         getPaymentLinesReport: reportsExportEndpoints.getModule.getPaymentLinesReport,

package/src/api/reports/get.ts

@@ -154,6 +154,27 @@ export const getStaffReport = async function (this: WashdayClientInstance, store
     }
 };
 
+export const getStaffActivityDetails = async function (this: WashdayClientInstance, storeId: string, params: {
+    fromDate?: string
+    toDate?: string
+    employeeId?: string
+}): Promise<any> {
+    try {
+        const config = {
+            headers: { Authorization: `Bearer ${this.apiToken}` }
+        };
+        const queryParams = generateQueryParamsStr([
+            'fromDate',
+            'toDate',
+            'employeeId',
+        ], params);
+        return await this.axiosInstance.get(`${GET_SET_REPORTS}/${storeId}/staff/details?${queryParams}`, config);
+    } catch (error) {
+        console.error('Error fetching getStaffActivityDetails:', error);
+        throw error;
+    }
+};
+
 export const getProductSalesReport = async function (this: WashdayClientInstance, storeId: string, params: {
     fromDate?: string
     toDate?: string

package/src/interfaces/Api.ts

@@ -348,6 +348,7 @@ export interface WashdayClientInstance {
         getSuppliesReport: typeof reportsExportEndpoints.getModule.getSuppliesReport;
         getDiscountCodesReport: typeof reportsExportEndpoints.getModule.getDiscountCodesReport;
         getStaffReport: typeof reportsExportEndpoints.getModule.getStaffReport;
+        getStaffActivityDetails: typeof reportsExportEndpoints.getModule.getStaffActivityDetails;
         getProductSalesReport: typeof reportsExportEndpoints.getModule.getProductSalesReport;
         getProductSalesDrillDown: typeof reportsExportEndpoints.getModule.getProductSalesDrillDown;
         getPaymentLinesReport: typeof reportsExportEndpoints.getModule.getPaymentLinesReport;

package/src/interfaces/Product.ts

@@ -13,6 +13,10 @@ export interface ProductLineTotals {
     taxBreakdown?: ITaxBreakdownItem[],
     lineDiscountAmount: number
     productLineSubtotal: number
+    // Additive semantic fields. Only the calculator that can compute these natively sets them;
+    // the other mode's fallback is encoded in getProductLineTotals.
+    lineNetAfterDiscount?: number   // set by included calculator; for over_price productLineSubtotal already IS net-after-discount
+    lineGrossBeforeDiscount?: number // set by over_price calculator; for included productLineImportTotal already IS gross-before-discount
 }
 
 export interface IPriceOption {

package/src/utils/orders/calculateOrderTotal.test.js

@@ -926,5 +926,169 @@ describe("Calculate Order Total tests", () => {
   });
 
   
+  // ─── pricingBreakdown ───────────────────────────────────────────────────
+
+  it("pricingBreakdown: included, no discount — legacy fields unchanged, breakdown correct", () => {
+    ORDER_DEMO.store.taxesType = "included";
+    const { orderDto, customer, store, storeDiscounts, discountCodeObj } = ORDER_DEMO;
+    const result = calculateOrderTotal(orderDto, { customer }, store, false, storeDiscounts, discountCodeObj);
+
+    // Legacy fields must be preserved
+    expect(result.productTotal).toBe(54.22);
+    expect(result.productTotalWithoutDiscount).toBe(54.22);
+    expect(result.taxesTotal).toBe(8.68);
+    expect(result.subtotal).toBeCloseTo(46.74, 1); // net before discount for included
+
+    const bd = result.pricingBreakdown;
+    expect(bd.subtotalBeforeDiscountGross).toBe(54.22);
+    expect(bd.subtotalAfterDiscountGross).toBe(54.22);
+    expect(bd.discountTotalGross).toBe(0);
+    expect(bd.discountTotalNet).toBeCloseTo(0, 1);
+    expect(bd.taxesTotal).toBe(8.68);
+    expect(bd.totalBeforePaymentsGross).toBe(54.22);
+    expect(bd.total).toBeCloseTo(result.total, 2);
+
+    const dt = result.displayTotals;
+    expect(dt.subtotal).toBe(54.22);
+    expect(dt.taxesLabel).toBe("taxesIncluded");
+    expect(dt.total).toBeCloseTo(result.total, 2);
+  });
+
+  it("pricingBreakdown: over_price, no discount — legacy fields unchanged, breakdown correct", () => {
+    ORDER_DEMO.store.taxesType = "over_price";
+    const { orderDto, customer, store, storeDiscounts, discountCodeObj } = ORDER_DEMO;
+    const result = calculateOrderTotal(orderDto, { customer }, store, false, storeDiscounts, discountCodeObj);
+
+    // product: price=17, qty=3.7, tax=16% over_price
+    // net before discount = 17 * 3.7 = 62.9
+    // gross before discount = 62.9 * 1.16 = 72.964 ≈ 72.96
+    expect(result.productTotal).toBeCloseTo(72.96, 1);
+    expect(result.productTotalWithoutDiscount).toBeCloseTo(62.9, 2);
+
+    const bd = result.pricingBreakdown;
+    expect(bd.subtotalBeforeDiscountNet).toBeCloseTo(62.9, 2);
+    expect(bd.subtotalAfterDiscountNet).toBeCloseTo(62.9, 2);
+    expect(bd.subtotalBeforeDiscountGross).toBeCloseTo(72.96, 1);
+    expect(bd.subtotalAfterDiscountGross).toBeCloseTo(72.96, 1);
+    expect(bd.discountTotalNet).toBe(0);
+    expect(bd.discountTotalGross).toBeCloseTo(0, 1);
+
+    const dt = result.displayTotals;
+    expect(dt.subtotal).toBeCloseTo(62.9, 2); // net (= price tag for over_price)
+    expect(dt.taxesLabel).toBe("taxesTotal");
+  });
+
+  it("pricingBreakdown: included + NUMBER coupon $30 on $50 product (acceptance criteria issue#40)", () => {
+    // Setup: product price=$50 gross (tax=16% included), qty=1, NUMBER coupon=$30
+    ORDER_DEMO.store.taxesType = "included";
+    ORDER_DEMO.orderDto.products = [{
+      _id: "prod1",
+      name: "Test",
+      price: 50,
+      expressPrice: 50,
+      qty: 1,
+      quantity: 1,
+      extraAmount: 0,
+      taxExemptOne: false, taxExemptTwo: false, taxExemptThree: false,
+      discountAmount: 0,
+    }];
+    ORDER_DEMO.orderDto.buyAndGetProducts = [];
+    ORDER_DEMO.orderDto.discountCode = "THIRTY";
+    ORDER_DEMO.discountCodeObj = {
+      _id: "dc1",
+      type: "number",
+      value: 30,
+      applyToAllProducts: true,
+      applyOnceOnOrder: true,
+      products: [],
+      freeProductSetting: [],
+      buyAndGetConditions: [],
+    };
+
+    const { orderDto, customer, store, storeDiscounts } = ORDER_DEMO;
+    const result = calculateOrderTotal(orderDto, { customer }, store, false, storeDiscounts, ORDER_DEMO.discountCodeObj);
+
+    // gross before discount = 50, NUMBER $30 applied pre-tax
+    // net before discount = 50/1.16 ≈ 43.10
+    // gross after discount = 50 - 30 = 20
+    // tax on $20 gross = 20 - 20/1.16 ≈ 2.76
+    expect(result.productTotalWithoutDiscount).toBe(50);      // gross-before-discount (display subtotal)
+    expect(result.productTotal).toBeCloseTo(20, 1);           // gross-after-discount
+    expect(result.totalDiscountAmount).toBe(30);              // user-facing discount
+    expect(result.taxesTotal).toBeCloseTo(2.76, 1);
+    expect(result.total).toBeCloseTo(20, 1);
+
+    const bd = result.pricingBreakdown;
+    expect(bd.subtotalBeforeDiscountGross).toBe(50);
+    expect(bd.subtotalAfterDiscountGross).toBeCloseTo(20, 1);
+    expect(bd.discountTotalGross).toBeCloseTo(30, 1);
+    expect(bd.subtotalBeforeDiscountNet).toBeCloseTo(43.1, 1);
+    expect(bd.subtotalAfterDiscountNet).toBeCloseTo(17.24, 1);
+    expect(bd.discountTotalNet).toBeCloseTo(25.86, 1);
+    expect(bd.taxesTotal).toBeCloseTo(2.76, 1);
+    expect(bd.totalBeforePaymentsGross).toBeCloseTo(20, 1);
+    expect(bd.total).toBeCloseTo(20, 1);
+
+    const dt = result.displayTotals;
+    expect(dt.subtotal).toBe(50);
+    expect(dt.discount).toBe(30);
+    expect(dt.taxesLabel).toBe("taxesIncluded");
+    expect(dt.total).toBeCloseTo(20, 1);
+  });
+
+  it("pricingBreakdown: over_price + NUMBER coupon $30 on $50 product (acceptance criteria issue#40)", () => {
+    ORDER_DEMO.store.taxesType = "over_price";
+    ORDER_DEMO.orderDto.products = [{
+      _id: "prod1",
+      name: "Test",
+      price: 50,
+      expressPrice: 50,
+      qty: 1,
+      quantity: 1,
+      extraAmount: 0,
+      taxExemptOne: false, taxExemptTwo: false, taxExemptThree: false,
+      discountAmount: 0,
+    }];
+    ORDER_DEMO.orderDto.buyAndGetProducts = [];
+    ORDER_DEMO.orderDto.discountCode = "THIRTY";
+    ORDER_DEMO.discountCodeObj = {
+      _id: "dc1",
+      type: "number",
+      value: 30,
+      applyToAllProducts: true,
+      applyOnceOnOrder: true,
+      products: [],
+      freeProductSetting: [],
+      buyAndGetConditions: [],
+    };
+
+    const { orderDto, customer, store, storeDiscounts } = ORDER_DEMO;
+    const result = calculateOrderTotal(orderDto, { customer }, store, false, storeDiscounts, ORDER_DEMO.discountCodeObj);
+
+    // net before discount = 50; NUMBER $30 net; net after discount = 20
+    // tax = 20 * 0.16 = 3.20; total = 23.20
+    expect(result.productTotalWithoutDiscount).toBe(50);      // net-before-discount (display subtotal for over_price)
+    expect(result.totalDiscountAmount).toBe(30);
+    expect(result.taxesTotal).toBeCloseTo(3.2, 1);
+    expect(result.total).toBeCloseTo(23.2, 1);
+
+    const bd = result.pricingBreakdown;
+    expect(bd.subtotalBeforeDiscountNet).toBe(50);
+    expect(bd.subtotalAfterDiscountNet).toBeCloseTo(20, 1);
+    expect(bd.discountTotalNet).toBeCloseTo(30, 1);
+    expect(bd.subtotalBeforeDiscountGross).toBeCloseTo(58, 1);  // 50 * 1.16
+    expect(bd.subtotalAfterDiscountGross).toBeCloseTo(23.2, 1); // 20 * 1.16
+    expect(bd.discountTotalGross).toBeCloseTo(34.8, 1);         // 30 * 1.16
+    expect(bd.taxesTotal).toBeCloseTo(3.2, 1);
+    expect(bd.totalBeforePaymentsGross).toBeCloseTo(23.2, 1);
+    expect(bd.total).toBeCloseTo(23.2, 1);
+
+    const dt = result.displayTotals;
+    expect(dt.subtotal).toBe(50);  // net = display price for over_price
+    expect(dt.discount).toBe(30);
+    expect(dt.taxesLabel).toBe("taxesTotal");
+    expect(dt.total).toBeCloseTo(23.2, 1);
+  });
+
   // Add more test cases as needed
 });

package/src/utils/orders/calculateOrderTotal.ts

@@ -106,7 +106,9 @@ export const calculateOrderTotal = (
       totalImporTaxes,
       totalDiscountAmount,
       totalSubtotalAmount,
-      taxBreakdown
+      taxBreakdown,
+      totalNetAfterDiscount,
+      totalGrossBeforeDiscount,
     } = getProductLineTotals(productTableImports);
 
     // NOTE: the old post-tax "discountCodeAmount" subtraction was removed.
@@ -141,6 +143,50 @@ export const calculateOrderTotal = (
       redeemPointsDiscount
     ).toFixed(2);
 
+    // === PRICING BREAKDOWN ===
+    // For included: totalImportWithoutDiscount=gross-before-discount, totalSubtotalAmount=net-before-discount
+    // For over_price: totalImportWithoutDiscount=net-before-discount, totalSubtotalAmount=net-after-discount
+    const taxMode = storeSettings?.taxesType === 'over_price' ? 'over_price' : 'included';
+    const subtotalBeforeDiscountNet =
+      taxMode === 'included' ? totalSubtotalAmount : totalImportWithoutDiscount;
+    const subtotalAfterDiscountNet =
+      taxMode === 'included' ? totalNetAfterDiscount : totalSubtotalAmount;
+    const subtotalBeforeDiscountGross =
+      taxMode === 'included' ? totalImportWithoutDiscount : totalGrossBeforeDiscount;
+    const subtotalAfterDiscountGross = totalImportWithDiscount;
+
+    const pricingBreakdown = {
+      subtotalBeforeDiscountNet,
+      subtotalAfterDiscountNet,
+      subtotalBeforeDiscountGross,
+      subtotalAfterDiscountGross,
+      discountTotalNet: +(subtotalBeforeDiscountNet - subtotalAfterDiscountNet).toFixed(2),
+      discountTotalGross: +(subtotalBeforeDiscountGross - subtotalAfterDiscountGross).toFixed(2),
+      taxesTotal: totalImporTaxes,
+      shippingServiceTotal: shippingCost,
+      creditApplied,
+      redeemPointsApplied: redeemPointsDiscount,
+      totalBeforePaymentsGross: orderTotalWithOutCredit,
+      total: orderTotal,
+    };
+
+    // For included: non-NUMBER lineDiscountAmount is net (discountAmountPerUnit*qty), so
+    // totalDiscountAmount is mixed-semantic. Use discountTotalGross (gross-before minus gross-after)
+    // which is unambiguously user-facing in both modes.
+    const displayDiscount =
+      taxMode === 'included' ? pricingBreakdown.discountTotalGross : pricingBreakdown.discountTotalNet;
+
+    const displayTotals = {
+      subtotal: totalImportWithoutDiscount, // display-safe: gross (included) or net (over_price) — both equal the price-tag amount
+      discount: displayDiscount,
+      taxesTotal: totalImporTaxes,
+      taxesLabel: taxMode === 'included' ? 'taxesIncluded' as const : 'taxesTotal' as const,
+      shippingServiceTotal: shippingCost,
+      creditApplied,
+      redeemPointsApplied: redeemPointsDiscount,
+      total: orderTotal,
+    };
+
     // === RETURN FINAL OBJECT ===
     return {
       ...order,
@@ -151,12 +197,14 @@ export const calculateOrderTotal = (
       taxBreakdown,
       total: orderTotal,
       creditApplied,
-      redeemPointsApplied: redeemPointsDiscount, // ✅ NUEVO CAMPO
+      redeemPointsApplied: redeemPointsDiscount,
       productTotalWithoutDiscount: totalImportWithoutDiscount,
       totalDiscountAmount: totalDiscountAmount,
       shippingServiceTotal: shippingCost,
       appliedOrderDiscounts,
-      subtotal: totalSubtotalAmount
+      subtotal: totalSubtotalAmount,
+      pricingBreakdown,
+      displayTotals,
     };
   } catch (error) {
     throw error;

package/src/utils/orders/calculateTotalTaxesIncluded.ts

@@ -161,7 +161,8 @@ export const calculateTotalTaxesIncluded = (
       productLineTaxesTotal: totalTaxesApplied,
       taxBreakdown,
       lineDiscountAmount: lineDiscount,
-      productLineSubtotal: productNetTotalWithoutDiscount // Subtotal neto (sin IVA)
+      productLineSubtotal: productNetTotalWithoutDiscount, // Subtotal neto (sin IVA) — for included this is NET before discount
+      lineNetAfterDiscount: productNetTotalWithDiscount,   // NET after discount — needed to derive pricingBreakdown
     };
   });
   return productTableImports;

package/src/utils/orders/calculateTotalTaxesOverPrice.ts

@@ -133,18 +133,22 @@ export const calculateTotalTaxesOverPrice = (
     // Precio total con descuento, reaplicando impuestos
     const prodLinePriceWithDiscount = +((subtotal * (1 + taxPercentage))).toFixed(2);
 
+    // GROSS before discount: net-before-discount * (1 + tax). Needed to derive pricingBreakdown.
+    const lineGrossBeforeDiscount = +((productBasePrice * qty + extraAmount) * (1 + taxPercentage)).toFixed(2);
+
     return {
       product: current,
       qty,
-      // Total bruto original sin descuento: (precio base * cantidad) + extraAmount
+      // Total neto original sin descuento: (precio base * cantidad) + extraAmount
       productLineImportTotal: (productBasePrice * qty) + extraAmount,
       // Total final con descuento, con impuestos incluidos
       productLineTotalWithDiscount: prodLinePriceWithDiscount,
       productLineTaxesTotal: totalTaxesApplied,
       taxBreakdown,
       lineDiscountAmount: lineDiscount,
-      // Subtotal neto (sin impuestos) con descuento aplicado
-      productLineSubtotal: subtotal
+      // Subtotal neto (sin impuestos) con descuento aplicado — for over_price this is NET after discount
+      productLineSubtotal: subtotal,
+      lineGrossBeforeDiscount, // GROSS before discount — needed to derive pricingBreakdown
     };
   });
   return productTableImports;

package/src/utils/orders/helpers.ts

@@ -317,6 +317,15 @@ export const getProductLineTotals = (productLinesTotals: ProductLineTotals[]) =>
     totalImporTaxes
   );
 
+  // lineNetAfterDiscount is set by the included calculator (for over_price, productLineSubtotal IS net-after-discount)
+  // lineGrossBeforeDiscount is set by the over_price calculator (for included, productLineImportTotal IS gross-before-discount)
+  const totalNetAfterDiscount = +productLinesTotals
+    .reduce((acum, line) => acum + (line.lineNetAfterDiscount ?? line.productLineSubtotal), 0)
+    .toFixed(2);
+  const totalGrossBeforeDiscount = +productLinesTotals
+    .reduce((acum, line) => acum + (line.lineGrossBeforeDiscount ?? line.productLineImportTotal), 0)
+    .toFixed(2);
+
   return {
     totalQuantity,
     totalImportWithDiscount,
@@ -324,7 +333,9 @@ export const getProductLineTotals = (productLinesTotals: ProductLineTotals[]) =>
     totalImporTaxes,
     totalDiscountAmount,
     totalSubtotalAmount,
-    taxBreakdown
+    taxBreakdown,
+    totalNetAfterDiscount,
+    totalGrossBeforeDiscount,
   };
 };
 

package/test/orders.pricingBreakdown.test.ts

@@ -0,0 +1,294 @@
+import { utils } from "../src";
+
+const noCustomer = { customer: { credit: 0, discount: 0 } };
+
+const storeIncluded = {
+  taxesType: "included",
+  taxOne: { name: "IVA", value: 16 },
+  orderPageConfig: { shippingServiceCost: 0 },
+} as any;
+
+const storeOverPrice = {
+  taxesType: "over_price",
+  taxOne: { name: "IVA", value: 16 },
+  orderPageConfig: { shippingServiceCost: 0 },
+} as any;
+
+const singleProduct = (price: number, qty = 1) => ({
+  express: false,
+  products: [
+    {
+      _id: "p1",
+      qty,
+      quantity: qty,
+      price,
+      expressPrice: price,
+      extraAmount: 0,
+      taxExemptOne: false,
+      taxExemptTwo: false,
+      taxExemptThree: false,
+      discountAmount: 0,
+    },
+  ],
+  buyAndGetProducts: [],
+  discountCode: null,
+});
+
+const numberCoupon = (value: number) => ({
+  _id: "dc1",
+  type: "number",
+  value,
+  applyToAllProducts: true,
+  applyOnceOnOrder: true,
+  products: [],
+  freeProductSetting: [],
+  buyAndGetConditions: [],
+});
+
+describe("pricingBreakdown and displayTotals", () => {
+  describe("included mode — no discount", () => {
+    it("all gross fields equal productTotal; net fields are net; legacy fields unchanged", () => {
+      const result = utils.calculateOrderTotal(
+        { ...singleProduct(50), discountCode: null },
+        noCustomer as any,
+        storeIncluded,
+        false,
+        [],
+        null,
+        0,
+      );
+
+      // Legacy fields
+      expect(result.productTotalWithoutDiscount).toBe(50);
+      expect(result.productTotal).toBe(50);
+      expect(result.totalDiscountAmount).toBe(0);
+
+      const bd = result.pricingBreakdown;
+      expect(bd.subtotalBeforeDiscountGross).toBe(50);
+      expect(bd.subtotalAfterDiscountGross).toBe(50);
+      expect(bd.discountTotalGross).toBe(0);
+      expect(bd.subtotalBeforeDiscountNet).toBeCloseTo(43.1, 1);
+      expect(bd.subtotalAfterDiscountNet).toBeCloseTo(43.1, 1);
+      expect(bd.discountTotalNet).toBeCloseTo(0, 2);
+
+      const dt = result.displayTotals;
+      expect(dt.subtotal).toBe(50);
+      expect(dt.taxesLabel).toBe("taxesIncluded");
+      expect(dt.discount).toBe(0);
+    });
+  });
+
+  describe("over_price mode — no discount", () => {
+    it("net fields equal productTotalWithoutDiscount; gross fields = net * 1.16; legacy unchanged", () => {
+      const result = utils.calculateOrderTotal(
+        { ...singleProduct(50), discountCode: null },
+        noCustomer as any,
+        storeOverPrice,
+        false,
+        [],
+        null,
+        0,
+      );
+
+      expect(result.productTotalWithoutDiscount).toBe(50);
+      expect(result.productTotal).toBeCloseTo(58, 0); // 50 * 1.16
+
+      const bd = result.pricingBreakdown;
+      expect(bd.subtotalBeforeDiscountNet).toBe(50);
+      expect(bd.subtotalAfterDiscountNet).toBe(50);
+      expect(bd.discountTotalNet).toBe(0);
+      expect(bd.subtotalBeforeDiscountGross).toBeCloseTo(58, 0);
+      expect(bd.subtotalAfterDiscountGross).toBeCloseTo(58, 0);
+      expect(bd.discountTotalGross).toBeCloseTo(0, 1);
+
+      const dt = result.displayTotals;
+      expect(dt.subtotal).toBe(50);
+      expect(dt.taxesLabel).toBe("taxesTotal");
+      expect(dt.discount).toBe(0);
+    });
+  });
+
+  describe("included mode + NUMBER $30 on $50 product (issue #40 acceptance criteria)", () => {
+    it("gross fields correct; net fields correct; display subtotal = $50", () => {
+      const order = { ...singleProduct(50), discountCode: "THIRTY" };
+      const coupon = numberCoupon(30);
+
+      const result = utils.calculateOrderTotal(
+        order as any,
+        noCustomer as any,
+        storeIncluded,
+        false,
+        [],
+        coupon as any,
+        0,
+      );
+
+      // Legacy fields must be preserved
+      expect(result.productTotalWithoutDiscount).toBe(50);
+      expect(result.productTotal).toBeCloseTo(20, 1);
+      expect(result.totalDiscountAmount).toBe(30);
+      expect(result.taxesTotal).toBeCloseTo(2.76, 1);
+      expect(result.total).toBeCloseTo(20, 1);
+
+      const bd = result.pricingBreakdown;
+      expect(bd.subtotalBeforeDiscountGross).toBe(50);
+      expect(bd.subtotalAfterDiscountGross).toBeCloseTo(20, 1);
+      expect(bd.discountTotalGross).toBeCloseTo(30, 1);
+      expect(bd.subtotalBeforeDiscountNet).toBeCloseTo(43.1, 1);
+      expect(bd.subtotalAfterDiscountNet).toBeCloseTo(17.24, 1);
+      expect(bd.discountTotalNet).toBeCloseTo(25.86, 1);
+      expect(bd.taxesTotal).toBeCloseTo(2.76, 1);
+      expect(bd.totalBeforePaymentsGross).toBeCloseTo(20, 1);
+      expect(bd.total).toBeCloseTo(20, 1);
+
+      const dt = result.displayTotals;
+      expect(dt.subtotal).toBe(50);
+      expect(dt.discount).toBe(30);
+      expect(dt.taxesLabel).toBe("taxesIncluded");
+      expect(dt.total).toBeCloseTo(20, 1);
+    });
+  });
+
+  describe("over_price mode + NUMBER $30 on $50 product (issue #40 acceptance criteria)", () => {
+    it("net fields correct; gross fields = net * 1.16; display subtotal = $50", () => {
+      const order = { ...singleProduct(50), discountCode: "THIRTY" };
+      const coupon = numberCoupon(30);
+
+      const result = utils.calculateOrderTotal(
+        order as any,
+        noCustomer as any,
+        storeOverPrice,
+        false,
+        [],
+        coupon as any,
+        0,
+      );
+
+      // Legacy fields
+      expect(result.productTotalWithoutDiscount).toBe(50);
+      expect(result.totalDiscountAmount).toBe(30);
+      expect(result.taxesTotal).toBeCloseTo(3.2, 1);
+      expect(result.total).toBeCloseTo(23.2, 1);
+
+      const bd = result.pricingBreakdown;
+      expect(bd.subtotalBeforeDiscountNet).toBe(50);
+      expect(bd.subtotalAfterDiscountNet).toBeCloseTo(20, 1);
+      expect(bd.discountTotalNet).toBeCloseTo(30, 1);
+      expect(bd.subtotalBeforeDiscountGross).toBeCloseTo(58, 0);
+      expect(bd.subtotalAfterDiscountGross).toBeCloseTo(23.2, 1);
+      expect(bd.discountTotalGross).toBeCloseTo(34.8, 1);
+      expect(bd.taxesTotal).toBeCloseTo(3.2, 1);
+      expect(bd.totalBeforePaymentsGross).toBeCloseTo(23.2, 1);
+      expect(bd.total).toBeCloseTo(23.2, 1);
+
+      const dt = result.displayTotals;
+      expect(dt.subtotal).toBe(50);
+      expect(dt.discount).toBe(30);
+      expect(dt.taxesLabel).toBe("taxesTotal");
+      expect(dt.total).toBeCloseTo(23.2, 1);
+    });
+  });
+
+  describe("displayTotals.discount — included + PERCENTAGE coupon", () => {
+    it("uses discountTotalGross (not net lineDiscountAmount) as display discount", () => {
+      // 20% PERCENTAGE coupon on $50 gross (included, 16% tax)
+      // net-before-discount = 50/1.16 ≈ 43.10; discount net = 43.10*0.20 ≈ 8.62
+      // gross-before-discount = 50; gross-after-discount = 50*0.80 = 40
+      // discountTotalGross = 50 - 40 = 10 (user sees "$10 off")
+      // discountTotalNet = 43.10 - 34.48 ≈ 8.62
+      const order = {
+        ...singleProduct(50),
+        discountCode: "PCT20",
+      };
+      const percentageCoupon = {
+        _id: "dc2",
+        type: "percentage",
+        value: 20,
+        applyToAllProducts: true,
+        applyOnceOnOrder: false,
+        products: [],
+        freeProductSetting: [],
+        buyAndGetConditions: [],
+      };
+
+      const result = utils.calculateOrderTotal(
+        order as any,
+        noCustomer as any,
+        storeIncluded,
+        false,
+        [],
+        percentageCoupon as any,
+        0,
+      );
+
+      const bd = result.pricingBreakdown;
+      const dt = result.displayTotals;
+
+      expect(bd.discountTotalGross).toBeCloseTo(10, 1);
+      expect(bd.discountTotalNet).toBeCloseTo(8.62, 1);
+
+      // displayTotals.discount must equal discountTotalGross for included mode
+      expect(dt.discount).toBeCloseTo(10, 1);
+      expect(dt.discount).toBe(bd.discountTotalGross);
+    });
+  });
+
+  describe("displayTotals.discount — over_price + PERCENTAGE coupon", () => {
+    it("uses discountTotalNet (= user-facing discount for over_price) as display discount", () => {
+      // 20% PERCENTAGE coupon on $50 net (over_price, 16% tax)
+      // discount net = 50*0.20 = 10; net-after = 40; gross-after = 40*1.16 = 46.40
+      const order = {
+        ...singleProduct(50),
+        discountCode: "PCT20",
+      };
+      const percentageCoupon = {
+        _id: "dc2",
+        type: "percentage",
+        value: 20,
+        applyToAllProducts: true,
+        applyOnceOnOrder: false,
+        products: [],
+        freeProductSetting: [],
+        buyAndGetConditions: [],
+      };
+
+      const result = utils.calculateOrderTotal(
+        order as any,
+        noCustomer as any,
+        storeOverPrice,
+        false,
+        [],
+        percentageCoupon as any,
+        0,
+      );
+
+      const bd = result.pricingBreakdown;
+      const dt = result.displayTotals;
+
+      expect(bd.discountTotalNet).toBeCloseTo(10, 1);
+
+      // displayTotals.discount must equal discountTotalNet for over_price mode
+      expect(dt.discount).toBeCloseTo(10, 1);
+      expect(dt.discount).toBe(bd.discountTotalNet);
+    });
+  });
+
+  describe("shipping included in totalBeforePaymentsGross", () => {
+    it("included: totalBeforePaymentsGross = subtotalAfterDiscountGross + shipping", () => {
+      const storeWithShipping = { ...storeIncluded, orderPageConfig: { shippingServiceCost: 10 } };
+      const result = utils.calculateOrderTotal(
+        { ...singleProduct(50), discountCode: null } as any,
+        noCustomer as any,
+        storeWithShipping,
+        true, // hasShippingCost
+        [],
+        null,
+        0,
+      );
+
+      const bd = result.pricingBreakdown;
+      expect(bd.shippingServiceTotal).toBe(10);
+      expect(bd.totalBeforePaymentsGross).toBeCloseTo(60, 1); // 50 + 10
+    });
+  });
+});