Merge template formatting

This commit is contained in:
Hillel Coren 2017-11-08 20:36:02 +02:00
parent e11fcd30ae
commit 51a16de01b
2 changed files with 664 additions and 464 deletions

View File

@ -1,266 +1,386 @@
{ {
"content": [ "content":[
{ {
"columns": [ "columns":[
{ {
"width": 380, "width":380,
"stack": [ "stack":[
{"text":"$yourInvoiceLabelUC", "style": "yourInvoice"}, {
"$clientDetails" "text":"$yourInvoiceLabelUC",
], "style":"yourInvoice"
"margin": [60, 100, 0, 10] },
}, "$clientDetails"
{ ],
"canvas": [ "margin":[
{ 60,
"type": "rect", 100,
"x": 0, 0,
"y": 0, 10
"w": 225, ]
"h": "$invoiceDetailsHeight",
"r":0,
"lineWidth": 1,
"color": "$primaryColor:#36a498"
}
],
"width":10,
"margin":[-10,100,0,10]
},
{
"table": {
"body": "$invoiceDetails"
}, },
"layout": "noBorders", {
"margin": [0, 110, 0, 0] "canvas":[
} {
] "type":"rect",
}, "x":0,
{ "y":0,
"style": "invoiceLineItemsTable", "w":225,
"table": { "h":"$invoiceDetailsHeight",
"headerRows": 1, "r":0,
"widths": "$invoiceLineItemColumns", "lineWidth":1,
"body": "$invoiceLineItems" "color":"$primaryColor:#36a498"
}, }
"layout": { ],
"hLineWidth": "$none", "width":10,
"vLineWidth": "$none", "margin":[
"paddingLeft": "$amount:8", -10,
"paddingRight": "$amount:8", 100,
"paddingTop": "$amount:14", 0,
"paddingBottom": "$amount:14" 10
} ]
},
{
"columns": [
{
"width": 46,
"text": " "
},
"$notesAndTerms",
{
"table": {
"widths": ["*", "40%"],
"body": "$subtotals"
}, },
"layout": { {
"hLineWidth": "$none", "table":{
"vLineWidth": "$none", "body":"$invoiceDetails"
"paddingLeft": "$amount:8", },
"paddingRight": "$amount:8", "layout":"noBorders",
"paddingTop": "$amount:4", "margin":[
"paddingBottom": "$amount:4" 0,
110,
0,
0
]
} }
}] ]
}, },
{ {
"stack": [ "style":"invoiceLineItemsTable",
"$invoiceDocuments" "table":{
], "headerRows":1,
"style": "invoiceDocuments" "widths":"$invoiceLineItemColumns",
} "body":"$invoiceLineItems"
], },
"footer": "layout":{
[ "hLineWidth":"$none",
{"canvas": [{ "type": "line", "x1": 0, "y1": 0, "x2": 600, "y2": 0,"lineWidth": 100,"lineColor":"$secondaryColor:#292526"}]}, "vLineWidth":"$none",
{ "paddingLeft":"$amount:8",
"columns": "paddingRight":"$amount:8",
[ "paddingTop":"$amount:14",
{ "paddingBottom":"$amount:14"
"text": "$invoiceFooter", }
"margin": [40, -40, 40, 0], },
"alignment": "left", {
"color": "#FFFFFF" "columns":[
} {
] "width":46,
} "text":" "
], },
"header": [ "$notesAndTerms",
{ {
"canvas": [ "table":{
{ "widths":[
"type": "line", "*",
"x1": 0, "40%"
"y1": 0, ],
"x2": 600, "body":"$subtotals"
"y2": 0, },
"lineWidth": 200, "layout":{
"lineColor": "$secondaryColor:#292526" "hLineWidth":"$none",
} "vLineWidth":"$none",
], "paddingLeft":"$amount:8",
"width": 10 "paddingRight":"$amount:8",
}, "paddingTop":"$amount:4",
{ "paddingBottom":"$amount:4"
"columns": [ }
{ }
"image": "$accountLogo", ]
"fit": [120, 60], },
"margin": [30, 16, 0, 0] {
}, "stack":[
{ "$invoiceDocuments"
"stack": "$accountDetails", ],
"margin": [ "style":"invoiceDocuments"
}
],
"footer":[
{
"canvas":[
{
"type":"line",
"x1":0,
"y1":0,
"x2":600,
"y2":0,
"lineWidth":100,
"lineColor":"$secondaryColor:#292526"
}
]
},
{
"columns":[
{
"text":"$invoiceFooter",
"margin":[
40,
-40,
40,
0
],
"alignment":"left",
"color":"#FFFFFF"
}
]
}
],
"header":[
{
"canvas":[
{
"type":"line",
"x1":0,
"y1":0,
"x2":600,
"y2":0,
"lineWidth":200,
"lineColor":"$secondaryColor:#292526"
}
],
"width":10
},
{
"columns":[
{
"image":"$accountLogo",
"fit":[
120,
60
],
"margin":[
30,
16,
0,
0
]
},
{
"stack":"$accountDetails",
"margin":[
0, 0,
16, 16,
0, 0,
0 0
], ],
"width": 140 "width":140
}, },
{ {
"stack": "$accountAddress", "stack":"$accountAddress",
"margin": [ "margin":[
20, 20,
16, 16,
0, 0,
0 0
] ]
}
]
}
],
"defaultStyle": {
"font": "$bodyFont",
"fontSize": "$fontSize",
"margin": [8, 4, 8, 4]
},
"styles": {
"primaryColor":{
"color": "$primaryColor:#36a498"
},
"accountName": {
"bold": true,
"margin": [4, 2, 4, 1],
"color": "$primaryColor:#36a498"
},
"accountDetails": {
"margin": [4, 2, 4, 1],
"color": "#FFFFFF"
},
"accountAddress": {
"margin": [4, 2, 4, 1],
"color": "#FFFFFF"
},
"clientDetails": {
"margin": [0, 2, 0, 1]
},
"odd": {
"fillColor": "#ebebeb"
},
"subtotalsBalanceDueLabel": {
"fontSize": "$fontSizeLargest",
"bold": true
},
"subtotalsBalanceDue": {
"fontSize": "$fontSizeLargest",
"color": "$primaryColor:#36a498",
"bold": true
},
"invoiceDetails": {
"color": "#ffffff"
},
"invoiceNumber": {
"bold": true
},
"tableHeader": {
"fontSize": 12,
"bold": true
},
"costTableHeader": {
"alignment": "right"
},
"qtyTableHeader": {
"alignment": "right"
},
"taxTableHeader": {
"alignment": "right"
},
"lineTotalTableHeader": {
"alignment": "right",
"margin": [0, 0, 40, 0]
},
"firstColumn": {
"margin": [40, 0, 0, 0]
},
"lastColumn": {
"margin": [0, 0, 40, 0]
},
"productKey": {
"color": "$primaryColor:#36a498",
"bold": true
},
"yourInvoice": {
"font": "$headerFont",
"bold": true,
"fontSize": 14,
"color": "$primaryColor:#36a498",
"margin": [0,0,0,8]
},
"invoiceLineItemsTable": {
"margin": [0, 26, 0, 16]
},
"clientName": {
"bold": true
},
"cost": {
"alignment": "right"
},
"quantity": {
"alignment": "right"
},
"tax": {
"alignment": "right"
},
"lineTotal": {
"alignment": "right"
},
"subtotals": {
"alignment": "right",
"margin": [0,0,40,0]
},
"termsLabel": {
"bold": true,
"margin": [0, 0, 0, 4]
},
"fullheader": {
"font": "$headerFont",
"fontSize": "$fontSizeLargest",
"bold": true
},
"subheader": {
"font": "$headerFont",
"fontSize": "$fontSizeLarger"
},
"help": {
"fontSize": "$fontSizeSmaller",
"color": "#737373"
},
"invoiceDocuments": {
"margin": [47, 0, 47, 0]
},
"invoiceDocument": {
"margin": [0, 10, 0, 10]
} }
}, ]
"pageMargins": [0, 80, 0, 40] }
} ],
"defaultStyle":{
"font":"$bodyFont",
"fontSize":"$fontSize",
"margin":[
8,
4,
8,
4
]
},
"styles":{
"primaryColor":{
"color":"$primaryColor:#36a498"
},
"accountName":{
"bold":true,
"margin":[
4,
2,
4,
1
],
"color":"$primaryColor:#36a498"
},
"accountDetails":{
"margin":[
4,
2,
4,
1
],
"color":"#FFFFFF"
},
"accountAddress":{
"margin":[
4,
2,
4,
1
],
"color":"#FFFFFF"
},
"clientDetails":{
"margin":[
0,
2,
0,
1
]
},
"odd":{
"fillColor":"#ebebeb"
},
"subtotalsBalanceDueLabel":{
"fontSize":"$fontSizeLargest",
"bold":true
},
"subtotalsBalanceDue":{
"fontSize":"$fontSizeLargest",
"color":"$primaryColor:#36a498",
"bold":true
},
"invoiceDetails":{
"color":"#ffffff"
},
"invoiceNumber":{
"bold":true
},
"tableHeader":{
"fontSize":12,
"bold":true
},
"costTableHeader":{
"alignment":"right"
},
"qtyTableHeader":{
"alignment":"right"
},
"taxTableHeader":{
"alignment":"right"
},
"lineTotalTableHeader":{
"alignment":"right",
"margin":[
0,
0,
40,
0
]
},
"firstColumn":{
"margin":[
40,
0,
0,
0
]
},
"lastColumn":{
"margin":[
0,
0,
40,
0
]
},
"productKey":{
"color":"$primaryColor:#36a498",
"bold":true
},
"yourInvoice":{
"font":"$headerFont",
"bold":true,
"fontSize":14,
"color":"$primaryColor:#36a498",
"margin":[
0,
0,
0,
8
]
},
"invoiceLineItemsTable":{
"margin":[
0,
26,
0,
16
]
},
"clientName":{
"bold":true
},
"cost":{
"alignment":"right"
},
"quantity":{
"alignment":"right"
},
"tax":{
"alignment":"right"
},
"lineTotal":{
"alignment":"right"
},
"subtotals":{
"alignment":"right",
"margin":[
0,
0,
40,
0
]
},
"termsLabel":{
"bold":true,
"margin":[
0,
0,
0,
4
]
},
"fullheader":{
"font":"$headerFont",
"fontSize":"$fontSizeLargest",
"bold":true
},
"subheader":{
"font":"$headerFont",
"fontSize":"$fontSizeLarger"
},
"help":{
"fontSize":"$fontSizeSmaller",
"color":"#737373"
},
"invoiceDocuments":{
"margin":[
47,
0,
47,
0
]
},
"invoiceDocument":{
"margin":[
0,
10,
0,
10
]
}
},
"pageMargins":[
0,
80,
0,
40
]
}

