From b5c8675b281a6119db9d4168ecf2244ac19c7258 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Mon, 15 May 2017 18:58:17 +0300 Subject: [PATCH] Merge templates --- storage/templates/bold.js | 4 +-- storage/templates/business.js | 34 +++++++++++++------------- storage/templates/clean.js | 4 +-- storage/templates/creative.js | 46 +++++++++++++++++------------------ storage/templates/elegant.js | 42 ++++++++++++++++---------------- storage/templates/hipster.js | 4 +-- storage/templates/modern.js | 8 +++--- storage/templates/photo.js | 4 +-- storage/templates/plain.js | 4 +-- storage/templates/playful.js | 4 +-- 10 files changed, 77 insertions(+), 77 deletions(-) diff --git a/storage/templates/bold.js b/storage/templates/bold.js index 5b069f9637cf..bc4e4d987ff8 100755 --- a/storage/templates/bold.js +++ b/storage/templates/bold.js @@ -171,11 +171,11 @@ "productKey": { "color": "$primaryColor:#36a498" }, - "balanceDueLabel": { + "subtotalsBalanceDueLabel": { "fontSize": "$fontSizeLargest", "bold": true }, - "balanceDue": { + "subtotalsBalanceDue": { "fontSize": "$fontSizeLargest", "color": "$primaryColor:#36a498", "bold": true diff --git a/storage/templates/business.js b/storage/templates/business.js index 79c6b6ca549e..fb254ac387d2 100755 --- a/storage/templates/business.js +++ b/storage/templates/business.js @@ -1,7 +1,7 @@ { "content": [ { - "columns": + "columns": [ { "image": "$accountLogo", @@ -16,7 +16,7 @@ "width": 150, "stack": "$accountAddress" } - ] + ] }, { "columns": [ @@ -29,12 +29,12 @@ "margin": [0, 20, 0, 0] }, { - "canvas": [{ "type": "rect", "x": 20, "y": 0, "w": 174, "h": "$invoiceDetailsHeight","r":10, "lineWidth": 1,"color":"$primaryColor:#eb792d"}], + "canvas": [{ "type": "rect", "x": 20, "y": 0, "w": 174, "h": "$invoiceDetailsHeight","r":10, "lineWidth": 1,"color":"$primaryColor:#eb792d"}], "width":36, "margin":[200,25,0,0] }, { - "table": { + "table": { "widths": [64, 70], "body": "$invoiceDetails" }, @@ -56,12 +56,12 @@ "vLineWidth": "$notFirst:.5", "hLineColor": "#FFFFFF", "vLineColor": "#FFFFFF", - "paddingLeft": "$amount:8", - "paddingRight": "$amount:8", - "paddingTop": "$amount:12", - "paddingBottom": "$amount:12" + "paddingLeft": "$amount:8", + "paddingRight": "$amount:8", + "paddingTop": "$amount:12", + "paddingBottom": "$amount:12" } - }, + }, { "columns": [ "$notesAndTerms", @@ -130,7 +130,7 @@ } ], "margin": [40, -20, 40, 0] - }, + }, "defaultStyle": { "fontSize": "$fontSize", "margin": [8, 4, 8, 4] @@ -159,12 +159,12 @@ "productKey": { "bold": true }, - "balanceDueLabel": { + "subtotalsBalanceDueLabel": { "fontSize": "$fontSizeLargest", - "color": "#ffffff", + "color": "#ffffff", "bold": true }, - "balanceDue": { + "subtotalsBalanceDue": { "fontSize": "$fontSizeLargest", "bold": true, "color":"#ffffff", @@ -189,7 +189,7 @@ }, "lineTotalTableHeader": { "alignment": "right" - }, + }, "issuedTo": { "margin": [0,2,0,1], "bold": true, @@ -221,11 +221,11 @@ }, "subtotals": { "alignment": "right" - }, + }, "subtotalsBalance": { "alignment": "right", "margin": [0, -25, 0, 0] - }, + }, "termsLabel": { "bold": true, "margin": [0, 0, 0, 4] @@ -243,4 +243,4 @@ } }, "pageMargins": [40, 40, 40, 40] -} \ No newline at end of file +} diff --git a/storage/templates/clean.js b/storage/templates/clean.js index 43d6701830d0..40942c33c383 100755 --- a/storage/templates/clean.js +++ b/storage/templates/clean.js @@ -144,10 +144,10 @@ "color": "$primaryColor:#37a3c6", "bold": true }, - "balanceDueLabel": { + "subtotalsBalanceDueLabel": { "fontSize": "$fontSizeLarger" }, - "balanceDue": { + "subtotalsBalanceDue": { "fontSize": "$fontSizeLarger", "color": "$primaryColor:#37a3c6" }, diff --git a/storage/templates/creative.js b/storage/templates/creative.js index 0a1e6d596e43..47fa9944435e 100755 --- a/storage/templates/creative.js +++ b/storage/templates/creative.js @@ -1,6 +1,6 @@ { "content": [ - { + { "columns": [ { "stack": "$clientDetails" @@ -21,7 +21,7 @@ }, { "columns": [ - {"text": + {"text": [ {"text": "$entityTypeUC", "style": "header1"}, {"text": "#", "style": "header2"}, @@ -31,7 +31,7 @@ }, { "width":200, - "table": { + "table": { "body": "$invoiceDetails" }, "layout": "noBorders", @@ -52,12 +52,12 @@ "hLineWidth": "$none", "vLineWidth": "$none", "hLineColor": "$primaryColor:#E8E8E8", - "paddingLeft": "$amount:8", - "paddingRight": "$amount:8", - "paddingTop": "$amount:8", - "paddingBottom": "$amount:8" + "paddingLeft": "$amount:8", + "paddingRight": "$amount:8", + "paddingTop": "$amount:8", + "paddingBottom": "$amount:8" } - }, + }, { "columns": [ "$notesAndTerms", @@ -70,10 +70,10 @@ "layout": { "hLineWidth": "$none", "vLineWidth": "$none", - "paddingLeft": "$amount:34", - "paddingRight": "$amount:8", - "paddingTop": "$amount:4", - "paddingBottom": "$amount:4" + "paddingLeft": "$amount:34", + "paddingRight": "$amount:8", + "paddingTop": "$amount:4", + "paddingBottom": "$amount:4" } } ] @@ -84,11 +84,11 @@ }, { "text": "$balanceDueLabel", - "style": "balanceDueLabel" + "style": "subtotalsBalanceDueLabel" }, { "text": "$balanceDue", - "style": "balanceDue" + "style": "subtotalsBalanceDue" }, { "stack": [ @@ -131,11 +131,11 @@ "productKey": { "bold": true }, - "balanceDueLabel": { + "subtotalsBalanceDueLabel": { "fontSize": "$fontSizeLargest", "margin": [320,20,0,0] }, - "balanceDue": { + "subtotalsBalanceDue": { "fontSize": "$fontSizeLargest", "color": "$primaryColor:#AE1E54", "bold": true, @@ -165,7 +165,7 @@ }, "lineTotalTableHeader": { "alignment": "right" - }, + }, "clientName": { "bold": true }, @@ -173,19 +173,19 @@ "margin": [0,2,0,1] }, "header1": { - "bold": true, + "bold": true, "margin": [0, 30, 0, 16], - "fontSize": 46 + "fontSize": 46 }, "header2": { "margin": [0, 30, 0, 16], "fontSize": 46, - "italics": true, + "italics": true, "color": "$primaryColor:#AE1E54" }, "invoiceLineItemsTable": { "margin": [0, 4, 0, 16] - }, + }, "cost": { "alignment": "right" }, @@ -200,7 +200,7 @@ }, "subtotals": { "alignment": "right" - }, + }, "termsLabel": { "bold": true, "margin": [0, 0, 0, 4] @@ -218,4 +218,4 @@ } }, "pageMargins": [40, 40, 40, 40] -} \ No newline at end of file +} diff --git a/storage/templates/elegant.js b/storage/templates/elegant.js index c26925594fc4..01d1f46f0550 100755 --- a/storage/templates/elegant.js +++ b/storage/templates/elegant.js @@ -13,7 +13,7 @@ { "width": 120, "stack": [ - {"text": "$invoiceToLabel", "style": "header", "margin": [0, 0, 0, 6]}, + {"text": "$invoiceToLabel", "style": "header", "margin": [0, 0, 0, 6]}, "$clientDetails" ] }, @@ -33,15 +33,15 @@ }, { "stack": [ - {"text": "$detailsLabel", "style": "header", "margin": [0, 0, 0, 6]}, + {"text": "$detailsLabel", "style": "header", "margin": [0, 0, 0, 6]}, { "width":180, - "table": { + "table": { "body": "$invoiceDetails" }, "layout": "noBorders" } - ] + ] }], "margin": [0, 20, 0, 0] }, @@ -55,12 +55,12 @@ "layout": { "hLineWidth": "$notFirst:.5", "vLineWidth": "$none", - "paddingLeft": "$amount:8", - "paddingRight": "$amount:8", - "paddingTop": "$amount:12", + "paddingLeft": "$amount:8", + "paddingRight": "$amount:8", + "paddingTop": "$amount:12", "paddingBottom": "$amount:12" } - }, + }, { "columns": [ "$notesAndTerms", @@ -73,10 +73,10 @@ "layout": { "hLineWidth": "$none", "vLineWidth": "$none", - "paddingLeft": "$amount:34", - "paddingRight": "$amount:8", - "paddingTop": "$amount:4", - "paddingBottom": "$amount:4" + "paddingLeft": "$amount:34", + "paddingRight": "$amount:8", + "paddingTop": "$amount:4", + "paddingBottom": "$amount:4" } } ] @@ -86,11 +86,11 @@ }, { "text": "$balanceDueLabel", - "style": "balanceDueLabel" + "style": "subtotalsBalanceDueLabel" }, { "text": "$balanceDue", - "style": "balanceDue" + "style": "subtotalsBalanceDue" }, { "canvas": [{ "type": "line", "x1": 270, "y1": 20, "x2": 515, "y2": 20, "lineWidth": 1,"dash": { "length": 2 }}] @@ -100,7 +100,7 @@ "$invoiceDocuments" ], "style": "invoiceDocuments" - }], + }], "footer": [ { "columns": [ @@ -136,22 +136,22 @@ }, "odd": { }, - "balanceDueLabel": { + "subtotalsBalanceDueLabel": { "fontSize": "$fontSizeLargest", "color": "$primaryColor:#5a7b61", "margin": [320,20,0,0] }, - "balanceDue": { + "subtotalsBalanceDue": { "fontSize": "$fontSizeLargest", "color": "$primaryColor:#5a7b61", "style": true, "margin":[0,-14,8,0], "alignment":"right" - }, + }, "invoiceDetailBalanceDue": { "color": "$primaryColor:#5a7b61", "bold": true - }, + }, "header": { "fontSize": 14, "bold": true @@ -172,7 +172,7 @@ }, "lineTotalTableHeader": { "alignment": "right" - }, + }, "invoiceLineItemsTable": { "margin": [0, 40, 0, 16] }, @@ -190,7 +190,7 @@ }, "subtotals": { "alignment": "right" - }, + }, "termsLabel": { "bold": true, "margin": [0, 0, 0, 4] diff --git a/storage/templates/hipster.js b/storage/templates/hipster.js index 2b4fa76d1743..bf73f7ed484c 100755 --- a/storage/templates/hipster.js +++ b/storage/templates/hipster.js @@ -140,11 +140,11 @@ "clientName": { "bold": true }, - "balanceDueLabel": { + "subtotalsBalanceDueLabel": { "fontSize": "$fontSizeLargest", "bold": true }, - "balanceDue": { + "subtotalsBalanceDue": { "fontSize": "$fontSizeLargest", "color": "$primaryColor:#bc9f2b", "bold": true diff --git a/storage/templates/modern.js b/storage/templates/modern.js index 06e0e3c8b939..548dab0276b8 100755 --- a/storage/templates/modern.js +++ b/storage/templates/modern.js @@ -75,13 +75,13 @@ }, { "text": "$balanceDueLabel", - "style": "balanceDueLabel", + "style": "subtotalsBalanceDueLabel", "margin": [0, 16, 0, 0], "width": 370 }, { "text": "$balanceDue", - "style": "balanceDue", + "style": "subtotalsBalanceDue", "margin": [0, 16, 8, 0] } ] @@ -202,13 +202,13 @@ "lineTotalTableHeader": { "alignment": "right" }, - "balanceDueLabel": { + "subtotalsBalanceDueLabel": { "fontSize": "$fontSizeLargest", "color":"#FFFFFF", "alignment":"right", "bold": true }, - "balanceDue": { + "subtotalsBalanceDue": { "fontSize": "$fontSizeLargest", "color":"#FFFFFF", "bold": true, diff --git a/storage/templates/photo.js b/storage/templates/photo.js index e372bd149271..e441f5afafee 100755 --- a/storage/templates/photo.js +++ b/storage/templates/photo.js @@ -142,10 +142,10 @@ "bold": true, "fontSize": "$fontSizeLarger" }, - "balanceDueLabel": { + "subtotalsBalanceDueLabel": { "fontSize": "$fontSizeLargest" }, - "balanceDue": { + "subtotalsBalanceDue": { "fontSize": "$fontSizeLargest", "color": "$primaryColor:#cd5138" }, diff --git a/storage/templates/plain.js b/storage/templates/plain.js index 990290edd602..f41add7f69cd 100755 --- a/storage/templates/plain.js +++ b/storage/templates/plain.js @@ -157,10 +157,10 @@ "invoiceDetailBalanceDue": { "fillColor": "#e6e6e6" }, - "balanceDueLabel": { + "subtotalsBalanceDueLabel": { "fillColor": "#e6e6e6" }, - "balanceDue": { + "subtotalsBalanceDue": { "fillColor": "#e6e6e6" }, "header": { diff --git a/storage/templates/playful.js b/storage/templates/playful.js index abb4dee632b4..f135a86341dc 100755 --- a/storage/templates/playful.js +++ b/storage/templates/playful.js @@ -201,12 +201,12 @@ "lineTotalTableHeader": { "alignment": "right" }, - "balanceDueLabel": { + "subtotalsBalanceDueLabel": { "fontSize": "$fontSizeLargest", "color":"#FFFFFF", "bold": true }, - "balanceDue": { + "subtotalsBalanceDue": { "fontSize": "$fontSizeLargest", "bold": true, "color":"#FFFFFF",