Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Support higher precision for unit cost and quantity

Browse Source
This commit is contained in:
Hillel Coren 2017-08-14 14:24:41 +03:00
parent 7a4a5d51f3
commit db714a17ac
4 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
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

4
resources/assets/js/pdf.pdfmake.js
View File

@ -495,7 +495,7 @@ NINJA.invoiceLines = function(invoice, isSecondTable) {
var row = []; var row = [];
var item = invoice.invoice_items[i]; var item = invoice.invoice_items[i];
var cost = formatMoneyInvoice(item.cost, invoice, 'none', getPrecision(item.cost)); var cost = formatMoneyInvoice(item.cost, invoice, 'none', getPrecision(item.cost));
var qty = NINJA.parseFloat(item.qty) ? roundToTwo(NINJA.parseFloat(item.qty)) + '' : ''; var qty = NINJA.parseFloat(item.qty) ? roundSignificant(NINJA.parseFloat(item.qty)) + '' : '';
var notes = item.notes; var notes = item.notes;
var productKey = item.product_key; var productKey = item.product_key;
var tax1 = ''; var tax1 = '';
@ -565,7 +565,7 @@ NINJA.invoiceLines = function(invoice, isSecondTable) {
} }
if (!hideQuantity) { if (!hideQuantity) {
row.push({style:["cost", rowStyle], text:cost}); row.push({style:["cost", rowStyle], text:cost});
row.push({style:["quantity", rowStyle], text:formatAmount(qty, invoice.client.currency_id) || ' '}); row.push({style:["quantity", rowStyle], text:formatAmount(qty, invoice.client.currency_id, getPrecision(qty)) || ' '});
} }
if (showItemTaxes) { if (showItemTaxes) {
var str = ' '; var str = ' ';

11
resources/views/money_script.blade.php
View File

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