1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-08 12:12:48 +01:00

Fix for elegant design

This commit is contained in:
Hillel Coren 2016-06-29 22:59:54 +03:00
parent 9603439a33
commit cbe39f9aaf
3 changed files with 14 additions and 5 deletions

View File

@ -31096,7 +31096,9 @@ function GetPdfMake(invoice, javascript, callback) {
if (!invoice.features.remove_created_by) {
var footer = dd.footer();
if (footer) {
if (designId == NINJA.TEMPLATES.PLAYFUL) {
if (designId == NINJA.TEMPLATES.ELEGANT) {
footer[0].columns.push({image: logoImages.imageLogo1, alignment: 'right', width: 130, margin: [0, -20, 20, 0]})
} else if (designId == NINJA.TEMPLATES.PLAYFUL) {
footer.push({image: logoImages.imageLogo1, alignment: 'right', width: 130, margin: [0, 0, 10, 10]})
} else if (designId == NINJA.TEMPLATES.BOLD) {
footer[1].columns.push({image: logoImages.imageLogo2, alignment: 'right', width: 130, margin: [0, -20, 20, 0]})

View File

@ -89,7 +89,9 @@ function GetPdfMake(invoice, javascript, callback) {
if (!invoice.features.remove_created_by) {
var footer = dd.footer();
if (footer) {
if (designId == NINJA.TEMPLATES.PLAYFUL) {
if (designId == NINJA.TEMPLATES.ELEGANT) {
footer[0].columns.push({image: logoImages.imageLogo1, alignment: 'right', width: 130, margin: [0, -20, 20, 0]})
} else if (designId == NINJA.TEMPLATES.PLAYFUL) {
footer.push({image: logoImages.imageLogo1, alignment: 'right', width: 130, margin: [0, 0, 10, 10]})
} else if (designId == NINJA.TEMPLATES.BOLD) {
footer[1].columns.push({image: logoImages.imageLogo2, alignment: 'right', width: 130, margin: [0, -20, 20, 0]})

View File

@ -103,8 +103,13 @@
}],
"footer": [
{
"text": "$invoiceFooter",
"margin": [40, -40, 40, 20]
"columns": [
{
"text": "$invoiceFooter",
"alignment": "left"
}
],
"margin": [40, -20, 40, 0]
},
{"canvas": [{ "type": "line", "x1": 35, "y1": 5, "x2": 555, "y2": 5, "lineWidth": 2,"margin": [30,0,0,0]}]},
{"canvas": [{ "type": "line", "x1": 35, "y1": 3, "x2": 555, "y2": 3, "lineWidth": 1,"margin": [30,0,0,0]}]}
@ -203,4 +208,4 @@
}
},
"pageMargins": [40, 40, 40, 40]
}
}