diff --git a/storage/templates/bold.js b/storage/templates/bold.js index b877f5f4b86c..93d716abd65c 100644 --- a/storage/templates/bold.js +++ b/storage/templates/bold.js @@ -50,7 +50,13 @@ "paddingTop": "$amount:14", "paddingBottom": "$amount:14" } - }, + }, + { + "stack": [ + "$invoiceDocuments" + ], + "style": "invoiceDocuments" + }, { "columns": [ { @@ -254,6 +260,12 @@ "help": { "fontSize": "$fontSizeSmaller", "color": "#737373" + }, + "invoiceDocuments": { + "margin": [47, 0, 47, 0] + }, + "invoiceDocument": { + "margin": [0, 10, 0, 10] } }, "pageMargins": [0, 80, 0, 40] diff --git a/storage/templates/clean.js b/storage/templates/clean.js index e367a5893217..153095bfc0ad 100644 --- a/storage/templates/clean.js +++ b/storage/templates/clean.js @@ -69,6 +69,12 @@ "paddingBottom": "$amount:14" } }, + { + "stack": [ + "$invoiceDocuments" + ], + "style": "invoiceDocuments" + }, { "columns": [ "$notesAndTerms", @@ -200,6 +206,12 @@ "help": { "fontSize": "$fontSizeSmaller", "color": "#737373" + }, + "invoiceDocuments": { + "margin": [7, 0, 7, 0] + }, + "invoiceDocument": { + "margin": [0, 10, 0, 10] } }, "pageMargins": [40, 40, 40, 60] diff --git a/storage/templates/modern.js b/storage/templates/modern.js index 5c1767bb4bab..a4043413a2eb 100644 --- a/storage/templates/modern.js +++ b/storage/templates/modern.js @@ -85,166 +85,179 @@ "margin": [0, 16, 8, 0] } ] - } ], - "footer": [ - { - "canvas": [ - { - "type": "line", "x1": 0, "y1": 0, "x2": 600, "y2": 0,"lineWidth": 100,"lineColor":"$primaryColor:#f26621" - }] - ,"width":10 - }, - { - "columns": [ - { - "width": 350, - "stack": [ - { - "text": "$invoiceFooter", - "margin": [40, -40, 40, 0], - "alignment": "left", - "color": "#FFFFFF" - - } - ] - }, - { - "stack": "$accountDetails", - "margin": [0, -40, 0, 0], - "width": "*" - }, - { - "stack": "$accountAddress", - "margin": [0, -40, 0, 0], - "width": "*" - } - ] - } - ], - "header": [ - { - "canvas": [{ "type": "line", "x1": 0, "y1": 0, "x2": 600, "y2": 0,"lineWidth": 200,"lineColor":"$primaryColor:#f26621"}],"width":10 }, { - "columns": [ + "stack": [ + "$invoiceDocuments" + ], + "style": "invoiceDocuments" + } + ], + "footer": [ + { + "canvas": [ + { + "type": "line", "x1": 0, "y1": 0, "x2": 600, "y2": 0,"lineWidth": 100,"lineColor":"$primaryColor:#f26621" + }] + ,"width":10 + }, + { + "columns": [ + { + "width": 350, + "stack": [ { - "text": "$accountName", "bold": true,"font":"$headerFont","fontSize":30,"color":"#ffffff","margin":[40,20,0,0],"width":350 + "text": "$invoiceFooter", + "margin": [40, -40, 40, 0], + "alignment": "left", + "color": "#FFFFFF" + } ] }, { - "width": 300, - "table": { - "body": "$invoiceDetails" - }, - "layout": "noBorders", - "margin": [400, -40, 0, 0] + "stack": "$accountDetails", + "margin": [0, -40, 0, 0], + "width": "*" + }, + { + "stack": "$accountAddress", + "margin": [0, -40, 0, 0], + "width": "*" } - ], - "defaultStyle": { - "font": "$bodyFont", - "fontSize": "$fontSize", - "margin": [8, 4, 8, 4] + ] + } + ], + "header": [ + { + "canvas": [{ "type": "line", "x1": 0, "y1": 0, "x2": 600, "y2": 0,"lineWidth": 200,"lineColor":"$primaryColor:#f26621"}],"width":10 + }, + { + "columns": [ + { + "text": "$accountName", "bold": true,"font":"$headerFont","fontSize":30,"color":"#ffffff","margin":[40,20,0,0],"width":350 + } + ] + }, + { + "width": 300, + "table": { + "body": "$invoiceDetails" + }, + "layout": "noBorders", + "margin": [400, -40, 0, 0] + } + ], + "defaultStyle": { + "font": "$bodyFont", + "fontSize": "$fontSize", + "margin": [8, 4, 8, 4] + }, + "styles": { + "primaryColor":{ + "color": "$primaryColor:#299CC2" }, - "styles": { - "primaryColor":{ - "color": "$primaryColor:#299CC2" - }, - "accountName": { - "margin": [4, 2, 4, 2], - "color": "$primaryColor:#299CC2" - }, - "accountDetails": { - "margin": [4, 2, 4, 2], - "color": "#FFFFFF" - }, - "accountAddress": { - "margin": [4, 2, 4, 2], - "color": "#FFFFFF" - }, - "clientDetails": { - "margin": [0, 2, 4, 2] - }, - "invoiceDetails": { - "color": "#FFFFFF" - }, - "invoiceLineItemsTable": { - "margin": [0, 0, 0, 16] - }, - "productKey": { - "bold": true - }, - "clientName": { - "bold": true - }, - "tableHeader": { - "bold": true, - "color": "#FFFFFF", - "fontSize": "$fontSizeLargest", - "fillColor": "$secondaryColor:#403d3d" - }, - "costTableHeader": { - "alignment": "right" - }, - "qtyTableHeader": { - "alignment": "right" - }, - "taxTableHeader": { - "alignment": "right" - }, - "lineTotalTableHeader": { - "alignment": "right" - }, - "balanceDueLabel": { - "fontSize": "$fontSizeLargest", - "color":"#FFFFFF", - "alignment":"right", - "bold": true - }, - "balanceDue": { - "fontSize": "$fontSizeLargest", - "color":"#FFFFFF", - "bold": true, - "alignment":"right" - }, - "cost": { - "alignment": "right" - }, - "quantity": { - "alignment": "right" - }, - "tax": { - "alignment": "right" - }, - "lineTotal": { - "alignment": "right" - }, - "subtotals": { - "alignment": "right" - }, - "termsLabel": { - "bold": true, - "margin": [0, 0, 0, 4] - }, - "invoiceNumberLabel": { - "bold": true - }, - "invoiceNumber": { - "bold": true - }, - "header": { - "font": "$headerFont", - "fontSize": "$fontSizeLargest", - "bold": true - }, - "subheader": { - "font": "$headerFont", - "fontSize": "$fontSizeLarger" - }, - "help": { - "fontSize": "$fontSizeSmaller", - "color": "#737373" - } + "accountName": { + "margin": [4, 2, 4, 2], + "color": "$primaryColor:#299CC2" }, - "pageMargins": [40, 120, 40, 50] - } \ No newline at end of file + "accountDetails": { + "margin": [4, 2, 4, 2], + "color": "#FFFFFF" + }, + "accountAddress": { + "margin": [4, 2, 4, 2], + "color": "#FFFFFF" + }, + "clientDetails": { + "margin": [0, 2, 4, 2] + }, + "invoiceDetails": { + "color": "#FFFFFF" + }, + "invoiceLineItemsTable": { + "margin": [0, 0, 0, 16] + }, + "productKey": { + "bold": true + }, + "clientName": { + "bold": true + }, + "tableHeader": { + "bold": true, + "color": "#FFFFFF", + "fontSize": "$fontSizeLargest", + "fillColor": "$secondaryColor:#403d3d" + }, + "costTableHeader": { + "alignment": "right" + }, + "qtyTableHeader": { + "alignment": "right" + }, + "taxTableHeader": { + "alignment": "right" + }, + "lineTotalTableHeader": { + "alignment": "right" + }, + "balanceDueLabel": { + "fontSize": "$fontSizeLargest", + "color":"#FFFFFF", + "alignment":"right", + "bold": true + }, + "balanceDue": { + "fontSize": "$fontSizeLargest", + "color":"#FFFFFF", + "bold": true, + "alignment":"right" + }, + "cost": { + "alignment": "right" + }, + "quantity": { + "alignment": "right" + }, + "tax": { + "alignment": "right" + }, + "lineTotal": { + "alignment": "right" + }, + "subtotals": { + "alignment": "right" + }, + "termsLabel": { + "bold": true, + "margin": [0, 0, 0, 4] + }, + "invoiceNumberLabel": { + "bold": true + }, + "invoiceNumber": { + "bold": true + }, + "header": { + "font": "$headerFont", + "fontSize": "$fontSizeLargest", + "bold": true + }, + "subheader": { + "font": "$headerFont", + "fontSize": "$fontSizeLarger" + }, + "help": { + "fontSize": "$fontSizeSmaller", + "color": "#737373" + }, + "invoiceDocuments": { + "margin": [7, 0, 7, 0] + }, + "invoiceDocument": { + "margin": [0, 10, 0, 10] + } + }, + "pageMargins": [40, 120, 40, 50] +} \ No newline at end of file diff --git a/storage/templates/plain.js b/storage/templates/plain.js index b260a6727e75..b64dc87e6623 100644 --- a/storage/templates/plain.js +++ b/storage/templates/plain.js @@ -57,6 +57,12 @@ "paddingBottom": "$amount:8" } }, + { + "stack": [ + "$invoiceDocuments" + ], + "style": "invoiceDocuments" + }, { "columns": [ "$notesAndTerms", @@ -166,7 +172,13 @@ "help": { "fontSize": "$fontSizeSmaller", "color": "#737373" - } + }, + "invoiceDocuments": { + "margin": [7, 0, 7, 0] + }, + "invoiceDocument": { + "margin": [0, 10, 0, 10] + } }, "pageMargins": [40, 40, 40, 60] } \ No newline at end of file