View File

@ -1,218 +1,298 @@
{ {
"content": [{ "content":[
"columns": [ {
{ "columns":[
"image": "$accountLogo", {
"fit": [120, 80] "image":"$accountLogo",
"fit":[
120,
80
]
}, },
{ {
"stack": "$accountDetails", "stack":"$accountDetails",
"margin": [7, 0, 0, 0] "margin":[
7,
0,
0,
0
]
}, },
{ {
"stack": "$accountAddress" "stack":"$accountAddress"
} }
] ]
}, },
{ {
"text": "$entityTypeUC", "text":"$entityTypeUC",
"margin": [8, 30, 8, 5], "margin":[
"style": "entityTypeLabel" 8,
30,
}, 8,
{ 5
"table": { ],
"headerRows": 1, "style":"entityTypeLabel"
"widths": ["auto", "auto", "*"], },
"body": [ {
[ "table":{
{ "headerRows":1,
"table": { "widths":[
"body": "$invoiceDetails" "auto",
}, "auto",
"margin": [0, 0, 12, 0], "*"
"layout": "noBorders" ],
}, "body":[
{ [
"stack": "$clientDetails" {
}, "table":{
{ "body":"$invoiceDetails"
"text": "" },
} "margin":[
] 0,
0,
12,
0
],
"layout":"noBorders"
},
{
"stack":"$clientDetails"
},
{
"text":""
}
]
] ]
}, },
"layout": { "layout":{
"hLineWidth": "$firstAndLast:.5", "hLineWidth":"$firstAndLast:.5",
"vLineWidth": "$none", "vLineWidth":"$none",
"hLineColor": "#D8D8D8", "hLineColor":"#D8D8D8",
"paddingLeft": "$amount:8", "paddingLeft":"$amount:8",
"paddingRight": "$amount:8", "paddingRight":"$amount:8",
"paddingTop": "$amount:6", "paddingTop":"$amount:6",
"paddingBottom": "$amount:6" "paddingBottom":"$amount:6"
} }
}, },
{ {
"style": "invoiceLineItemsTable", "style":"invoiceLineItemsTable",
"table": { "table":{
"headerRows": 1, "headerRows":1,
"widths": "$invoiceLineItemColumns", "widths":"$invoiceLineItemColumns",
"body": "$invoiceLineItems" "body":"$invoiceLineItems"
}, },
"layout": { "layout":{
"hLineWidth": "$notFirst:.5", "hLineWidth":"$notFirst:.5",
"vLineWidth": "$none", "vLineWidth":"$none",
"hLineColor": "#D8D8D8", "hLineColor":"#D8D8D8",
"paddingLeft": "$amount:8", "paddingLeft":"$amount:8",
"paddingRight": "$amount:8", "paddingRight":"$amount:8",
"paddingTop": "$amount:14", "paddingTop":"$amount:14",
"paddingBottom": "$amount:14" "paddingBottom":"$amount:14"
} }
}, },
{ {
"columns": [ "columns":[
"$notesAndTerms", "$notesAndTerms",
{ {
"table": { "table":{
"widths": ["*", "40%"], "widths":[
"body": "$subtotals" "*",
}, "40%"
"layout": { ],
"hLineWidth": "$none", "body":"$subtotals"
"vLineWidth": "$none", },
"paddingLeft": "$amount:34", "layout":{
"paddingRight": "$amount:8", "hLineWidth":"$none",
"paddingTop": "$amount:4", "vLineWidth":"$none",
"paddingBottom": "$amount:4" "paddingLeft":"$amount:34",
} "paddingRight":"$amount:8",
"paddingTop":"$amount:4",
"paddingBottom":"$amount:4"
}
} }
] ]
}, },
{ {
"stack": [ "stack":[
"$invoiceDocuments" "$invoiceDocuments"
], ],
"style": "invoiceDocuments" "style":"invoiceDocuments"
} }
], ],
"defaultStyle": { "defaultStyle":{
"font": "$bodyFont", "font":"$bodyFont",
"fontSize": "$fontSize", "fontSize":"$fontSize",
"margin": [8, 4, 8, 4] "margin":[
}, 8,
"footer": { 4,
"columns": [ 8,
{ 4
"text": "$invoiceFooter", ]
"alignment": "left" },
} "footer":{
], "columns":[
"margin": [40, -20, 40, 0] {
}, "text":"$invoiceFooter",
"styles": { "alignment":"left"
"entityTypeLabel": { }
"font": "$headerFont", ],
"fontSize": "$fontSizeLargest", "margin":[
"color": "$primaryColor:#37a3c6" 40,
}, -20,
"primaryColor":{ 40,
"color": "$primaryColor:#37a3c6" 0
}, ]
"accountName": { },
"color": "$primaryColor:#37a3c6", "styles":{
"bold": true "entityTypeLabel":{
}, "font":"$headerFont",
"invoiceDetails": { "fontSize":"$fontSizeLargest",
"margin": [0, 0, 8, 0] "color":"$primaryColor:#37a3c6"
}, },
"accountDetails": { "primaryColor":{
"margin": [0, 2, 0, 2] "color":"$primaryColor:#37a3c6"
}, },
"clientDetails": { "accountName":{
"margin": [0, 2, 0, 2] "color":"$primaryColor:#37a3c6",
}, "bold":true
"notesAndTerms": { },
"margin": [0, 2, 0, 2] "invoiceDetails":{
}, "margin":[
"accountAddress": { 0,
"margin": [0, 2, 0, 2] 0,
}, 8,
"odd": { 0
"fillColor": "#fbfbfb" ]
}, },
"productKey": { "accountDetails":{
"color": "$primaryColor:#37a3c6", "margin":[
"bold": true 0,
}, 2,
"subtotalsBalanceDueLabel": { 0,
"fontSize": "$fontSizeLarger" 2
}, ]
"subtotalsBalanceDue": { },
"fontSize": "$fontSizeLarger", "clientDetails":{
"color": "$primaryColor:#37a3c6" "margin":[
}, 0,
"invoiceNumber": { 2,
"bold": true 0,
}, 2
"tableHeader": { ]
"bold": true, },
"fontSize": "$fontSizeLarger" "notesAndTerms":{
}, "margin":[
"costTableHeader": { 0,
"alignment": "right" 2,
}, 0,
"qtyTableHeader": { 2
"alignment": "right" ]
}, },
"taxTableHeader": { "accountAddress":{
"alignment": "right" "margin":[
}, 0,
"lineTotalTableHeader": { 2,
"alignment": "right" 0,
}, 2
"invoiceLineItemsTable": { ]
"margin": [0, 16, 0, 16] },
}, "odd":{
"clientName": { "fillColor":"#fbfbfb"
"bold": true },
}, "productKey":{
"cost": { "color":"$primaryColor:#37a3c6",
"alignment": "right" "bold":true
}, },
"quantity": { "subtotalsBalanceDueLabel":{
"alignment": "right" "fontSize":"$fontSizeLarger"
}, },
"tax": { "subtotalsBalanceDue":{
"alignment": "right" "fontSize":"$fontSizeLarger",
}, "color":"$primaryColor:#37a3c6"
"lineTotal": { },
"alignment": "right" "invoiceNumber":{
}, "bold":true
"subtotals": { },
"alignment": "right" "tableHeader":{
}, "bold":true,
"termsLabel": { "fontSize":"$fontSizeLarger"
"bold": true },
}, "costTableHeader":{
"fullheader": { "alignment":"right"
"font": "$headerFont", },
"fontSize": "$fontSizeLargest", "qtyTableHeader":{
"bold": true "alignment":"right"
}, },
"subheader": { "taxTableHeader":{
"font": "$headerFont", "alignment":"right"
"fontSize": "$fontSizeLarger" },
}, "lineTotalTableHeader":{
"help": { "alignment":"right"
"fontSize": "$fontSizeSmaller", },
"color": "#737373" "invoiceLineItemsTable":{
}, "margin":[
"invoiceDocuments": { 0,
"margin": [7, 0, 7, 0] 16,
}, 0,
"invoiceDocument": { 16
"margin": [0, 10, 0, 10] ]
} },
}, "clientName":{
"pageMargins": [40, 40, 40, 60] "bold":true
},
"cost":{
"alignment":"right"
},
"quantity":{
"alignment":"right"
},
"tax":{
"alignment":"right"
},
"lineTotal":{
"alignment":"right"
},
"subtotals":{
"alignment":"right"
},
"termsLabel":{
"bold":true
},
"fullheader":{
"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,
40,
40,
60
]
} }