feat(templates): Added selfservice qr

fix(models): Add required SelfServiceLink field to RunnerWithDonations struct
fix(barcode): Use auto encoding for QR code generation to support all characters
2025-04-17 21:44:58 +02:00 · 2025-04-17 21:43:54 +02:00 · 2025-04-17 21:43:44 +02:00 · 2025-04-14 18:08:03 +02:00 · 2025-04-14 17:56:49 +02:00 · 2025-04-10 15:29:29 +02:00
10 changed files with 56 additions and 14 deletions
--- a/.env
+++ b/.env
@@ -11,7 +11,7 @@ CARD_SUBTITLE=Kaya ist cool
 CARD_BARCODEFORMAT=ean13
 # CARD_BARCODEPREFIX=

-SPONSOING_RECEIPTMINIMUM=40
+SPONSORING_RECEIPTMINIMUM=40
 SPONSORING_DISCLAIMER=Kaya ist cool, aber pass auf, dass du nicht zu viel Geld sammelst!
 SPONSORING_BARCODEFORMAT=code128
 # SPONSORING_BARCODEPREFIX=
--- a/models/certificate.go
+++ b/models/certificate.go
@@ -15,6 +15,7 @@ type RunnerWithDonations struct {
 	DistanceDonations []DistanceDonation `json:"distance_donations" validate:"optional"`
 	TotalPerDistance  int                `json:"total_per_distance" validate:"optional"`
 	TotalDonations    int                `json:"total_donations" validate:"optional"`
+	SelfServiceLink   string             `json:"self_service_link" validate:"required"`
 }

 type DistanceDonation struct {
--- a/models/config.go
+++ b/models/config.go
@@ -10,7 +10,7 @@ type Config struct {
 	CardSubtitle             string `mapstructure:"CARD_SUBTITLE"`
 	CardBarcodeFormat        string `mapstructure:"CARD_BARCODEFORMAT"`
 	CardBarcodePrefix        string `mapstructure:"CARD_BARCODEPREFIX"`
-	SponsoringReceiptMinimum string `mapstructure:"SPONSOING_RECEIPTMINIMUM"`
+	SponsoringReceiptMinimum string `mapstructure:"SPONSORING_RECEIPTMINIMUM"`
 	SponosringDisclaimer     string `mapstructure:"SPONSORING_DISCLAIMER"`
 	SponsoringBarcodeFormat  string `mapstructure:"SPONSORING_BARCODEFORMAT"`
 	SponsoringBarcodePrefix  string `mapstructure:"SPONSORING_BARCODEPREFIX"`
--- a/services/barcode.go
+++ b/services/barcode.go
@@ -69,7 +69,11 @@ func (b *DefaultBarcodeService) GenerateBarcode(format string, content string, w
 		}
 		break
 	case "qr":
-		generatedCode, err = qr.Encode(content, qr.M, qr.AlphaNumeric)
+		// Always use qr.Auto encoding to support all characters in the content
+		encoding := qr.Auto
+
+		// QR code generation with error correction level M and auto encoding
+		generatedCode, err = qr.Encode(content, qr.M, encoding)
 		if err != nil {
 			return bytes.Buffer{}, err
 		}
--- a/static/images/sponsors/atlantis.base64
+++ b/static/images/sponsors/atlantis.base64
--- a/static/images/sponsors/herzogspark.base64
+++ b/static/images/sponsors/herzogspark.base64
--- a/static/templates/card/de.html
+++ b/static/templates/card/de.html
@@ -2,7 +2,7 @@

 <head>
  <meta charset="utf8">
-  <title>Sponsoring contract</title>
+  <title>Läuferkarten</title>
  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.1/css/bulma.min.css">
  <style>
    .sheet {
--- a/static/templates/card/en.html
+++ b/static/templates/card/en.html
@@ -2,7 +2,7 @@

 <head>
  <meta charset="utf8">
-  <title>Sponsoring contract</title>
+  <title>Runner cards</title>
  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.1/css/bulma.min.css">
  <style>
    .sheet {
--- a/static/templates/certificate/de.html
+++ b/static/templates/certificate/de.html
@@ -2,7 +2,7 @@

 <head>
  <meta charset="utf8">
-  <title>Sponsoring contract</title>
+  <title>Läuferurkunde</title>
  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.1/css/bulma.min.css">
  <style>
    .sheet {
@@ -87,13 +87,30 @@
          <td>Gesamt</td>
          <td>{{ formatUnit "euro" $.Locale .TotalPerDistance }} {{ $.CurrencySymbol }}</td>
          <td>{{ formatUnit "euro" $.Locale .TotalDonations }} {{ $.CurrencySymbol }}</td>
-        </tfoot>
-      </table>
-    </main>
-    <footer class="certificate-footer">
-      <p>
-        {{ $.Footer }}
-      </p>
+        </table>
+        </main>
+        <footer class="certificate-footer">
+            <table style="border-collapse: collapse; border: none; width: 17cm;">
+            <thead>
+              <tr>
+              <th style="border: none; width: 50%; text-align: center;">Link zu deinen Rundenzeiten</th>
+              <!-- <th style="border: none; width: 50%; text-align: center;">Spende überweisen</th> -->
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+              <td style="border: none; text-align: center;">
+                <img src="data:image/png;base64,{{ barcode .SelfServiceLink "qr" "" }}" style="height: 2.5cm; padding: 0.2cm">
+              </td>
+              <td style="border: none; text-align: center;">
+                <!-- <img src="data:image/png;base64,{{ barcode ".SelfServiceLink" "qr" "" }}" style="height: 2.5cm; padding: 0.2cm"> -->
+              </td>
+              </tr>
+            </tbody>
+            </table>
+          <p style="text-align: center;">
+            {{ $.Footer }}
+          </p>
    </footer>
  </article>
  {{ end }}
--- a/static/templates/certificate/en.html
+++ b/static/templates/certificate/en.html
@@ -2,7 +2,7 @@

 <head>
  <meta charset="utf8">
-  <title>Sponsoring contract</title>
+  <title>Runner certificate</title>
  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.1/css/bulma.min.css">
  <style>
    .sheet {
@@ -91,6 +91,24 @@
      </table>
    </main>
    <footer class="certificate-footer">
+      <table style="border-collapse: collapse; border: none; width: 17cm;">
+        <thead>
+          <tr>
+            <th style="border: none; width: 50%; text-align: center;">Link to your lap times</th>
+            <!-- <th style="border: none; width: 50%; text-align: center;">Transfer donation</th> -->
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+          <td style="border: none; text-align: center;">
+            <img src="data:image/png;base64,{{ barcode .SelfServiceLink "qr" "" }}" style="height: 2.5cm; padding: 0.2cm">
+          </td>
+          <td style="border: none; text-align: center;">
+            <!-- <img src="data:image/png;base64,{{ barcode ".SelfServiceLink" "qr" "" }}" style="height: 2.5cm; padding: 0.2cm"> -->
+          </td>
+          </tr>
+        </tbody>
+        </table>
      <p>
        {{ $.Footer }}
      </p>
Author	SHA1	Message	Date
Nicolai Ort	6d2e0241c9	feat(templates): Added selfservice qr All checks were successful Build release images / build-container (push) Successful in 2m12s Details Build latest image / build-container (push) Successful in 2m26s Details	2025-04-17 21:44:58 +02:00
Nicolai Ort	afc5b1f0c6	fix(models): Add required SelfServiceLink field to RunnerWithDonations struct	2025-04-17 21:43:54 +02:00
Nicolai Ort	4a76ee469b	fix(barcode): Use auto encoding for QR code generation to support all characters	2025-04-17 21:43:44 +02:00
Nicolai Ort	b58bf700df	chore(static) Add base64 encoded image for new sponsors All checks were successful Build latest image / build-container (push) Successful in 2m2s Details Build release images / build-container (push) Successful in 2m6s Details	2025-04-14 18:08:03 +02:00
Nicolai Ort	efd3a35802	fix(templates): Update titles for runner and certificate templates	2025-04-14 17:56:49 +02:00
Nicolai Ort	0f7e44a42a	fix(models): Correct typo in SponsoringReceiptMinimum mapstructure tag All checks were successful Build latest image / build-container (push) Successful in 2m6s Details Build release images / build-container (push) Successful in 2m17s Details	2025-04-10 15:29:29 +02:00