From aa80c187d2e5874c23ef032c2d7b7760c9a535ef Mon Sep 17 00:00:00 2001 From: Camel Aissani Date: Sat, 27 Feb 2021 19:32:52 +0100 Subject: [PATCH] updated frontdata for the react app --- backend/managers/frontdata.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/backend/managers/frontdata.js b/backend/managers/frontdata.js index 646c976..3e4690b 100644 --- a/backend/managers/frontdata.js +++ b/backend/managers/frontdata.js @@ -305,6 +305,9 @@ function toOccupantData(inputOccupant) { guaranty: occupant.guaranty ? Number(occupant.guaranty) : 0, vatRatio: occupant.vatRatio ? Number(occupant.vatRatio) : 0, discount: occupant.discount ? Number(occupant.discount) : 0, + rental: 0, + expenses: 0, + total: 0 } ); @@ -354,7 +357,15 @@ function toOccupantData(inputOccupant) { occupant.office.expense += property.expense; } } + occupant.rental += property.price || 0; + occupant.expenses += property.expense || 0; }); + occupant.preTaxTotal = occupant.rental + occupant.expenses - occupant.discount; + occupant.total = occupant.preTaxTotal; + if (occupant.vatRatio) { + occupant.vat = occupant.preTaxTotal * occupant.vatRatio; + occupant.total = occupant.preTaxTotal + occupant.vat; + } if (occupant.office) { occupant.office.m2Price = occupant.office.price / occupant.office.surface; occupant.office.m2Expense = occupant.office.expense / occupant.office.surface;