Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-08 20:22:42 +01:00
Code Issues Releases Activity

layout updated

Browse Source 
missing "balance due" added
This commit is contained in:
sigitas 2015-04-14 13:42:59 +03:00
parent c36e47a07c
commit 9cb9237981
3 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
public/js/built.js
View File

@ -33351,12 +33351,12 @@ function notesAndTerms(invoice)
{
var text = [];
if (invoice.public_notes) {
text.push(invoice.public_notes);
text.push({text:invoice.public_notes, style:'notes'});
}
if (invoice.terms) {
text.push({text:invoiceLabels.terms, style:'bold'});
text.push(invoice.terms);
text.push({text:invoiceLabels.terms, style:'termsLabel'});
text.push({text:invoice.terms, style:'terms'});
}
return text;
@ -33459,6 +33459,9 @@ function subtotals(invoice)
if (invoice.account.hide_paid_to_date != '1' || paid) {
data.push([invoiceLabels.paid_to_date, formatMoney(paid, invoice.client.currency_id)]);
}
data.push([{text:invoice.is_quote ? invoiceLabels.total : invoiceLabels.balance_due, style:'balanceDueLabel'},
{text:formatMoney(invoice.balance_amount, invoice.client.currency_id), style:'balanceDueValue'}]);
return data;
}
@ -33484,4 +33487,8 @@ function accountAddress(account) {
function primaryColor( defaultColor) {
return NINJA.primaryColor?NINJA.primaryColor:defaultColor;
}
function secondaryColor( defaultColor) {
return NINJA.primaryColor?NINJA.secondaryColor:defaultColor;
}

9
public/js/pdf.pdfmake.js
View File

@ -10,12 +10,12 @@ function notesAndTerms(invoice)
{
var text = [];
if (invoice.public_notes) {
text.push(invoice.public_notes);
text.push({text:invoice.public_notes, style:'notes'});
}
if (invoice.terms) {
text.push({text:invoiceLabels.terms, style:'bold'});
text.push(invoice.terms);
text.push({text:invoiceLabels.terms, style:'termsLabel'});
text.push({text:invoice.terms, style:'terms'});
}
return text;
@ -118,6 +118,9 @@ function subtotals(invoice)
if (invoice.account.hide_paid_to_date != '1' || paid) {
data.push([invoiceLabels.paid_to_date, formatMoney(paid, invoice.client.currency_id)]);
}
data.push([{text:invoice.is_quote ? invoiceLabels.total : invoiceLabels.balance_due, style:'balanceDueLabel'},
{text:formatMoney(invoice.balance_amount, invoice.client.currency_id), style:'balanceDueValue'}]);
return data;
}

18
public/js/templates/clean.js
View File

@ -85,6 +85,7 @@ var dd = {
paddingBottom: function(i, node) { return 8; }
},
},
'\n',
{
columns: [
notesAndTerms(invoice),
@ -167,6 +168,23 @@ var dd = {
},
tableHeader: {
bold: true
},
balanceDueLabel: {
fontSize: 11
},
balanceDueValue: {
fontSize: 11,
color:primaryColor('#299CC2')
},
notes: {
},
terms: {
},
termsLabel: {
bold: true,
fontSize: 10,
margin: [0, 10, 0, 4]
}
},
pageMargins: [72, 40, 40, 80]