Merge pull request #24 from invopop/fix-payment-instr-missing

Fix: missing 'cheque' payment instruction method
invopop · Dec 5, 2024 · dfc4147 · dfc4147
2 parents e70b522 + 49578b5
commit dfc4147
Show file tree

Hide file tree

Showing 37 changed files with 346 additions and 78 deletions.
diff --git a/components/bill/invoice/customer_templ.go b/components/bill/invoice/customer_templ.go
diff --git a/components/bill/invoice/invoice_templ.go b/components/bill/invoice/invoice_templ.go
diff --git a/components/bill/invoice/lines_templ.go b/components/bill/invoice/lines_templ.go
diff --git a/components/bill/invoice/notes_templ.go b/components/bill/invoice/notes_templ.go
diff --git a/components/bill/invoice/payment.templ b/components/bill/invoice/payment.templ
@@ -2,6 +2,7 @@ package invoice
 
 import (
 	"context"
+	"fmt"
 	"github.com/invopop/ctxi18n/i18n"
 	"github.com/invopop/gobl.html/components/t"
 	"github.com/invopop/gobl/bill"
@@ -211,20 +212,11 @@ func paymentInstrMethodName(ctx context.Context, inst *pay.Instructions) string
 	if inst.Detail != "" {
 		return inst.Detail
 	}
-	ctx = i18n.WithScope(ctx, ".methods")
-	switch inst.Key {
-	case pay.MeansKeyCard:
-		return i18n.T(ctx, ".card")
-	case pay.MeansKeyCreditTransfer:
-		return i18n.T(ctx, ".credit_transfer")
-	case pay.MeansKeyCash:
-		return i18n.T(ctx, ".cash")
-	case pay.MeansKeyDirectDebit:
-		return i18n.T(ctx, ".direct_debit")
-	case pay.MeansKeyOnline:
-		return i18n.T(ctx, ".online")
+	key := fmt.Sprintf(".methods.%s", inst.Key)
+	if !i18n.Has(ctx, key) {
+		return ""
 	}
-	return ""
+	return i18n.T(ctx, key)
 }
 
 func paymentTermsKeyName(ctx context.Context, terms *pay.Terms) string {