tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix amount formatting #1356

Browse source
This commit is contained in:
Hillel Coren 2017-02-21 13:31:51 +02:00
parent d42fe69238
commit dba28c0ead
4 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public/built.js
View file

File diff suppressed because one or more lines are too long

2
public/built.js.map
View file

File diff suppressed because one or more lines are too long

2
resources/assets/js/pdf.pdfmake.js
View file

@ -462,7 +462,7 @@ NINJA.invoiceLines = function(invoice) {
}
if (!hideQuantity) {
row.push({style:["cost", rowStyle], text:cost});
row.push({style:["quantity", rowStyle], text:qty || ' '});
row.push({style:["quantity", rowStyle], text:formatAmount(qty, invoice.client.currency_id) || ' '});
}
if (showItemTaxes) {
var str = ' ';

18
resources/views/money_script.blade.php
View file

@ -63,6 +63,24 @@
return formatMoney(value, currencyId, countryId, decorator)
}
function formatAmount(value, currencyId) {
if (!currencyId) {
currencyId = {{ Session::get(SESSION_CURRENCY, DEFAULT_CURRENCY) }};
}
var currency = currencyMap[currencyId];
var decimal = currency.decimal_separator;
value = NINJA.parseFloat(value) + '';
if (decimal == '.') {
return value;
} else {
return value.replace('.', decimal);
}
}
function formatMoney(value, currencyId, countryId, decorator) {
value = NINJA.parseFloat(value);