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

Fix for elegant design

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/built.js
View File

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

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

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

7
storage/templates/elegant.js
View File

@ -102,9 +102,14 @@
"style": "invoiceDocuments" "style": "invoiceDocuments"
}], }],
"footer": [ "footer": [
{
"columns": [
{ {
"text": "$invoiceFooter", "text": "$invoiceFooter",
"margin": [40, -40, 40, 20] "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": 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]}]} {"canvas": [{ "type": "line", "x1": 35, "y1": 3, "x2": 555, "y2": 3, "lineWidth": 1,"margin": [30,0,0,0]}]}