Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix for data viz

Browse Source
This commit is contained in:
Hillel Coren 2018-05-18 08:55:25 +03:00
parent 33e430a4d2
commit e59a547d3d
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
resources/views/reports/d3.blade.php
View File

@ -125,13 +125,15 @@
if (currencyId != accountCurrencyId) { if (currencyId != accountCurrencyId) {
total = convertCurrency(total, currencyId, accountCurrencyId); total = convertCurrency(total, currencyId, accountCurrencyId);
} }
client.convertedTotal = total; if (total > 0) {
client.displayName = getClientDisplayName(client); client.convertedTotal = total;
client.displayBalance = +client.balance; client.displayName = getClientDisplayName(client);
client.displayPercent = (+client.paid_to_date / (+client.paid_to_date + +client.balance)).toFixed(2); client.displayBalance = +client.balance;
var oldestInvoice = _.max(client.invoices, function(invoice) { return calculateInvoiceAge(invoice) }); client.displayPercent = (+client.paid_to_date / (+client.paid_to_date + +client.balance)).toFixed(2);
client.displayAge = oldestInvoice ? calculateInvoiceAge(oldestInvoice) : -1; var oldestInvoice = _.max(client.invoices, function(invoice) { return calculateInvoiceAge(invoice) });
client.currencyId = currencyId; client.displayAge = oldestInvoice ? calculateInvoiceAge(oldestInvoice) : -1;
client.currencyId = currencyId;
}
}); });
_.each(invoices, function(invoice) { _.each(invoices, function(invoice) {
@ -141,12 +143,14 @@
if (currencyId != accountCurrencyId) { if (currencyId != accountCurrencyId) {
total = convertCurrency(total, currencyId, accountCurrencyId); total = convertCurrency(total, currencyId, accountCurrencyId);
} }
invoice.convertedTotal = total; if (total > 0) {
invoice.displayName = invoice.invoice_number; invoice.convertedTotal = total;
invoice.displayBalance = +invoice.balance; invoice.displayName = invoice.invoice_number;
invoice.displayPercent = (+invoice.amount - +invoice.balance) / +invoice.amount; invoice.displayBalance = +invoice.balance;
invoice.displayAge = calculateInvoiceAge(invoice); invoice.displayPercent = (+invoice.amount - +invoice.balance) / +invoice.amount;
invoice.currencyId = currencyId; invoice.displayAge = calculateInvoiceAge(invoice);
invoice.currencyId = currencyId;
}
}); });
_.each(products, function(product) { _.each(products, function(product) {
@ -156,12 +160,14 @@
if (currencyId != accountCurrencyId) { if (currencyId != accountCurrencyId) {
total = convertCurrency(total, currencyId, accountCurrencyId); total = convertCurrency(total, currencyId, accountCurrencyId);
} }
product.convertedTotal = total; if (total > 0) {
product.displayName = product.key; product.convertedTotal = total;
product.displayBalance = product.values.amount - product.values.paid; product.displayName = product.key;
product.displayPercent = (product.values.paid / product.values.amount).toFixed(2); product.displayBalance = product.values.amount - product.values.paid;
product.displayAge = product.values.age; product.displayPercent = (product.values.paid / product.values.amount).toFixed(2);
product.currencyId = currencyId; product.displayAge = product.values.age;
product.currencyId = currencyId;
}
}); });
//console.log(JSON.stringify(clients)); //console.log(JSON.stringify(clients));