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

@ -5,10 +5,18 @@
{
"width":380,
"stack":[
{"text":"$yourInvoiceLabelUC", "style": "yourInvoice"},
{
"text":"$yourInvoiceLabelUC",
"style":"yourInvoice"
},
"$clientDetails"
],
"margin": [60, 100, 0, 10]
"margin":[
60,
100,
0,
10
]
},
{
"canvas":[
@ -24,14 +32,24 @@
}
],
"width":10,
"margin":[-10,100,0,10]
"margin":[
-10,
100,
0,
10
]
},
{
"table":{
"body":"$invoiceDetails"
},
"layout":"noBorders",
"margin": [0, 110, 0, 0]
"margin":[
0,
110,
0,
0
]
}
]
},
@ -60,7 +78,10 @@
"$notesAndTerms",
{
"table":{
"widths": ["*", "40%"],
"widths":[
"*",
"40%"
],
"body":"$subtotals"
},
"layout":{
@ -71,7 +92,8 @@
"paddingTop":"$amount:4",
"paddingBottom":"$amount:4"
}
}]
}
]
},
{
"stack":[
@ -80,15 +102,30 @@
"style":"invoiceDocuments"
}
],
"footer":
[
{"canvas": [{ "type": "line", "x1": 0, "y1": 0, "x2": 600, "y2": 0,"lineWidth": 100,"lineColor":"$secondaryColor:#292526"}]},
"footer":[
{
"columns":
[
"canvas":[
{
"type":"line",
"x1":0,
"y1":0,
"x2":600,
"y2":0,
"lineWidth":100,
"lineColor":"$secondaryColor:#292526"
}
]
},
{
"columns":[
{
"text":"$invoiceFooter",
"margin": [40, -40, 40, 0],
"margin":[
40,
-40,
40,
0
],
"alignment":"left",
"color":"#FFFFFF"
}
@ -114,8 +151,16 @@
"columns":[
{
"image":"$accountLogo",
"fit": [120, 60],
"margin": [30, 16, 0, 0]
"fit":[
120,
60
],
"margin":[
30,
16,
0,
0
]
},
{
"stack":"$accountDetails",
@ -142,7 +187,12 @@
"defaultStyle":{
"font":"$bodyFont",
"fontSize":"$fontSize",
"margin": [8, 4, 8, 4]
"margin":[
8,
4,
8,
4
]
},
"styles":{
"primaryColor":{
@ -150,19 +200,39 @@
},
"accountName":{
"bold":true,
"margin": [4, 2, 4, 1],
"margin":[
4,
2,
4,
1
],
"color":"$primaryColor:#36a498"
},
"accountDetails":{
"margin": [4, 2, 4, 1],
"margin":[
4,
2,
4,
1
],
"color":"#FFFFFF"
},
"accountAddress":{
"margin": [4, 2, 4, 1],
"margin":[
4,
2,
4,
1
],
"color":"#FFFFFF"
},
"clientDetails":{
"margin": [0, 2, 0, 1]
"margin":[
0,
2,
0,
1
]
},
"odd":{
"fillColor":"#ebebeb"
@ -197,13 +267,28 @@
},
"lineTotalTableHeader":{
"alignment":"right",
"margin": [0, 0, 40, 0]
"margin":[
0,
0,
40,
0
]
},
"firstColumn":{
"margin": [40, 0, 0, 0]
"margin":[
40,
0,
0,
0
]
},
"lastColumn":{
"margin": [0, 0, 40, 0]
"margin":[
0,
0,
40,
0
]
},
"productKey":{
"color":"$primaryColor:#36a498",
@ -214,10 +299,20 @@
"bold":true,
"fontSize":14,
"color":"$primaryColor:#36a498",
"margin": [0,0,0,8]
"margin":[
0,
0,
0,
8
]
},
"invoiceLineItemsTable":{
"margin": [0, 26, 0, 16]
"margin":[
0,
26,
0,
16
]
},
"clientName":{
"bold":true
@ -236,11 +331,21 @@
},
"subtotals":{
"alignment":"right",
"margin": [0,0,40,0]
"margin":[
0,
0,
40,
0
]
},
"termsLabel":{
"bold":true,
"margin": [0, 0, 0, 4]
"margin":[
0,
0,
0,
4
]
},
"fullheader":{
"font":"$headerFont",
@ -256,11 +361,26 @@
"color":"#737373"
},
"invoiceDocuments":{
"margin": [47, 0, 47, 0]
"margin":[
47,
0,
47,
0
]
},
"invoiceDocument":{
"margin": [0, 10, 0, 10]
"margin":[
0,
10,
0,
10
]
}
},
"pageMargins": [0, 80, 0, 40]
"pageMargins":[
0,
80,
0,
40
]
}

View File

@ -1,13 +1,22 @@
{
"content": [{
"content":[
{
"columns":[
{
"image":"$accountLogo",
"fit": [120, 80]
"fit":[
120,
80
]
},
{
"stack":"$accountDetails",
"margin": [7, 0, 0, 0]
"margin":[
7,
0,
0,
0
]
},
{
"stack":"$accountAddress"
@ -16,21 +25,34 @@
},
{
"text":"$entityTypeUC",
"margin": [8, 30, 8, 5],
"margin":[
8,
30,
8,
5
],
"style":"entityTypeLabel"
},
{
"table":{
"headerRows":1,
"widths": ["auto", "auto", "*"],
"widths":[
"auto",
"auto",
"*"
],
"body":[
[
{
"table":{
"body":"$invoiceDetails"
},
"margin": [0, 0, 12, 0],
"margin":[
0,
0,
12,
0
],
"layout":"noBorders"
},
{
@ -74,7 +96,10 @@
"$notesAndTerms",
{
"table":{
"widths": ["*", "40%"],
"widths":[
"*",
"40%"
],
"body":"$subtotals"
},
"layout":{
@ -98,7 +123,12 @@
"defaultStyle":{
"font":"$bodyFont",
"fontSize":"$fontSize",
"margin": [8, 4, 8, 4]
"margin":[
8,
4,
8,
4
]
},
"footer":{
"columns":[
@ -107,7 +137,12 @@
"alignment":"left"
}
],
"margin": [40, -20, 40, 0]
"margin":[
40,
-20,
40,
0
]
},
"styles":{
"entityTypeLabel":{
@ -123,19 +158,44 @@
"bold":true
},
"invoiceDetails":{
"margin": [0, 0, 8, 0]
"margin":[
0,
0,
8,
0
]
},
"accountDetails":{
"margin": [0, 2, 0, 2]
"margin":[
0,
2,
0,
2
]
},
"clientDetails":{
"margin": [0, 2, 0, 2]
"margin":[
0,
2,
0,
2
]
},
"notesAndTerms":{
"margin": [0, 2, 0, 2]
"margin":[
0,
2,
0,
2
]
},
"accountAddress":{
"margin": [0, 2, 0, 2]
"margin":[
0,
2,
0,
2
]
},
"odd":{
"fillColor":"#fbfbfb"
@ -171,7 +231,12 @@
"alignment":"right"
},
"invoiceLineItemsTable":{
"margin": [0, 16, 0, 16]
"margin":[
0,
16,
0,
16
]
},
"clientName":{
"bold":true
@ -208,11 +273,26 @@
"color":"#737373"
},
"invoiceDocuments":{
"margin": [7, 0, 7, 0]
"margin":[
7,
0,
7,
0
]
},
"invoiceDocument":{
"margin": [0, 10, 0, 10]
"margin":[
0,
10,
0,
10
]
}
},
"pageMargins": [40, 40, 40, 60]
"pageMargins":[
40,
40,
40,
60
]
}