feat: user templates
This commit was merged in pull request #9.
This commit is contained in:
@@ -9,7 +9,7 @@ import (
|
||||
"git.schreifuchs.ch/lou-taylor/accounting/pkg/invoice/report"
|
||||
)
|
||||
|
||||
func (s *Service) Generate(creditor model.Entity, deptor *model.Entity, rate float64, repos []Repo, config *Options) (document io.ReadCloser, r *report.Report, err error) {
|
||||
func (s *Service) Generate(creditor model.Entity, debtor *model.Entity, rate float64, repos []Repo, config *Options) (document io.ReadCloser, r report.Report, err error) {
|
||||
if config == nil {
|
||||
config = &DefaultOptions
|
||||
}
|
||||
@@ -27,20 +27,33 @@ func (s *Service) Generate(creditor model.Entity, deptor *model.Entity, rate flo
|
||||
},
|
||||
)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
return nil, r, err
|
||||
}
|
||||
|
||||
is = append(is, iss...)
|
||||
}
|
||||
|
||||
is = filter(is, config.IssueFilter)
|
||||
{
|
||||
issueURLs := make([]string, 0, len(is))
|
||||
for _, issue := range is {
|
||||
issueURLs = append(issueURLs, issue.HTMLURL)
|
||||
}
|
||||
s.log.Debug("loaded all issues", "issueURLs", issueURLs)
|
||||
}
|
||||
|
||||
is = s.filterIssues(is, config.IssueFilter)
|
||||
|
||||
issues := issue.FromGiteas(is, config.Mindur)
|
||||
r = report.New(
|
||||
issues,
|
||||
creditor,
|
||||
deptor,
|
||||
debtor,
|
||||
rate,
|
||||
)
|
||||
|
||||
if len(config.CustomTemplate) > 1 {
|
||||
r = r.WithTemplate(config.CustomTemplate)
|
||||
}
|
||||
html, err := r.ToHTML()
|
||||
if err != nil {
|
||||
return document, r, err
|
||||
@@ -50,12 +63,14 @@ func (s *Service) Generate(creditor model.Entity, deptor *model.Entity, rate flo
|
||||
return document, r, err
|
||||
}
|
||||
|
||||
func filter[T any](slice []T, ok func(T) bool) []T {
|
||||
out := make([]T, 0, len(slice))
|
||||
func (s *Service) filterIssues(slice []*gitea.Issue, ok func(*gitea.Issue) bool) []*gitea.Issue {
|
||||
out := make([]*gitea.Issue, 0, len(slice))
|
||||
|
||||
for _, item := range slice {
|
||||
if ok(item) {
|
||||
out = append(out, item)
|
||||
for _, issue := range slice {
|
||||
if ok(issue) {
|
||||
out = append(out, issue)
|
||||
} else {
|
||||
s.log.Debug("filter out issue", "issueURL", issue.HTMLURL)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
163
pkg/invoice/invoice_test.go
Normal file
163
pkg/invoice/invoice_test.go
Normal file
@@ -0,0 +1,163 @@
|
||||
package invoice
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"errors"
|
||||
"io"
|
||||
"log/slog"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"code.gitea.io/sdk/gitea"
|
||||
"git.schreifuchs.ch/lou-taylor/accounting/pkg/invoice/model"
|
||||
)
|
||||
|
||||
// MockGiteaClient is a mock implementation of the GiteaClient interface.
|
||||
type MockGiteaClient struct {
|
||||
ListRepoIssuesFunc func(owner, repo string, opt gitea.ListIssueOption) ([]*gitea.Issue, *gitea.Response, error)
|
||||
}
|
||||
|
||||
func (m *MockGiteaClient) ListRepoIssues(owner, repo string, opt gitea.ListIssueOption) ([]*gitea.Issue, *gitea.Response, error) {
|
||||
if m.ListRepoIssuesFunc != nil {
|
||||
return m.ListRepoIssuesFunc(owner, repo, opt)
|
||||
}
|
||||
return nil, nil, errors.New("ListRepoIssuesFunc not implemented")
|
||||
}
|
||||
|
||||
// MockPdfGenerator is a mock implementation of the PdfGenerator interface.
|
||||
type MockPdfGenerator struct {
|
||||
HtmlToPdfFunc func(html string) (io.ReadCloser, error)
|
||||
}
|
||||
|
||||
func (m *MockPdfGenerator) HtmlToPdf(html string) (io.ReadCloser, error) {
|
||||
if m.HtmlToPdfFunc != nil {
|
||||
return m.HtmlToPdfFunc(html)
|
||||
}
|
||||
return nil, errors.New("HtmlToPdfFunc not implemented")
|
||||
}
|
||||
|
||||
func TestGenerate(t *testing.T) {
|
||||
creditor := model.Entity{
|
||||
Name: "creditor",
|
||||
}
|
||||
debtor := model.Entity{
|
||||
Name: "deptor",
|
||||
}
|
||||
rate := 100.0
|
||||
repos := []Repo{
|
||||
{Owner: "owner", Repo: "repo"},
|
||||
}
|
||||
|
||||
testCases := []struct {
|
||||
name string
|
||||
setupMocks func(*MockGiteaClient, *MockPdfGenerator)
|
||||
config *Options
|
||||
expectedError string
|
||||
}{
|
||||
{
|
||||
name: "successful generation",
|
||||
setupMocks: func(g *MockGiteaClient, p *MockPdfGenerator) {
|
||||
g.ListRepoIssuesFunc = func(owner, repo string, opt gitea.ListIssueOption) ([]*gitea.Issue, *gitea.Response, error) {
|
||||
return []*gitea.Issue{
|
||||
{ID: 1, Title: "Test Issue", Body: "```info\nduration: 1h\n```"},
|
||||
}, &gitea.Response{}, nil
|
||||
}
|
||||
p.HtmlToPdfFunc = func(html string) (io.ReadCloser, error) {
|
||||
return io.NopCloser(bytes.NewReader([]byte("pdf"))), nil
|
||||
}
|
||||
},
|
||||
config: &DefaultOptions,
|
||||
expectedError: "",
|
||||
},
|
||||
{
|
||||
name: "gitea error",
|
||||
setupMocks: func(g *MockGiteaClient, p *MockPdfGenerator) {
|
||||
g.ListRepoIssuesFunc = func(owner, repo string, opt gitea.ListIssueOption) ([]*gitea.Issue, *gitea.Response, error) {
|
||||
return nil, nil, errors.New("gitea error")
|
||||
}
|
||||
},
|
||||
config: &DefaultOptions,
|
||||
expectedError: "gitea error",
|
||||
},
|
||||
{
|
||||
name: "pdf error",
|
||||
setupMocks: func(g *MockGiteaClient, p *MockPdfGenerator) {
|
||||
g.ListRepoIssuesFunc = func(owner, repo string, opt gitea.ListIssueOption) ([]*gitea.Issue, *gitea.Response, error) {
|
||||
return []*gitea.Issue{
|
||||
{ID: 1, Title: "Test Issue", Body: "```info\nduration: 1h\n```"},
|
||||
}, &gitea.Response{}, nil
|
||||
}
|
||||
p.HtmlToPdfFunc = func(html string) (io.ReadCloser, error) {
|
||||
return nil, errors.New("pdf error")
|
||||
}
|
||||
},
|
||||
config: &DefaultOptions,
|
||||
expectedError: "pdf error",
|
||||
},
|
||||
{
|
||||
name: "no issues",
|
||||
setupMocks: func(g *MockGiteaClient, p *MockPdfGenerator) {
|
||||
g.ListRepoIssuesFunc = func(owner, repo string, opt gitea.ListIssueOption) ([]*gitea.Issue, *gitea.Response, error) {
|
||||
return []*gitea.Issue{}, &gitea.Response{}, nil
|
||||
}
|
||||
p.HtmlToPdfFunc = func(html string) (io.ReadCloser, error) {
|
||||
return io.NopCloser(bytes.NewReader([]byte("pdf"))), nil
|
||||
}
|
||||
},
|
||||
config: &DefaultOptions,
|
||||
expectedError: "",
|
||||
},
|
||||
{
|
||||
name: "custom template",
|
||||
setupMocks: func(g *MockGiteaClient, p *MockPdfGenerator) {
|
||||
g.ListRepoIssuesFunc = func(owner, repo string, opt gitea.ListIssueOption) ([]*gitea.Issue, *gitea.Response, error) {
|
||||
return []*gitea.Issue{
|
||||
{ID: 1, Title: "Test Issue", Body: "```info\nduration: 1h\n```"},
|
||||
}, &gitea.Response{}, nil
|
||||
}
|
||||
p.HtmlToPdfFunc = func(html string) (io.ReadCloser, error) {
|
||||
return io.NopCloser(bytes.NewReader([]byte("pdf"))), nil
|
||||
}
|
||||
},
|
||||
config: &Options{
|
||||
Mindur: time.Minute * 15,
|
||||
Since: time.Now().AddDate(0, -1, 0),
|
||||
Before: time.Now(),
|
||||
IssueState: gitea.StateClosed,
|
||||
IssueFilter: func(i *gitea.Issue) bool { return true },
|
||||
CustomTemplate: "custom template",
|
||||
},
|
||||
expectedError: "",
|
||||
},
|
||||
}
|
||||
|
||||
for _, tc := range testCases {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
giteaClient := new(MockGiteaClient)
|
||||
|
||||
pdfGenerator := new(MockPdfGenerator)
|
||||
tc.setupMocks(giteaClient, pdfGenerator)
|
||||
|
||||
service := New(slog.Default(), giteaClient, pdfGenerator)
|
||||
doc, _, err := service.Generate(creditor, &debtor, rate, repos, tc.config)
|
||||
|
||||
if tc.expectedError != "" {
|
||||
if err == nil {
|
||||
t.Fatalf("expected an error, but got none")
|
||||
}
|
||||
if !strings.Contains(err.Error(), tc.expectedError) {
|
||||
t.Errorf("expected error to contain '%s', but got '%s'", tc.expectedError, err.Error())
|
||||
}
|
||||
} else {
|
||||
if err != nil {
|
||||
t.Fatalf("expected no error, but got: %v", err)
|
||||
}
|
||||
if doc == nil {
|
||||
t.Fatal("expected a document, but got nil")
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,86 +1,141 @@
|
||||
@page {
|
||||
size: A4;
|
||||
padding: 2cm;
|
||||
}
|
||||
@page:first {
|
||||
padding: 0;
|
||||
}
|
||||
@media print {
|
||||
.page,
|
||||
.page-break {
|
||||
break-after: page;
|
||||
}
|
||||
.markdown h1 {
|
||||
font-size: 2.25em; /* relative to base 12pt */
|
||||
font-weight: 700; /* font-bold */
|
||||
margin-top: 1.5em;
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
|
||||
.first-page {
|
||||
margin-left: 2cm;
|
||||
margin-right: 2cm;
|
||||
.markdown h2 {
|
||||
font-size: 1.875em;
|
||||
font-weight: 600;
|
||||
margin-top: 1.25em;
|
||||
margin-bottom: 0.75em;
|
||||
}
|
||||
|
||||
body {
|
||||
font-family: sans-serif;
|
||||
font-size: 12pt;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
section {
|
||||
margin-bottom: 3em;
|
||||
}
|
||||
p {
|
||||
margin-top: 0.25em;
|
||||
.markdown h3 {
|
||||
font-size: 1.5em;
|
||||
font-weight: 600;
|
||||
margin-top: 1em;
|
||||
margin-bottom: 0.5em;
|
||||
}
|
||||
|
||||
header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
margin-bottom: 40px;
|
||||
|
||||
h2 {
|
||||
margin-top: 0;
|
||||
}
|
||||
}
|
||||
h1 {
|
||||
margin: 0;
|
||||
font-size: 2em;
|
||||
}
|
||||
h2 {
|
||||
margin-top: 0.5em;
|
||||
.markdown h4 {
|
||||
font-size: 1.25em;
|
||||
font-weight: 500;
|
||||
margin-top: 0.75em;
|
||||
margin-bottom: 0.5em;
|
||||
}
|
||||
|
||||
table {
|
||||
.markdown p {
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
|
||||
.markdown a {
|
||||
color: #2563eb;
|
||||
text-decoration: none;
|
||||
}
|
||||
.markdown a:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.markdown strong {
|
||||
font-weight: 600;
|
||||
color: #111827;
|
||||
}
|
||||
|
||||
.markdown em {
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
.markdown code {
|
||||
background-color: #f3f4f6;
|
||||
font-family:
|
||||
ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono",
|
||||
"Courier New", monospace;
|
||||
font-size: 0.875em; /* relative to base 12pt */
|
||||
padding: 0.125em 0.25em;
|
||||
border-radius: 0.25em;
|
||||
}
|
||||
|
||||
.markdown pre {
|
||||
background-color: #111827;
|
||||
color: #f3f4f6;
|
||||
font-family:
|
||||
ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono",
|
||||
"Courier New", monospace;
|
||||
font-size: 0.875em;
|
||||
padding: 1em;
|
||||
border-radius: 0.5em;
|
||||
overflow-x: auto;
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
|
||||
.markdown blockquote {
|
||||
border-left: 4px solid #d1d5db;
|
||||
padding-left: 1em;
|
||||
font-style: italic;
|
||||
color: #4b5563;
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
|
||||
.markdown ul {
|
||||
list-style-type: disc;
|
||||
padding-left: 1.5em;
|
||||
margin-bottom: 1em;
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
.markdown ol {
|
||||
list-style-type: decimal;
|
||||
padding-left: 1.5em;
|
||||
margin-bottom: 1em;
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
.markdown li {
|
||||
margin-bottom: 0.25em;
|
||||
line-height: 1.625;
|
||||
}
|
||||
|
||||
.markdown hr {
|
||||
border: none;
|
||||
border-top: 1px solid #d1d5db;
|
||||
margin: 1.5em 0;
|
||||
}
|
||||
|
||||
.markdown img {
|
||||
max-width: 100%;
|
||||
border-radius: 0.5em;
|
||||
margin: 1em 0;
|
||||
}
|
||||
|
||||
.markdown table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
table,
|
||||
th,
|
||||
td {
|
||||
border: 1px solid #ccc;
|
||||
}
|
||||
th,
|
||||
td {
|
||||
padding: 0.25em 0.5em;
|
||||
text-align: left;
|
||||
}
|
||||
th {
|
||||
background-color: #f2f2f2;
|
||||
margin: 1em 0;
|
||||
font-size: 0.875em; /* relative to base 12pt */
|
||||
}
|
||||
|
||||
article {
|
||||
margin-bottom: 20px;
|
||||
.markdown th,
|
||||
.markdown td {
|
||||
border: 1px solid #d1d5db;
|
||||
padding: 0.5em 0.25em;
|
||||
}
|
||||
|
||||
.issue-title {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: end;
|
||||
|
||||
margin-top: 2em;
|
||||
margin-bottom: 0.5em;
|
||||
|
||||
h3,
|
||||
p {
|
||||
margin: 0;
|
||||
}
|
||||
.markdown th {
|
||||
background-color: #f3f4f6;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
/* Nested lists */
|
||||
.markdown ul ul {
|
||||
list-style-type: circle;
|
||||
padding-left: 1.5em;
|
||||
margin-top: 0.25em;
|
||||
}
|
||||
|
||||
.markdown ol ol {
|
||||
list-style-type: lower-alpha;
|
||||
padding-left: 1.5em;
|
||||
margin-top: 0.25em;
|
||||
}
|
||||
|
||||
8
pkg/invoice/report/assets/tailwind.js
Normal file
8
pkg/invoice/report/assets/tailwind.js
Normal file
File diff suppressed because one or more lines are too long
@@ -5,93 +5,138 @@
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<title>Rechnung vom {{ .Date | date }}</title>
|
||||
<!-- <link href="css/style.css" rel="stylesheet" /> -->
|
||||
<script>
|
||||
{{ .Tailwind }}
|
||||
</script>
|
||||
<style>
|
||||
@page {
|
||||
size: A4;
|
||||
padding: 2cm;
|
||||
}
|
||||
@page:first {
|
||||
padding: 0;
|
||||
}
|
||||
@media print {
|
||||
.page,
|
||||
.page-break {
|
||||
break-after: page;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
<style>
|
||||
{{ .Style }}
|
||||
</style>
|
||||
<style>
|
||||
|
||||
{{.Invoice.CSS}}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<header class="first-page" style="margin-top: 2cm">
|
||||
<body class="font-sans text-gray-800 text-[12pt]">
|
||||
<!-- Header -->
|
||||
<header class="mx-[2cm] flex justify-between mb-10 mt-8">
|
||||
<div class="company">
|
||||
<h2>{{ .Company.Name }}</h2>
|
||||
<p>
|
||||
{{ .Company.Address.Street}} {{.Company.Address.Number}} <br />
|
||||
<h2 class="text-2xl font-semibold">{{ .Company.Name }}</h2>
|
||||
<p class="mt-2">
|
||||
{{ .Company.Address.Street }} {{ .Company.Address.Number }} <br />
|
||||
{{ .Company.Address.ZIPCode }} {{ .Company.Address.Place }} <br />
|
||||
{{ .Company.Contact }}
|
||||
</p>
|
||||
|
||||
<p></p>
|
||||
</div>
|
||||
<div class="invoice-info">
|
||||
<div class="invoice-info text-right">
|
||||
<p>
|
||||
<strong>Rechnung:</strong> {{ .Invoice.Reference }} <br />
|
||||
<strong>Datum:</strong> {{ .Date | date }} <br />
|
||||
<span class="font-semibold">Rechnung:</span> {{ .Invoice.Reference }}
|
||||
<br />
|
||||
<span class="font-semibold">Datum:</span> {{ .Date | date }} <br />
|
||||
</p>
|
||||
</div>
|
||||
</header>
|
||||
<section class="client first-page">
|
||||
<h2>Rechnung an:</h2>
|
||||
|
||||
<!-- Client Info -->
|
||||
<section class="client mx-[2cm] mb-12">
|
||||
<h2 class="text-xl font-semibold mb-2">Rechnung an:</h2>
|
||||
<p>
|
||||
{{ .Client.Name }} <br />
|
||||
{{ .Client.Address.Street}} {{.Client.Address.Number}} <br />
|
||||
{{ .Client.Address.Street }} {{ .Client.Address.Number }} <br />
|
||||
{{ .Client.Address.ZIPCode }} {{ .Client.Address.Place }} <br />
|
||||
{{ .Client.Contact }}
|
||||
</p>
|
||||
</section>
|
||||
|
||||
<section class="page p1 first-page">
|
||||
<article>
|
||||
<table>
|
||||
<thead>
|
||||
<!-- Invoice Table -->
|
||||
<section class="page mb-12">
|
||||
<article class="mx-[2cm] overflow-x-auto">
|
||||
<table class="w-full border border-gray-300 border-collapse mb-5">
|
||||
<thead class="bg-gray-200">
|
||||
<tr>
|
||||
<th style="min-width: 3.5em">FID</th>
|
||||
<th>Name</th>
|
||||
<th>Aufwand</th>
|
||||
<th style="min-width: 5.5em">Preis</th>
|
||||
<th
|
||||
class="border border-gray-300 px-2 py-0.5 min-w-[3.5em] text-left"
|
||||
>
|
||||
FID
|
||||
</th>
|
||||
<th class="border border-gray-300 px-2 py-0.5 text-left">Name</th>
|
||||
<th class="border border-gray-300 px-2 py-0.5 text-left">
|
||||
Aufwand
|
||||
</th>
|
||||
<th
|
||||
class="border border-gray-300 px-2 py-0.5 min-w-[5.5em] text-left"
|
||||
>
|
||||
Preis
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{{ range .Issues }}
|
||||
<tr>
|
||||
<td style="font-family: monospace">{{ .Shorthand }}</td>
|
||||
<td>{{ .Title }}</td>
|
||||
<td>{{ .Duration | duration }}</td>
|
||||
<td>{{ .Duration | price }} CHF</td>
|
||||
<td class="border border-gray-300 px-2 py-0.5 font-mono">
|
||||
{{ .Shorthand }}
|
||||
</td>
|
||||
<td class="border border-gray-300 px-2 py-0.5">{{ .Title }}</td>
|
||||
<td class="border border-gray-300 px-2 py-0.5">
|
||||
{{ .Duration | duration }}
|
||||
</td>
|
||||
<td class="border border-gray-300 px-2 py-0.5">
|
||||
{{ .Duration | price }} CHF
|
||||
</td>
|
||||
</tr>
|
||||
{{ end }}
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<th colspan="2" style="text-align: right">Summe:</th>
|
||||
|
||||
<td>{{ .Total | duration }}</td>
|
||||
<td>{{ .Total | price}}</td>
|
||||
<th
|
||||
colspan="2"
|
||||
class="border border-gray-300 px-2 py-0.5 text-right"
|
||||
>
|
||||
Summe:
|
||||
</th>
|
||||
<td class="border border-gray-300 px-2 py-0.5">
|
||||
{{ .Total | duration }}
|
||||
</td>
|
||||
<td class="border border-gray-300 px-2 py-0.5">
|
||||
{{ .Total | price }}
|
||||
</td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
</article>
|
||||
|
||||
{{ .Invoice.HTML }}
|
||||
</section>
|
||||
<section>
|
||||
<h2 style="margin-top: 0">Details zu den Features</h2>
|
||||
|
||||
<!-- Issue Details -->
|
||||
<section>
|
||||
<h2 class="font-semibold mb-4 text-2xl">Details zu den Features</h2>
|
||||
{{ range .Issues }}
|
||||
<article>
|
||||
<div class="issue-title">
|
||||
<h3>
|
||||
<a href="{{ .HTMLURL }}" style="font-family: monospace"
|
||||
<article class="mb-6">
|
||||
<div class="flex justify-between items-end mb-2">
|
||||
<h3 class="font-semibold text-xl pt-5">
|
||||
<a
|
||||
href="{{ .HTMLURL }}"
|
||||
class="font-mono text-blue-600 hover:underline"
|
||||
>{{ .Shorthand }}</a
|
||||
>: {{ .Title }}
|
||||
</h3>
|
||||
<p>
|
||||
{{ if .Closed }} Fertiggestellt: {{ .Closed | time }} {{else}} not
|
||||
<p class="text-sm text-gray-600">
|
||||
{{ if .Closed }} Fertiggestellt: {{ .Closed | time }} {{ else }} not
|
||||
closed {{ end }}
|
||||
</p>
|
||||
</div>
|
||||
{{ .CleanBody | md | oh 3 }}
|
||||
<div class="text-sm markdown">{{ .CleanBody | md | oh 3 }}</div>
|
||||
</article>
|
||||
{{ end }}
|
||||
</section>
|
||||
|
||||
@@ -1,111 +0,0 @@
|
||||
.c6ee15365-8f47-4dab-8bee-2a56a7916c57 {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
display: grid;
|
||||
grid-template-columns: 240px 1px 1fr;
|
||||
grid-template-rows: 1px 1fr;
|
||||
|
||||
.separator-h {
|
||||
grid-row: 1;
|
||||
grid-column: 1 / span 3;
|
||||
|
||||
border-top: 1px solid black;
|
||||
svg {
|
||||
transform: rotate(-90deg);
|
||||
margin-top: -52px;
|
||||
}
|
||||
}
|
||||
|
||||
.separator-v {
|
||||
grid-row: 2;
|
||||
grid-column: 2;
|
||||
|
||||
border-right: 1px solid black;
|
||||
svg {
|
||||
margin-left: -32px;
|
||||
}
|
||||
}
|
||||
|
||||
.receiver {
|
||||
grid-row: 2;
|
||||
grid-column: 1;
|
||||
|
||||
font-size: 12pt;
|
||||
padding: 1em;
|
||||
|
||||
h2 {
|
||||
margin: 0;
|
||||
margin-bottom: 0.5em;
|
||||
}
|
||||
h4 {
|
||||
margin-bottom: 0.1em;
|
||||
}
|
||||
}
|
||||
|
||||
.payer {
|
||||
grid-row: 2;
|
||||
grid-column: 3;
|
||||
display: grid;
|
||||
grid-template-columns: 250px 1fr;
|
||||
grid-template-rows: 2em 1fr;
|
||||
padding: 1em;
|
||||
gap: 1em;
|
||||
|
||||
width: 100%;
|
||||
|
||||
h2 {
|
||||
grid-row: 1;
|
||||
grid-column: 1 / 2;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
h4 {
|
||||
margin-bottom: 0.1em;
|
||||
}
|
||||
|
||||
.qr-code {
|
||||
grid-row: 2;
|
||||
grid-column: 1;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
|
||||
.qr-section-img {
|
||||
position: relative;
|
||||
width: 100%;
|
||||
img {
|
||||
width: 100%;
|
||||
}
|
||||
svg {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
z-index: 1;
|
||||
width: 40px;
|
||||
}
|
||||
}
|
||||
|
||||
.qr-section-info {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr 1fr;
|
||||
grid-template-rows: 1fr 1fr;
|
||||
justify-items: center;
|
||||
|
||||
p,
|
||||
h4 {
|
||||
margin: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.payment-details {
|
||||
grid-row: 2;
|
||||
grid-column: 2;
|
||||
font-size: 0.9rem;
|
||||
line-height: 1.4;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,70 +1,96 @@
|
||||
<article class="c6ee15365-8f47-4dab-8bee-2a56a7916c57">
|
||||
<div class="separator-h">{{ .Scissors }}</div>
|
||||
<div class="receiver">
|
||||
<div class="payment-details">
|
||||
<div>
|
||||
<h2>Empfangsschein</h2>
|
||||
<h4 style="margin-top: 0">Konto / Zahlbar an</h4>
|
||||
<p>
|
||||
{{ .ReceiverIBAN }} <br />
|
||||
{{ .ReceiverName }} <br />
|
||||
{{ .ReceiverStreet}} {{.ReceiverNumber}} <br />
|
||||
{{ .ReceiverZIPCode }} {{ .ReceiverPlace }}
|
||||
</p>
|
||||
</div>
|
||||
<div>
|
||||
<h4>Referenz</h4>
|
||||
<p>{{ .Reference }}</p>
|
||||
</div>
|
||||
<div>
|
||||
<h4>Zahlbar durch</h4>
|
||||
<p>
|
||||
{{ .PayeeName }} <br />
|
||||
{{ .PayeeStreet}} {{.PayeeNumber}} <br />
|
||||
{{ .PayeeZIPCode }} {{ .PayeePlace }}
|
||||
</p>
|
||||
</div>
|
||||
<article
|
||||
class="absolute bottom-0 left-0 w-full grid [grid-template-columns:240px_1px_1fr] [grid-template-rows:1px_1fr]"
|
||||
>
|
||||
<!-- Horizontal Separator -->
|
||||
<div
|
||||
class="separator-h row-start-1 col-span-3 border-t border-black relative"
|
||||
>
|
||||
<div class="absolute left-10 top-[-52px] rotate-[-90deg]">
|
||||
{{ .Scissors }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="separator-v">{{ .Scissors }}</div>
|
||||
<div class="payer">
|
||||
<h2>Zahlteil</h2>
|
||||
<div class="qr-code">
|
||||
<!-- Replace with your QR code image or generated SVG -->
|
||||
<div class="qr-section-img">
|
||||
<image src="{{ .GetQR }}"></image>
|
||||
{{ .Cross }}
|
||||
|
||||
<!-- Receiver Section -->
|
||||
<div class="receiver row-start-2 col-start-1 text-[12pt] p-4">
|
||||
<h2 class="m-0 mb-2 text-2xl font-bold">Empfangsschein</h2>
|
||||
<div class="payment-details text-[0.9rem] leading-[1.4]">
|
||||
<h4 class="mt-0 mb-[0.1em] font-bold">Konto / Zahlbar an</h4>
|
||||
<p>
|
||||
{{ .ReceiverIBAN }} <br />
|
||||
{{ .ReceiverName }} <br />
|
||||
{{ .ReceiverStreet }} {{ .ReceiverNumber }} <br />
|
||||
{{ .ReceiverZIPCode }} {{ .ReceiverPlace }}
|
||||
</p>
|
||||
|
||||
<h4 class="mt-2 mb-[0.1em] font-bold">Referenz</h4>
|
||||
<p>{{ .Reference }}</p>
|
||||
|
||||
<h4 class="mt-2 mb-[0.1em] font-bold">Zahlbar durch</h4>
|
||||
<p>
|
||||
{{ .PayeeName }} <br />
|
||||
{{ .PayeeStreet }} {{ .PayeeNumber }} <br />
|
||||
{{ .PayeeZIPCode }} {{ .PayeePlace }}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Vertical Separator -->
|
||||
<div
|
||||
class="separator-v row-start-2 col-start-2 border-r border-black relative"
|
||||
>
|
||||
<div class="-ml-8">{{ .Scissors }}</div>
|
||||
</div>
|
||||
|
||||
<!-- Payer Section -->
|
||||
<div
|
||||
class="payer row-start-2 col-start-3 grid [grid-template-columns:250px_1fr] [grid-template-rows:2em_1fr] p-4 gap-4 w-full"
|
||||
>
|
||||
<h2 class="row-start-1 col-span-1 m-0 text-2xl font-bold">Zahlteil</h2>
|
||||
|
||||
<!-- QR Code Section -->
|
||||
<div class="qr-code row-start-2 col-start-1 flex flex-col justify-between">
|
||||
<div class="qr-section-img relative w-full">
|
||||
<img src="{{ .GetQR }}" class="w-full" />
|
||||
<div
|
||||
class="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 z-[1] scale-36"
|
||||
>
|
||||
<!-- cross gets replaced with svg-->
|
||||
{{ .Cross }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="qr-section-info">
|
||||
<h4>Währung</h4>
|
||||
<h4>Betrag</h4>
|
||||
<p>CHF</p>
|
||||
<p>{{ .Amount }}</p>
|
||||
<div
|
||||
class="qr-section-info grid grid-cols-2 grid-rows-2 justify-items-center"
|
||||
>
|
||||
<h4 class="m-0 font-bold">Währung</h4>
|
||||
<h4 class="m-0 font-bold">Betrag</h4>
|
||||
<p class="m-0">CHF</p>
|
||||
<p class="m-0">{{ .Amount }}</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="payment-details">
|
||||
<div>
|
||||
<h4 style="margin-top: 0">Konto / Zahlbar an</h4>
|
||||
<p>
|
||||
{{ .ReceiverIBAN }} <br />
|
||||
{{ .ReceiverName }} <br />
|
||||
{{ .ReceiverStreet}} {{.ReceiverNumber}} <br />
|
||||
{{ .ReceiverZIPCode }} {{ .ReceiverPlace }}
|
||||
</p>
|
||||
</div>
|
||||
<div>
|
||||
<h4>Referenz</h4>
|
||||
<p>{{ .Reference }}</p>
|
||||
</div>
|
||||
<div>
|
||||
<h4>Zahlbar durch</h4>
|
||||
<p>
|
||||
{{ .PayeeName }} <br />
|
||||
{{ .PayeeStreet}} {{.PayeeNumber}} <br />
|
||||
{{ .PayeeZIPCode }} {{ .PayeePlace }}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<!-- Payment Details -->
|
||||
<div
|
||||
class="payment-details row-start-2 col-start-2 text-[0.9rem] leading-[1.4]"
|
||||
>
|
||||
<h4 class="mt-0 mb-[0.1em] font-bold">Konto / Zahlbar an</h4>
|
||||
<p>
|
||||
{{ .ReceiverIBAN }} <br />
|
||||
{{ .ReceiverName }} <br />
|
||||
{{ .ReceiverStreet }} {{ .ReceiverNumber }} <br />
|
||||
{{ .ReceiverZIPCode }} {{ .ReceiverPlace }}
|
||||
</p>
|
||||
|
||||
<h4 class="mt-2 mb-[0.1em] font-bold">Referenz</h4>
|
||||
|
||||
<p>{{ .Reference }}</p>
|
||||
|
||||
<h4 class="mt-2 mb-[0.1em] font-bold">Zahlbar durch</h4>
|
||||
<p>
|
||||
{{ .PayeeName }} <br />
|
||||
{{ .PayeeStreet }} {{ .PayeeNumber }} <br />
|
||||
{{ .PayeeZIPCode }} {{ .PayeePlace }}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</article>
|
||||
|
||||
@@ -16,19 +16,12 @@ var scissors template.HTML
|
||||
//go:embed assets/template.html
|
||||
var htmlTemplate string
|
||||
|
||||
//go:embed assets/style.css
|
||||
var style template.CSS
|
||||
|
||||
type tmpler struct {
|
||||
Invoice
|
||||
Cross template.HTML
|
||||
Scissors template.HTML
|
||||
}
|
||||
|
||||
func (i Invoice) CSS() template.CSS {
|
||||
return style
|
||||
}
|
||||
|
||||
func (i Invoice) HTML() (html template.HTML, err error) {
|
||||
tmpl := template.Must(template.New("invoice").Parse(htmlTemplate))
|
||||
|
||||
|
||||
@@ -3,29 +3,41 @@ package report
|
||||
import (
|
||||
"time"
|
||||
|
||||
_ "embed"
|
||||
|
||||
"git.schreifuchs.ch/lou-taylor/accounting/pkg/invoice/issue"
|
||||
"git.schreifuchs.ch/lou-taylor/accounting/pkg/invoice/model"
|
||||
"git.schreifuchs.ch/lou-taylor/accounting/pkg/invoice/report/qrbill"
|
||||
)
|
||||
|
||||
//go:embed assets/template.html
|
||||
var htmlTemplate string
|
||||
|
||||
type Report struct {
|
||||
Date time.Time
|
||||
Issues []issue.Issue
|
||||
Invoice qrbill.Invoice
|
||||
Rate float64
|
||||
Company model.Entity
|
||||
Client *model.Entity
|
||||
Date time.Time
|
||||
Issues []issue.Issue
|
||||
Invoice qrbill.Invoice
|
||||
Rate float64
|
||||
Company model.Entity
|
||||
Client *model.Entity
|
||||
template string
|
||||
}
|
||||
|
||||
func New(issues []issue.Issue, company model.Entity, client *model.Entity, rate float64) *Report {
|
||||
r := &Report{
|
||||
Date: time.Now(),
|
||||
Issues: issues,
|
||||
Rate: rate,
|
||||
Company: company,
|
||||
Client: client,
|
||||
func New(issues []issue.Issue, company model.Entity, client *model.Entity, rate float64) Report {
|
||||
r := Report{
|
||||
Date: time.Now(),
|
||||
Issues: issues,
|
||||
Rate: rate,
|
||||
Company: company,
|
||||
Client: client,
|
||||
template: htmlTemplate,
|
||||
}
|
||||
r.Invoice = qrbill.New(r.applyRate(r.Total()), r.Company, r.Client)
|
||||
|
||||
return r
|
||||
}
|
||||
|
||||
func (r Report) WithTemplate(template string) Report {
|
||||
r.template = template
|
||||
return r
|
||||
}
|
||||
|
||||
@@ -9,15 +9,16 @@ import (
|
||||
"time"
|
||||
)
|
||||
|
||||
//go:embed assets/template.html
|
||||
var htmlTemplate string
|
||||
|
||||
//go:embed assets/style.css
|
||||
var style template.CSS
|
||||
|
||||
//go:embed assets/tailwind.js
|
||||
var tailwind template.JS
|
||||
|
||||
type tmpler struct {
|
||||
Report
|
||||
Style template.CSS
|
||||
Tailwind template.JS
|
||||
Style template.CSS
|
||||
}
|
||||
|
||||
func (r Report) ToHTML() (html string, err error) {
|
||||
@@ -29,11 +30,11 @@ func (r Report) ToHTML() (html string, err error) {
|
||||
"time": fmtDateTime,
|
||||
"date": fmtDate,
|
||||
"duration": fmtDuration,
|
||||
}).Parse(htmlTemplate))
|
||||
}).Parse(r.template))
|
||||
|
||||
buf := new(bytes.Buffer)
|
||||
|
||||
err = tmpl.Execute(buf, tmpler{r, style})
|
||||
err = tmpl.Execute(buf, tmpler{r, tailwind, style})
|
||||
if err != nil {
|
||||
return html, err
|
||||
}
|
||||
|
||||
@@ -16,14 +16,16 @@ var DefaultOptions = Options{
|
||||
IssueFilter: func(i *gitea.Issue) bool {
|
||||
return i.Closed != nil && i.Closed.After(time.Now().AddDate(0, -1, 0))
|
||||
},
|
||||
CustomTemplate: "",
|
||||
}
|
||||
|
||||
type Options struct {
|
||||
Mindur time.Duration
|
||||
Since time.Time
|
||||
Before time.Time
|
||||
IssueState gitea.StateType
|
||||
IssueFilter func(i *gitea.Issue) bool
|
||||
Mindur time.Duration
|
||||
Since time.Time
|
||||
Before time.Time
|
||||
IssueState gitea.StateType
|
||||
IssueFilter func(i *gitea.Issue) bool
|
||||
CustomTemplate string // if the length of the CustomTemplate is longer than 0, it get's used
|
||||
}
|
||||
|
||||
type Repo struct {
|
||||
|
||||
Reference in New Issue
Block a user