Merge branch 'main' of git.odit.services:lfk/document-server

.env

@@ -11,9 +11,13 @@ 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=
 
-CERTIFICATE_FOOTER=Kaya ist cool, danke für deine Unterstützung!
+CERTIFICATE_FOOTER=Kaya ist cool, danke für deine Unterstützung!
+
+SEPA_BIC=FNOMDEB2
+SEPA_NAME=ODIT.Services
+SEPA_IBAN=DE25100180000690238989

handlers/certificate.go

@@ -58,6 +58,12 @@ func (h *DefaultHandler) GenerateCertificate(c *fiber.Ctx) error {
 		Footer:         h.Config.CertificateFooter,
 		CurrencySymbol: h.Config.CurrencySymbol,
 		Locale:         certificateRequest.Locale,
+		SepaConfig: &models.SepaConfig{
+			BIC:                h.Config.SepaBic,
+			HolderName:         h.Config.SepaName,
+			IBAN:               h.Config.SepaIban,
+			CurrencyIdentifier: h.Config.CurrencyIdentifier,
+		},
 	}
 
 	logger.Info("Generating certificate html")
@@ -90,6 +96,13 @@ func addUpRunnerDonations(runners []models.RunnerWithDonations) []models.RunnerW
 			runners[i].TotalDonations += runners[i].DistanceDonations[j].Amount
 			runners[i].TotalPerDistance += runners[i].DistanceDonations[j].AmountPerDistance
 		}
+		if runners[i].Group.ParentGroup.Name != "" {
+			runners[i].CombinedGroupName = runners[i].Group.ParentGroup.Name + " - " + runners[i].Group.Name
+		} else {
+			runners[i].CombinedGroupName = runners[i].Group.Name
+
+		}
+
 	}
 	return runners
 }

main.go

@@ -44,6 +44,7 @@ func loadEnv() error {
 	viper.SetDefault("APIKEY", "lfk")
 	viper.SetDefault("EVENTNAME", "Demo Event")
 	viper.SetDefault("CURRENCYSYMBOL", "€")
+	viper.SetDefault("CURRENCYIDENTIFIER", "EUR")
 	viper.SetDefault("CARD_SUBTITLE", "Runner Card")
 	viper.SetDefault("CARD_BARCODEFORMAT", "ean13")
 	viper.SetDefault("CARD_BARCODEPREFIX", "")
@@ -54,6 +55,9 @@ func loadEnv() error {
 	viper.SetDefault("CERTIFICATE_FOOTER", "Footer")
 	viper.SetDefault("GOTENBERG_BASEURL", "")
 	viper.SetDefault("REDIS_ADDR", "")
+	viper.SetDefault("SEPA_BIC", "")
+	viper.SetDefault("SEPA_NAME", "")
+	viper.SetDefault("SEPA_IBAN", "")
 
 	// Load .env file
 	viper.SetConfigFile(".env")

models/certificate.go

@@ -11,10 +11,12 @@ type RunnerWithDonations struct {
 	MiddleName        string             `json:"middle_name" validate:"optional"`
 	LastName          string             `json:"last_name" validate:"required"`
 	Group             Group              `json:"group" validate:"required"`
+	CombinedGroupName string             `json:"combined_group_name" validate:"optional"`
 	Distance          int                `json:"distance" validate:"required"`
 	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 {
@@ -38,4 +40,12 @@ type CertificateTemplateOptions struct {
 	Footer         string                `json:"footer"`
 	CurrencySymbol string                `json:"currency_symbol"`
 	Locale         string                `json:"locale"`
+	SepaConfig     *SepaConfig           `json:"sepa_config"`
+}
+
+type SepaConfig struct {
+	IBAN               string `json:"iban" validate:"required"`
+	HolderName         string `json:"holder_name" validate:"required"`
+	BIC                string `json:"bic" validate:"required"`
+	CurrencyIdentifier string `json:"currency_identifier" validate:"required"`
 }

models/config.go

@@ -7,14 +7,18 @@ type Config struct {
 	APIKey                   string `mapstructure:"APIKEY"`
 	EventName                string `mapstructure:"EVENTNAME"`
 	CurrencySymbol           string `mapstructure:"CURRENCYSYMBOL"`
+	CurrencyIdentifier       string `mapstructure:"CURRENCYIDENTIFIER"`
 	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"`
 	CertificateFooter        string `mapstructure:"CERTIFICATE_FOOTER"`
 	GotenbergBaseUrl         string `mapstructure:"GOTENBERG_BASEURL"`
 	RedisAddr                string `mapstructure:"REDIS_ADDR"`
+	SepaBic                  string `mapstructure:"SEPA_BIC"`
+	SepaName                 string `mapstructure:"SEPA_NAME"`
+	SepaIban                 string `mapstructure:"SEPA_IBAN"`
 }

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
 		}

services/templater.go

@@ -35,6 +35,28 @@ func idToEan13(id string, prefix string) (string, error) {
 	return id, nil
 }
 
+func (t *DefaultTemplater) GenerateEPC(iban string, bic string, name string, title string, amount int, currency string) (string, error) {
+	var err error
+
+	code := fmt.Sprintf(`BCD
+002
+1
+INST
+%s
+%s
+%s
+%s%.2f
+
+%s
+
+`, bic, name, iban, currency, float64(amount)/100, title,
+	)
+
+	buf, err := t.BarcodeService.GenerateBarcode("qr", code, 500, 500, 0)
+
+	return base64.StdEncoding.EncodeToString(buf.Bytes()), err
+}
+
 func (t *DefaultTemplater) GenerateBarcode(code string, format string, prefix string) (string, error) {
 	var err error
 
@@ -88,6 +110,7 @@ func (t *DefaultTemplater) StringToTemplate(templateString string) (*template.Te
 		"sponsorLogo": t.SelectSponsorImage,
 		"formatUnit":  t.FormatUnit,
 		"loadImage":   t.LoadImage,
+		"epcCode":     t.GenerateEPC,
 	}).Parse(templateString)
 }
 

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 {

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 {

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>
-      </table>
+        </main>
-    </main>
+        <footer class="certificate-footer">
-    <footer class="certificate-footer">
+            <table style="border-collapse: collapse; border: none; width: 17cm;">
-      <p>
+            <thead>
-        {{ $.Footer }}
+              <tr>
-      </p>
+              <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,{{ epcCode $.SepaConfig.IBAN $.SepaConfig.BIC $.SepaConfig.HolderName (print "Sponsoring für " .FirstName " " .LastName ", " .CombinedGroupName) .TotalDonations $.SepaConfig.CurrencyIdentifier}}" style="height: 2.5cm; padding: 0.2cm">
+              </td>
+              </tr>
+            </tbody>
+            </table>
+            <p style="width: 17cm; text-align: center;">
+              {{ $.Footer }}
+            </p>
     </footer>
   </article>
   {{ end }}

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,7 +91,25 @@
       </table>
     </main>
     <footer class="certificate-footer">
-      <p>
+      <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 via SEPA</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,{{ epcCode $.SepaConfig.IBAN $.SepaConfig.BIC $.SepaConfig.HolderName (print "Sponsoring for " .FirstName " " .LastName ", " .CombinedGroupName) .TotalDonations $.SepaConfig.CurrencyIdentifier}}" style="height: 2.5cm; padding: 0.2cm">
+          </td>
+          </tr>
+        </tbody>
+        </table>
+      <p style="width: 17cm; text-align: center;">
         {{ $.Footer }}
       </p>
     </footer>