Merge pull request 'Release 0.5.1' (#43) from dev into main

Reviewed-on: #43
Reviewed-by: Philipp Dormann <philipp@philippdormann.de>

CHANGELOG.md

@@ -2,16 +2,26 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
-#### [v0.5.0](https://git.odit.services/lfk/document-server/compare/v0.5.0...v0.5.0)
+#### [v0.5.1](https://git.odit.services/lfk/document-server/compare/v0.5.0...v0.5.1)
 
 - Quick callstack fix🛠 [`76418f6`](https://git.odit.services/lfk/document-server/commit/76418f65e1e111e83838f0d42c541ae6a8063a09)
 - Fixed barcode generation for runenrcard pdfs🐞 [`f78037c`](https://git.odit.services/lfk/document-server/commit/f78037c0f15162d5b98986edf20d263961f43e69)
+- Updated docker-compose example🐳 [`a4c8dad`](https://git.odit.services/lfk/document-server/commit/a4c8dade23e448d4d4caefe304a6cd9195c873a4)
 - Now laoding card subtitle from env [`e97e209`](https://git.odit.services/lfk/document-server/commit/e97e2097463f4c88947e865a38ea1e5aa2be1f5d)
 - typo fixes [`fa26ed6`](https://git.odit.services/lfk/document-server/commit/fa26ed6012ded759d3702587dba67c2090324801)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`2ee4c06`](https://git.odit.services/lfk/document-server/commit/2ee4c060557a44db1974a015412288f7942ebe72)
+- more typo fixes [`981bae4`](https://git.odit.services/lfk/document-server/commit/981bae4786a2fa12a1355122e8c5a1e95e29cf32)
+- You can now configure the card's code format distinct from the others [`ac9be79`](https://git.odit.services/lfk/document-server/commit/ac9be793bd598771174f5313ef8288240306ba5c)
+- 🚀Bumped version to v0.5.1 [`22fb3ed`](https://git.odit.services/lfk/document-server/commit/22fb3edd7836ba4ca35e6b208ab6f6620da60f4a)
+- Emoji+Chinese fixes🌍 [`b6fc069`](https://git.odit.services/lfk/document-server/commit/b6fc069042dc9c5d7ec97f2660568e8e105780b9)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`cc4a2b4`](https://git.odit.services/lfk/document-server/commit/cc4a2b4ab4c2cb9976797f93e8348607fb88ea7d)
 - Dependenc bump 🔝 [`d8f3a6e`](https://git.odit.services/lfk/document-server/commit/d8f3a6ed063a9cdf6189e85ae01a5516b4295892)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`a57e090`](https://git.odit.services/lfk/document-server/commit/a57e0909b919a1c720c9994b6baa8910b78dc569)
+- 🧾New changelog file version [CI SKIP] [skip ci] [`ded610f`](https://git.odit.services/lfk/document-server/commit/ded610f11464a27429b8184a32554e99aed63f72)
+- 🧾New changelog file version [CI SKIP] [skip ci] [`60cc343`](https://git.odit.services/lfk/document-server/commit/60cc343adf71ed3b849d1d93af3d60cbc2820fed)
+- Added new config options to reamde [`010f204`](https://git.odit.services/lfk/document-server/commit/010f2046ad326898c75b6546e4d70a6f78346d8b)
+- 🧾New changelog file version [CI SKIP] [skip ci] [`2e7c3e8`](https://git.odit.services/lfk/document-server/commit/2e7c3e8a5b7f6a0461254b33c6f412929719c966)
+- 🧾New changelog file version [CI SKIP] [skip ci] [`754d0ca`](https://git.odit.services/lfk/document-server/commit/754d0ca58ccf8f77570ff6218f2dec61cfb4f808)
 - Fixed typo in translation [`8f30d89`](https://git.odit.services/lfk/document-server/commit/8f30d8933f105b4bf112c81222a72ca1931145d7)
 - 🧾New changelog file version [CI SKIP] [skip ci] [`3c02e13`](https://git.odit.services/lfk/document-server/commit/3c02e13997b1626fb0e6496da4c58eac2cc6fcf8)
 

Dockerfile

@@ -19,7 +19,9 @@ RUN apk add --no-cache \
       ca-certificates \
       ttf-freefont \
       nodejs \
-      yarn
+      yarn \
+      font-noto-emoji \
+      && apk add wqy-zenhei --update-cache --repository https://nl.alpinelinux.org/alpine/edge/testing
 
 # Tell Puppeteer to skip installing Chrome. We'll be using the installed package.
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true \

README.md

@@ -39,6 +39,9 @@ The basic generation mechanism makes the templates and routes interchangeable (i
 | 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.
 | DONATIONS_FOOTER_TEXT | String | N/A | A text that will get displayed on the bottom of each runner certificate's second page. R/N You can only provide the text for one language.
 | CONTRACTS_PER_RUNNER | Number | 1 | The amount of contracts that get created per runner (per request).
+| CODEFORMAT | String | code39 | The barcode format for everything except.
+| CODEFORMAT_CARDS | String | code39 | The barcode format for runnercards (overwrites CODEFORMAT).
+| CARD_SUBTITLE | String | Empty | A subtitle that get's displayed on the cards under the eventname.
 
 ## Templates
 > The document server uses html templates to generate various pdf documents.

docker-compose.yml

@@ -7,9 +7,12 @@ services:
     environment:
       APP_PORT: 4010
       NODE_ENV: production
-      EVENT_NAME: "Lauf für Kaya! 2021"
+      EVENT_NAME: "Testen für Kaya!"
       CURRENCY_SYMBOL: "€"
-      API_KEY: RYRccAJ4SKZnZaEci6Nyk9Z6mw3sD94fyKJ74WNzi6hLkxGNyJDrKPkxBmPwvR4f
+      API_KEY: NqZSYTy5AFQ7MppbLW5moqpTk7u7YrNUHKYhKYuThnnya2WpCOIU694hIZT1FzYe
       CONTRACTS_PER_RUNNER: 2
-      SPONSORING_RECEIPT_MINIMUM_AMOUNT: 50
-      DISCLAIMER_TEXT: "Rechtsgrundlage unserer Datenverarbeitung aufgrund freiwilliger Einwilligung ist Art. 6 Abs. 1 e), Abs. 3 DSGVO i.V.m. Art. 85 BayEUG. Mit Ihrer Unterschrift willigen Sie in unsere Datennutzung zum Zwecke des Lauf für Kaya! ein. Die Daten für Spendenquittungen"
+      SPONSORING_RECEIPT_MINIMUM_AMOUNT: 42
+      DISCLAIMER_TEXT: "Hier könnte ihre Werbung stehen"
+      CODEFORMAT: "code39"
+      CODEFORMAT_CARDS: "ean13"
+      CARD_SUBTITLE: "Hier könnte mehr Werbung stehen"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@odit/lfk-document-server",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "The document generation server for the LfK! runner system. This generates certificates, sponsoring aggreements and more",
   "main": "src/app.ts",
   "scripts": {
@@ -87,4 +87,4 @@
       "publish": false
     }
   }
-}
+}

src/PdfCreator.ts

@@ -151,7 +151,7 @@ export class PdfCreator {
      * @param cards The runner cars you want to generate the cards for.
      * @param locale The locale used for the cards (default:en)
      */
-    public async generateRunnerCards(cards: RunnerCard[], locale: string = "en", codeformat: string = config.codeformat): Promise<Buffer> {
+    public async generateRunnerCards(cards: RunnerCard[], locale: string = "en", codeformat: string = config.codeformat_cards): Promise<Buffer> {
         if (cards.length > 10) {
             let pdf_promises = new Array<Promise<Buffer>>();
             let i, j;

src/config.ts

@@ -9,7 +9,8 @@ export const config = {
     eventname: process.env.EVENT_NAME || "Please set the event name",
     currency_symbol: process.env.CURRENCY_SYMBOL || "€",
     sponsoring_receipt_minimum_amount: process.env.SPONSORING_RECEIPT_MINIMUM_AMOUNT || "10",
-    codeformat: process.env.CODEFORMAT || "qrcode",
+    codeformat: process.env.CODEFORMAT || "code39",
+    codeformat_cards: process.env.CODEFORMAT_CARDS || process.env.CODEFORMAT || "code39",
     sponor_logos: getSponsorLogos(),
     api_key: getApiKey(),
     disclaimer_text: process.env.DISCLAIMER_TEXT || "",

src/locales/de.json

@@ -1,13 +1,13 @@
 {
     "address": "Adresse",
-    "betrag-km": "Betrag/KM",
+    "betrag-km": "Betrag/ km",
     "city": "Stadt",
     "date": "Datum",
     "firstname": "Vorname",
     "fuer-den-guten-zweck-zurueckgelegt": "für den guten Zweck zurückgelegt",
     "gesamt": "Gesamt",
     "gesamtbetrag": "Gesamtbetrag",
-    "group": "Team/Klasse",
+    "group": "Team/ Klasse",
     "hat-beim-eventname": "Hat beim {{eventname}}",
     "house_number": "Hausnummer",
     "id": "ID",
@@ -21,7 +21,7 @@
     "sponsor-in": "Sponsor:in",
     "sponsoring_address_condition": "Muss ausgefüllt werden, wenn Sie eine Spendenquittung benötigen - Spendenquittungen können erst ab einem Gesamtbetrag von {{sponsoring_receipt_minimum_amount}}{{currency_symbol}} ausgestellt werden",
     "sponsoring_amount_per_distance": "mit einem Betrag von _____{{currency_symbol}} pro gelaufenem Kilometer zu unterstützen.",
-    "sponsoring_subtitle": "Ich/Wir sind bereit anlässlich des {{eventname}}",
+    "sponsoring_subtitle": "Ich bin/ Wir sind bereit anlässlich des {{eventname}}",
     "sponsoring_title": "Sponsoringerklärung",
     "sponsorings": "Sponsorings",
     "street": "Straße",