washday-sdk 0.0.160 → 0.0.162

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

@@ -1,8 +1,8 @@
 // myModule.test.js
 import { calculateOrderTotal } from "./index";
 
-describe("sum function", () => {
-  const ORDER_DEMO = {
+describe("Calculate Order Total tests", () => {
+  let ORDER_DEMO = {
     orderDto: {
       deliveryDateFormatted: "lunes 08 abr.",
       pickupInfo: null,
@@ -347,9 +347,394 @@ describe("sum function", () => {
   };
   beforeEach(() => {
     // Run this setup function before each test case
+    ORDER_DEMO = {
+      orderDto: {
+        deliveryDateFormatted: "lunes 08 abr.",
+        pickupInfo: null,
+        deliveryInfo: {
+          date: "2024-04-09T05:00:00.000Z",
+          fromTime: "2024-04-08T21:00:00.000Z",
+        },
+        express: false,
+        products: [
+          {
+            extraAmount: 0,
+            type: "weight",
+            showInApp: true,
+            order: 0,
+            invoice_description: "",
+            invoice_product_key: "",
+            invoice_product_unit_key: "",
+            invoice_product_unit_name: "",
+            productType: "storeProduct",
+            _id: "62d186387ec9330016319594",
+            name: "Lavado por kilo",
+            price: 17,
+            expressPrice: 20,
+            pieces: "1",
+            sku: "lavxkilo",
+            overlayText: "Lavado por kilo",
+            image: "6184782c3927a40018e36dea",
+            taxExemptOne: false,
+            taxExemptTwo: false,
+            taxExemptThree: false,
+            isActive: true,
+            store: "629c267812db5b001692adae",
+            owner: "629c267812db5b001692ada4",
+            productSupplies: [
+              {
+                usageAmount: 25,
+                _id: "62d6151fac2fc200166d0304",
+                supplyId: "62d35942c642440016cfcda8",
+              },
+            ],
+            __v: 1,
+            discountAmount: 0,
+            quantity: 3.7,
+            productId: "62d186387ec9330016319594",
+            qty: 3.7,
+          },
+        ],
+        taxesType: "included",
+        total: 62.9,
+        customer: "66147eecae83bb001540dd96",
+        store: "629c267812db5b001692adae",
+        paymentMethod: "delivery",
+        notifyBy: "none",
+        pickup: false,
+        delivery: false,
+        phone: "",
+        email: "",
+        address: "",
+        notes: "",
+        privateNotes: "",
+        creditApplied: 0,
+        amountPaid: 0,
+        customerInfo: {
+          password: "",
+          google: false,
+          facebook: false,
+          apple: false,
+          useStoreApp: false,
+          discount: 0,
+          credit: 0,
+          isActive: true,
+          createdDate: "2024-04-08T23:34:04.586Z",
+          stripeCustomerId: "",
+          invoiceInfo: {
+            _id: "66147eecae83bb001540dd95",
+            legal_name: "",
+            tax_system: "",
+            zipCode: "",
+          },
+          _id: "66147eecae83bb001540dd96",
+          name: "Carlos Piña 🍍",
+          phone: "",
+          address: "",
+          notes: "",
+          privateNotes: "",
+          rfc: "",
+          createdBy: "62d194d77ec933001631e831",
+          createdIn: "629c267812db5b001692adae",
+          company: "629c267712db5b001692ad9e",
+          paymentMethods: [],
+          __v: 0,
+          title: "Carlos Piña 🍍",
+          id: "66147eecae83bb001540dd96",
+        },
+        customerName: "Carlos Piña 🍍",
+        pickingUpDateTime: null,
+        cleanedDateTime: null,
+        readyDateTime: null,
+        deliveringDateTime: null,
+        collectedDateTime: null,
+        cancelledDateTime: null,
+        paidDateTime: null,
+        status: "cleaning",
+        prepaidAmount: 0,
+        prepaidPaymentMethod: "",
+        customerDiscount: 0,
+        productTotal: 54.22,
+        taxesTotal: 8.68,
+        productTotalWithoutDiscount: 54.22,
+        totalDiscountAmount: 0,
+        shippingServiceTotal: 0,
+        discountsToApply: [],
+        usePrepaid: false,
+        cashierBox: "629c267812db5b001692adb3",
+        discountCode: "",
+        buyAndGetProducts: [],
+        deliveryRoute: null,
+        pickupRoute: null,
+        createdDate: "2024-04-08T23:34:48.950Z",
+      },
+      customer: {
+        customer: {
+          password: "",
+          google: false,
+          facebook: false,
+          apple: false,
+          useStoreApp: false,
+          discount: 0,
+          credit: 0,
+          isActive: true,
+          createdDate: "2024-04-08T23:34:04.586Z",
+          stripeCustomerId: "",
+          invoiceInfo: {
+            _id: "66147eecae83bb001540dd95",
+            legal_name: "",
+            tax_system: "",
+            zipCode: "",
+          },
+          _id: "66147eecae83bb001540dd96",
+          name: "Carlos Piña 🍍",
+          phone: "",
+          address: "",
+          notes: "",
+          privateNotes: "",
+          rfc: "",
+          createdBy: "62d194d77ec933001631e831",
+          createdIn: "629c267812db5b001692adae",
+          company: "629c267712db5b001692ad9e",
+          paymentMethods: [],
+          __v: 0,
+        },
+      },
+      store: {
+        taxesType: "included",
+        notificationConfig: {
+          notifyOrderCreated: false,
+          notifyPickedUp: false,
+          notifyCleaned: true,
+          notifyCollected: false,
+          notifyDelivered: false,
+          notifyOwnerOnOrderCreated: false,
+          notifyEmail: "",
+          _id: "62a2d05fd0a7c800160869bc",
+        },
+        paymentConfig: {
+          defaultPaymentMethod: "delivery",
+          _id: "63650e8dcfa0e30016729776",
+        },
+        orderPageConfig: {
+          defaultDeliveryDate: "0",
+          defaultDeliveryTime: "18:00",
+          defaultNotifyMethod: "none",
+          printTicketAfterOrder: true,
+          shippingServiceCost: 0,
+          showProductSearchBarWeb: true,
+          _id: "6407b53301a1aa00141b217e",
+        },
+        _id: "629c267812db5b001692adae",
+        name: "Clean & Go",
+        phone: "9983524573",
+        inventory: [],
+        discountCodes: [
+          {
+            type: "percentage",
+            value: 14,
+            products: [
+              "62d1893f7ec933001631ab24",
+              "62d189697ec933001631acab",
+              "62d19a287ec933001632156f",
+              "62d199117ec9330016320ec0",
+              "62d198e07ec9330016320cc7",
+              "62d191d67ec933001631cd76",
+              "62d191747ec933001631c9cc",
+              "62d191ad7ec933001631cbef",
+            ],
+            applyToAllProducts: false,
+            applyOnceOnOrder: false,
+            hasUseLimit: false,
+            useLimitQty: 0,
+            usedCounter: 0,
+            onePerCustomer: true,
+            isActive: true,
+            buyAndGetConditions: [],
+            _id: "62d1ae1b7ec9330016328166",
+            name: "Anfitriones Airbnb",
+            code: "AIRBNBANF",
+            fromDate: "2022-07-01T05:00:00.000Z",
+            toDate: "2022-08-01T04:59:59.999Z",
+            fromTime: "00:00",
+            toTime: "23:59",
+            createdBy: "629c267812db5b001692ada4",
+            createdAt: "2022-07-15T18:12:43.506Z",
+            updatedAt: "2022-07-15T18:12:43.506Z",
+          },
+          {
+            type: "percentage",
+            value: 20,
+            products: [],
+            applyToAllProducts: true,
+            applyOnceOnOrder: false,
+            hasUseLimit: false,
+            useLimitQty: 0,
+            usedCounter: 0,
+            onePerCustomer: true,
+            isActive: true,
+            buyAndGetConditions: [],
+            _id: "635821305b689d0016c97f8c",
+            name: "Descuento por comentarios",
+            code: "20DESC01",
+            fromDate: "2022-01-01T05:00:00.000Z",
+            toDate: "2023-01-01T04:59:59.999Z",
+            fromTime: "00:00",
+            toTime: "23:59",
+            createdBy: "629c267812db5b001692ada4",
+            createdAt: "2022-10-25T17:47:28.314Z",
+            updatedAt: "2022-10-25T17:47:28.314Z",
+          },
+          {
+            type: "percentage",
+            value: 20,
+            products: [],
+            applyToAllProducts: true,
+            applyOnceOnOrder: false,
+            hasUseLimit: false,
+            useLimitQty: 0,
+            usedCounter: 0,
+            onePerCustomer: true,
+            isActive: true,
+            buyAndGetConditions: [],
+            _id: "6359c5d21332cf00168c5008",
+            name: "Descuento por comentario",
+            code: "20DESC02",
+            fromDate: "2022-01-01T05:00:00.000Z",
+            toDate: "2023-01-01T04:59:59.999Z",
+            fromTime: "00:00",
+            toTime: "23:59",
+            createdBy: "62d194d77ec933001631e831",
+            createdAt: "2022-10-26T23:42:10.732Z",
+            updatedAt: "2022-10-26T23:42:10.732Z",
+          },
+          {
+            type: "percentage",
+            value: 19,
+            products: [],
+            applyToAllProducts: true,
+            applyOnceOnOrder: false,
+            hasUseLimit: false,
+            useLimitQty: 0,
+            usedCounter: 0,
+            onePerCustomer: true,
+            isActive: true,
+            buyAndGetConditions: [],
+            _id: "6359c5ef1332cf00168c516d",
+            name: "Descuento por comentario",
+            code: "20DESC03",
+            fromDate: "2022-01-01T05:00:00.000Z",
+            toDate: "2023-01-01T04:59:59.999Z",
+            fromTime: "00:00",
+            toTime: "23:59",
+            createdBy: "62d194d77ec933001631e831",
+            createdAt: "2022-10-26T23:42:39.555Z",
+            updatedAt: "2022-10-26T23:42:39.555Z",
+          },
+          {
+            type: "percentage",
+            value: 20,
+            products: [],
+            applyToAllProducts: true,
+            applyOnceOnOrder: false,
+            hasUseLimit: false,
+            useLimitQty: 0,
+            usedCounter: 0,
+            onePerCustomer: true,
+            isActive: true,
+            buyAndGetConditions: [],
+            _id: "6359c60c1332cf00168c52c6",
+            name: "Descuento por comentario",
+            code: "20DESC04",
+            fromDate: "2022-01-01T05:00:00.000Z",
+            toDate: "2023-01-01T04:59:59.999Z",
+            fromTime: "00:00",
+            toTime: "23:59",
+            createdBy: "62d194d77ec933001631e831",
+            createdAt: "2022-10-26T23:43:08.577Z",
+            updatedAt: "2022-10-26T23:43:08.577Z",
+          },
+          {
+            type: "percentage",
+            value: 20,
+            products: [],
+            applyToAllProducts: true,
+            applyOnceOnOrder: false,
+            hasUseLimit: false,
+            useLimitQty: 0,
+            usedCounter: 0,
+            onePerCustomer: true,
+            isActive: true,
+            buyAndGetConditions: [],
+            _id: "6359c6261332cf00168c5468",
+            name: "Descuento por comentario",
+            code: "20DESC05",
+            fromDate: "2022-01-01T05:00:00.000Z",
+            toDate: "2023-01-01T04:59:59.999Z",
+            fromTime: "00:00",
+            toTime: "23:59",
+            createdBy: "62d194d77ec933001631e831",
+            createdAt: "2022-10-26T23:43:34.663Z",
+            updatedAt: "2022-10-26T23:43:34.663Z",
+          },
+        ],
+        taxOne: {
+          _id: "658bb2f376aa7b001482888c",
+          value: 16,
+          name: "IVA",
+        },
+        taxThree: null,
+        taxTwo: null,
+      },
+      hasShippingCost: false,
+      storeDiscounts: [],
+      discountCodeObj: null,
+    };
   });
-  it("test calculateOrderTotal taxes included", () => {
+
+  it("test calculateOrderTotal taxes included no extra amount", () => {
     // Test case
+    ORDER_DEMO.store.taxesType = "included";
+    ORDER_DEMO.taxesType = "included";
+    const { orderDto, customer, store, storeDiscounts, discountCodeObj } =
+      ORDER_DEMO;
+
+    const { ...informationNewPackage } = calculateOrderTotal(
+      orderDto,
+      { customer },
+      store,
+      orderDto.delivery || orderDto.pickup,
+      // storeDiscounts.data?.discounts || [],
+      storeDiscounts,
+      discountCodeObj
+    );
+
+    const res = {
+      totalDiscountAmount: informationNewPackage.totalDiscountAmount,
+      totalQuantity: informationNewPackage.totalQuantity,
+      totalImportWithDiscount: informationNewPackage.productTotal,
+      totalImportWithoutDiscount:
+        informationNewPackage.productTotalWithoutDiscount,
+      totalImporTaxes: informationNewPackage.taxesTotal,
+      shippingCost: informationNewPackage.shippingServiceTotal,
+      total: informationNewPackage.total,
+    };
+    expect(res).toEqual({
+      totalDiscountAmount: 0,
+      totalQuantity: 3.7,
+      totalImportWithDiscount: 54.22,
+      totalImportWithoutDiscount: 54.22,
+      totalImporTaxes: 8.68,
+      shippingCost: 0,
+      total: 54.22 + 8.68,
+    });
+  });
+
+
+  it("test calculateOrderTotal taxes over_price no extra amount", () => {
+    // Test case
+    ORDER_DEMO.store.taxesType = "over_price";
+    ORDER_DEMO.taxesType = "over_price";
     const {
       orderDto,
       customer,
@@ -377,21 +762,169 @@ describe("sum function", () => {
         informationNewPackage.productTotalWithoutDiscount,
       totalImporTaxes: informationNewPackage.taxesTotal,
       shippingCost: informationNewPackage.shippingServiceTotal,
+      total: informationNewPackage.total,
     };
+    expect(res).toEqual(
+      {
+        totalDiscountAmount: 0,
+        totalQuantity: 3.7,
+        totalImportWithDiscount: 62.9,
+        totalImportWithoutDiscount: 62.9,
+        totalImporTaxes: 10.06,
+        shippingCost: 0,
+        total: 72.96,
+      });
+  });
+
+  it("test calculateOrderTotal taxes included with extra amount", () => {
+    // Test case
+    ORDER_DEMO.orderDto.products[0].extraAmount = 50;
+    const {
+      orderDto,
+      customer,
+      store,
+      hasShippingCost,
+      storeDiscounts,
+      discountCodeObj,
+    } = ORDER_DEMO;
+
+    const { ...informationNewPackage } = calculateOrderTotal(
+      orderDto,
+      { customer },
+      store,
+      orderDto.delivery || orderDto.pickup,
+      // storeDiscounts.data?.discounts || [],
+      storeDiscounts,
+      discountCodeObj
+    );
+
+    const res = {
+      totalDiscountAmount: informationNewPackage.totalDiscountAmount,
+      totalQuantity: informationNewPackage.totalQuantity,
+      totalImportWithDiscount: informationNewPackage.productTotal,
+      totalImportWithoutDiscount:
+        informationNewPackage.productTotalWithoutDiscount,
+      totalImporTaxes: informationNewPackage.taxesTotal,
+      shippingCost: informationNewPackage.shippingServiceTotal,
+      total: informationNewPackage.total,
+      total: informationNewPackage.total,
+    };
+
     expect(res).toEqual({
+      total: 112.9,
       totalDiscountAmount: 0,
       totalQuantity: 3.7,
-      totalImportWithDiscount: 54.22,
-      totalImportWithoutDiscount: 54.22,
-      totalImporTaxes: 8.68,
+      totalImportWithDiscount: 97.33,
+      totalImportWithoutDiscount: 97.33,
+      totalImporTaxes: 15.57,
       shippingCost: 0,
     });
   });
 
-  it("should return 0 when adding two zeros", () => {
+  it("test calculateOrderTotal taxes over_price with extra amount", () => {
     // Test case
-    expect(sum(0, 0)).toBe(0);
+    ORDER_DEMO.orderDto.products[0].extraAmount = 50;
+    ORDER_DEMO.store.taxesType = "over_price";
+    ORDER_DEMO.taxesType = "over_price";
+    const {
+      orderDto,
+      customer,
+      store,
+      storeDiscounts,
+      discountCodeObj,
+    } = ORDER_DEMO;
+
+    const { ...informationNewPackage } = calculateOrderTotal(
+      orderDto,
+      { customer },
+      store,
+      orderDto.delivery || orderDto.pickup,
+      // storeDiscounts.data?.discounts || [],
+      storeDiscounts,
+      discountCodeObj
+    );
+
+    const res = {
+      totalDiscountAmount: informationNewPackage.totalDiscountAmount,
+      totalQuantity: informationNewPackage.totalQuantity,
+      totalImportWithDiscount: informationNewPackage.productTotal,
+      totalImportWithoutDiscount:
+        informationNewPackage.productTotalWithoutDiscount,
+      totalImporTaxes: informationNewPackage.taxesTotal,
+      shippingCost: informationNewPackage.shippingServiceTotal,
+      total: informationNewPackage.total,
+      total: informationNewPackage.total,
+    };
+
+    expect(res).toEqual({
+      total: 112.9 + 18.06,
+      totalDiscountAmount: 0,
+      totalQuantity: 3.7,
+      totalImportWithDiscount: 112.9,
+      totalImportWithoutDiscount: 112.9,
+      totalImporTaxes: 18.06,
+      shippingCost: 0,
+    });
+  });
+
+  it("test calculateOrderTotal taxes over_price with discount and sin extra amount", () => {
+    // Configurar el escenario:
+    // - Se asigna extraAmount = 0
+    // - Se activa un discountCode en orderDto y se provee un objeto discountCodeObj con descuento del 20%
+    ORDER_DEMO.orderDto.products[0].extraAmount = 0;
+    ORDER_DEMO.orderDto.discountCode = "DISCOUNT20";
+    ORDER_DEMO.discountCodeObj = {
+      type: "percentage",
+      value: 20,
+      applyToAllProducts: true,
+      products: [] // para todos, se ignora el filtrado
+    };
+    ORDER_DEMO.store.taxesType = "over_price";
+    ORDER_DEMO.taxesType = "over_price";
+  
+    const { orderDto, customer, store, storeDiscounts, discountCodeObj } = ORDER_DEMO;
+  
+    const informationNewPackage = calculateOrderTotal(
+      orderDto,
+      { customer },
+      store,
+      orderDto.delivery || orderDto.pickup,
+      storeDiscounts,
+      ORDER_DEMO.discountCodeObj
+    );
+  
+    // Con un precio base de 17, cantidad 3.7 y sin extraAmount:
+    // - Importe original sin descuento: 17 x 3.7 = 62.9
+    // - Con descuento del 20%: descuento por unidad = 17 x 0.20 = 3.4, 
+    //   precio descontado = 17 - 3.4 = 13.6, 
+    //   importe de producto con descuento = 13.6 x 3.7 = 50.32.
+    // - Impuestos (16% sobre subtotal): 112.9 es el subtotal si no se aplica descuento;
+    //   pero en "over_price" se calcula sobre (precio descontado x qty + extraAmount):
+    //   subtotal = 50.32, impuestos = 50.32 x 0.16 = 8.0512 ≈ 8.05.
+    // - Total a cobrar = 50.32 + 8.05 = 58.37.
+    // - El totalDiscountAmount (total de descuento aplicado) es 3.4 x 3.7 = 12.58.
+    
+    const res = {
+      totalDiscountAmount: informationNewPackage.totalDiscountAmount,
+      totalQuantity: informationNewPackage.totalQuantity,
+      totalImportWithDiscount: informationNewPackage.productTotal,
+      totalImportWithoutDiscount: informationNewPackage.productTotalWithoutDiscount,
+      totalImporTaxes: informationNewPackage.taxesTotal,
+      shippingCost: informationNewPackage.shippingServiceTotal,
+      total: informationNewPackage.total,
+    };
+  
+    expect(res).toEqual({
+      totalDiscountAmount: 12.58,
+      totalQuantity: 3.7,
+      totalImportWithDiscount: 50.32,
+      totalImportWithoutDiscount: 62.9,
+      totalImporTaxes: 8.05,
+      shippingCost: 0,
+      total: 58.37,
+    });
   });
 
+  
   // Add more test cases as needed
 });

package/src/utils/orders/calculateTotalTaxesIncluded.ts

@@ -8,25 +8,32 @@ export const calculateTotalTaxesIncluded = (
   storeDiscounts: any[],
   appliedOrderDiscounts: any,
   discountCodeObj: any | null
-) => {
+): any => {
   const productTableImports = [...order.products, ...order.buyAndGetProducts].map((current: IOrderProduct) => {
+    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)
+    const extraAmountGross = current.extraAmount || 0;
+    const extraAmountNet = extraAmountGross / taxFactor;
+    
+    // Get the product’s gross price (excluding extraAmount)
+    const productGrossPrice = order.express ? current.expressPrice : current.price;
+    // Convert product gross price to net
+    const unitNetPrice = productGrossPrice / taxFactor;
+    
+    // Determine discount percentage (if any) – discount is applied only on product net price.
     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
       );
       customerDiscount = selectedCustomer?.customer?.discount || 0;
-      productPercentageDiscount = discountsToApply.reduce((prev, next) => {
-        if (next.type === 'percentage') {
-          return prev + next.value;
-        }
-        return prev;
+      productPercentageDiscount = discountsToApply.reduce((prev: number, next: any) => {
+        return next.type === 'percentage' ? prev + next.value : prev;
       }, 0);
       discPercentageInteger = +((productPercentageDiscount + customerDiscount) / 100).toFixed(2);
       discountsToApply.forEach((discount) => (appliedOrderDiscounts[discount._id] = discount));
@@ -47,26 +54,35 @@ export const calculateTotalTaxesIncluded = (
         }
       }
     }
-
-    const taxPercentage = 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);
-
+    
+    // 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;
+    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 = + (productLineImportTotal - totalNetWithoutDiscount).toFixed(2);
+    
+    const lineDiscount = + (discountAmountPerUnit * qty).toFixed(2);
+    
     return {
       product: current,
-      qty: qty,
-      productLineImportTotal: unitPrice * qty,
-      productLineTotalWithDiscount: prodLinePriceWithDiscount,
+      qty,
+      productLineImportTotal, // original gross total (no discount)
+      productLineTotalWithDiscount, // gross total after discount on product (extra not discounted)
       productLineTaxesTotal: totalTaxesApplied,
       lineDiscountAmount: lineDiscount
     };