From 4e1e124d0dc08f96aeb05dd1c975064fe785b80f Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Sat, 20 Feb 2021 15:58:11 +0100 Subject: [PATCH 1/5] Added disclaimer to template ref #33 --- src/templates/sponsoring_contract.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/templates/sponsoring_contract.html b/src/templates/sponsoring_contract.html index ddcad0a..4815594 100644 --- a/src/templates/sponsoring_contract.html +++ b/src/templates/sponsoring_contract.html @@ -81,7 +81,7 @@

{{__ "address"}} ({{__ "sponsor"}})

({{__ "sponsoring_address_condition"}})

-
+
 

{{__ "street"}}

@@ -91,7 +91,7 @@

{{__ "house_number"}}

-
+
 

{{__ "postalcode"}}

@@ -101,8 +101,7 @@

{{__ "city"}}

-
-
+
 

{{__ "location"}}, {{__ "date"}}

@@ -112,6 +111,7 @@

{{__ "signature"}}

+

{{../disclaimer}}

{{/each}} -- 2.47.2 From 03ed6d5bc18c5b26edd7b1d698c9de936e008f32 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Sat, 20 Feb 2021 16:03:15 +0100 Subject: [PATCH 2/5] Updated styleing ref #33 --- src/templates/sponsoring_contract.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/templates/sponsoring_contract.html b/src/templates/sponsoring_contract.html index 4815594..13e8e15 100644 --- a/src/templates/sponsoring_contract.html +++ b/src/templates/sponsoring_contract.html @@ -68,8 +68,8 @@

{{__ "group"}}

-

{{__ "sponsoring_amount_per_distance"}}

-
+

{{__ "sponsoring_amount_per_distance"}}

+
 

{{__ "lastname"}}

@@ -79,9 +79,9 @@

{{__ "firstname"}}

-

{{__ "address"}} ({{__ "sponsor"}})

+

{{__ "address"}} ({{__ "sponsor"}})

({{__ "sponsoring_address_condition"}})

-
+
 

{{__ "street"}}

@@ -91,7 +91,7 @@

{{__ "house_number"}}

-
+
 

{{__ "postalcode"}}

@@ -101,7 +101,7 @@

{{__ "city"}}

-
+
 

{{__ "location"}}, {{__ "date"}}

@@ -111,7 +111,7 @@

{{__ "signature"}}

-

{{../disclaimer}}

+

{{../disclaimer}}

{{/each}} -- 2.47.2 From 885765ac71b6a65c869ee841c383667f4947dcde Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Sat, 20 Feb 2021 16:03:54 +0100 Subject: [PATCH 3/5] MAde disclaimer configurable via env --- src/PdfCreator.ts | 2 +- src/config.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/PdfCreator.ts b/src/PdfCreator.ts index b48889e..50023e1 100644 --- a/src/PdfCreator.ts +++ b/src/PdfCreator.ts @@ -121,7 +121,7 @@ export class PdfCreator { await i18next.changeLanguage(locale); const template_source = fs.readFileSync(`${this.templateDir}/sponsoring_contract.html`, 'utf8'); const template = Handlebars.compile(template_source); - let result = template({ runners, codeformat }); + let result = template({ runners, codeformat, disclaimer: config.disclaimer_text }); result = await awaitAsyncHandlebarHelpers(result); const pdf = await this.renderPdf(result, { format: "A5", landscape: true }); return pdf diff --git a/src/config.ts b/src/config.ts index bded138..d6e2565 100644 --- a/src/config.ts +++ b/src/config.ts @@ -12,6 +12,7 @@ export const config = { codeformat: process.env.CODEFORMAT || "qrcode", sponor_logos: getSponsorLogos(), api_key: getApiKey(), + disclaimer_text: process.env.DISCLAIMER_TEXT || "", } let errors = 0 if (typeof config.internal_port !== "number") { -- 2.47.2 From 5e4d6f44dab581483135594432bd8c8d65ba74ef Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Sat, 20 Feb 2021 16:03:54 +0100 Subject: [PATCH 4/5] MAde disclaimer configurable via env ref #33 --- src/PdfCreator.ts | 2 +- src/config.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/PdfCreator.ts b/src/PdfCreator.ts index b48889e..50023e1 100644 --- a/src/PdfCreator.ts +++ b/src/PdfCreator.ts @@ -121,7 +121,7 @@ export class PdfCreator { await i18next.changeLanguage(locale); const template_source = fs.readFileSync(`${this.templateDir}/sponsoring_contract.html`, 'utf8'); const template = Handlebars.compile(template_source); - let result = template({ runners, codeformat }); + let result = template({ runners, codeformat, disclaimer: config.disclaimer_text }); result = await awaitAsyncHandlebarHelpers(result); const pdf = await this.renderPdf(result, { format: "A5", landscape: true }); return pdf diff --git a/src/config.ts b/src/config.ts index bded138..d6e2565 100644 --- a/src/config.ts +++ b/src/config.ts @@ -12,6 +12,7 @@ export const config = { codeformat: process.env.CODEFORMAT || "qrcode", sponor_logos: getSponsorLogos(), api_key: getApiKey(), + disclaimer_text: process.env.DISCLAIMER_TEXT || "", } let errors = 0 if (typeof config.internal_port !== "number") { -- 2.47.2 From 9dd62cefa94bf3f0bf8e77fd25e7ca1ec4b30e2b Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Sat, 20 Feb 2021 16:05:58 +0100 Subject: [PATCH 5/5] Added reamde entry for the new env var ref #33 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ac522c5..3773b94 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,7 @@ The basic generation mechanism makes the templates and routes interchangeable (i | SPONSORING_RECEIPT_MINIMUM_AMOUNT | String | "10" | The mimimum total donation amount a sponsor has to donate to be able to receive a donation receipt - used to generate pdf text. | SPONOR_LOGOS | Array | Empty png | The sponsor images you want to loop through. You can provide them via http url, local file or base64-encoded image. | API_KEY | String(min length: 64) | Random generated string | The api key you want to use for auth (query-param `key`), has to be at least 64 chars long. +| DISCLAIMER_TEXT | String | N/A | A disclaimer that will get displayed on the bottom of each sponsoring contract. R/N You can only provide the disclaimer for one language. ## Templates > The document server uses html templates to generate various pdf documents. -- 2.47.2