troogs/TinyInvoice
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Layout Updates

Browse Source
This commit is contained in:
Andre Beging
2024-11-14 20:34:16 +01:00
parent b76dcdb746
commit 7dc50d51f9
7 changed files with 207 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.idea/.idea.TinyInvoice/.idea/riderPublish.xml generated Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="LocationsWithSilentDeleteHolder">
<option name="locations">
<list>
<option value="$PROJECT_DIR$/Server/publish/Program" />
</list>
</option>
</component>
</project>

3
Server/Components/Pages/InvoiceListPage.razor
View File

@@ -21,9 +21,10 @@
@($"{invoice.TotalNetto:N2} €") Netto<br /> @($"{invoice.TotalNetto:N2} €") Netto<br />
</p> </p>
<a href="@($"edit/{invoice.InvoiceId}")" class="btn btn-sm btn-primary">Bearbeiten</a> <a href="@($"edit/{invoice.InvoiceId}")" class="btn btn-sm btn-primary">Bearbeiten</a>
<button class="btn btn-sm btn-info" @onclick="() => GenerateDocumentAsync(invoice)"><i class="fas fa-file-pdf"></i></button>
@if (invoice.DeletionAllowed) @if (invoice.DeletionAllowed)
{ {
<button class="btn btn-sm btn-danger" style="margin-left: .5rem;" @onclick="() => DeleteInvoiceAsync(invoice.InvoiceId)">Löschen</button> <button class="btn btn-sm btn-danger" style="margin-left: .5rem;" @onclick="() => DeleteInvoiceAsync(invoice.InvoiceId)"><i class="fas fa-trash"></i></button>
} }
</div> </div>
</div> </div>

20
Server/Components/Pages/InvoiceListPage.razor.cs
View File

@@ -1,4 +1,6 @@
using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components;
using QuestPDF.Fluent;
using QuestPDF.Infrastructure;
using Server.Data; using Server.Data;
using Server.Model; using Server.Model;
@@ -19,6 +21,7 @@ namespace Server.Components.Pages
{ {
parameters.SetParameterProperties(this); parameters.SetParameterProperties(this);
await SettingsData.LoadAsync();
Invoices = await InvoiceData.LoadAllAsync(); Invoices = await InvoiceData.LoadAllAsync();
await base.SetParametersAsync(ParameterView.Empty); await base.SetParametersAsync(ParameterView.Empty);
@@ -41,5 +44,22 @@ namespace Server.Components.Pages
} }
#endregion #endregion
#region Private Method GenerateDocumentAsync
/// <summary>
/// Generates a PDF document asynchronously for the given invoice.
/// </summary>
/// <param name="invoice">The invoice model for which to generate the document.</param>
/// <returns>A task representing the asynchronous document generation operation.</returns>
private Task GenerateDocumentAsync(InvoiceModel invoice)
{
QuestPDF.Settings.License = LicenseType.Community;
var doc = new InvoiceDocument(invoice);
doc.GeneratePdfAndShow();
return Task.CompletedTask;
}
#endregion
} }
} }

22
Server/Extensions.cs
View File

@@ -1,7 +1,25 @@
namespace Server using QuestPDF.Fluent;
using QuestPDF.Infrastructure;
namespace Server
{ {
public static class Extensions public static class Extensions
{ {
public static bool IsNullOrWhiteSpace(this string? value) => string.IsNullOrWhiteSpace(value); #region Public Method TextSmall
/// Adds a small text element to the specified container with an optional bold style.
/// <param name="container">The container to which the text element will be added.</param>
/// <param name="text">The text content to be displayed.</param>
/// <param name="bold">Indicates whether the text should be displayed in bold. Defaults to false.</param>
public static void TextSmall(this IContainer container, string? text, bool bold = false)
{
container.Text(txt =>
{
var spanDescriptor = txt.Span(text).FontSize(8);
if (bold) spanDescriptor.SemiBold();
});
}
#endregion
} }
} }

239
Server/Model/InvoiceDocument.cs
View File

@@ -1,5 +1,6 @@
using System.Globalization; using System.Globalization;
using System.Net.Mime; using System.Net.Mime;
using QuestPDF.Drawing;
using QuestPDF.Fluent; using QuestPDF.Fluent;
using QuestPDF.Helpers; using QuestPDF.Helpers;
using QuestPDF.Infrastructure; using QuestPDF.Infrastructure;
@@ -13,13 +14,19 @@ namespace Server.Model
public void Compose(IDocumentContainer container) public void Compose(IDocumentContainer container)
{ {
if(File.Exists("NotoSans-VariableFont_wdth,wght.ttf"))
FontManager.RegisterFont(File.OpenRead("NotoSans-VariableFont_wdth,wght.ttf"));
container.Page(page => container.Page(page =>
{ {
page.Size(PageSizes.A4); page.Size(PageSizes.A4);
page.Margin(10, Unit.Millimetre); page.Margin(10, Unit.Millimetre);
page.MarginLeft(20, Unit.Millimetre); page.MarginLeft(20, Unit.Millimetre);
page.PageColor(Colors.White); page.PageColor(Colors.White);
page.DefaultTextStyle(x => x.FontSize(12).FontFamily(Fonts.Calibri).Light()); page.DefaultTextStyle(x => x
.FontSize(10)
.FontFamily("NotoSans")
.Light());
page.Header().Element(ComposeHeader); page.Header().Element(ComposeHeader);
page.Content().Element(ComposeContent); page.Content().Element(ComposeContent);
@@ -30,37 +37,125 @@ namespace Server.Model
private void ComposeContent(IContainer container) private void ComposeContent(IContainer container)
{ {
container.PaddingVertical(40).Column(column => container.PaddingVertical(40).Column(outerColumn =>
{ {
column.Spacing(5); outerColumn.Item().Element(ComposeItemTable);
column.Item().Element(ComposeTable);
outerColumn.Item().Row(row =>
{
row.RelativeItem().PaddingRight(10).Column(col =>
{
if (!string.IsNullOrWhiteSpace(Model.Comment)) if (!string.IsNullOrWhiteSpace(Model.Comment))
column.Item().PaddingTop(25).Element(ComposeComments); col.Item().PaddingTop(25).Element(ComposeComments);
});
row.AutoItem().Column(col =>
{
col.Item().Element(ComposeTaxTable);
});
});
outerColumn.Spacing(5);
}); });
} }
private void ComposeTable(IContainer container) private void ComposeTaxTable(IContainer container)
{
container.PaddingTop(25).Table(table =>
{
table.ColumnsDefinition(c =>
{
c.ConstantColumn(70);
c.ConstantColumn(25);
c.ConstantColumn(70);
c.ConstantColumn(45);
});
table.Header(header =>
{
header.Cell();
header.Cell().AlignRight().TextSmall("", true);
header.Cell().AlignRight().TextSmall("Zwischensumme", true);
header.Cell().AlignRight().TextSmall("", true);
header.Cell().Element(c => c.BorderBottom(1).BorderColor(Colors.Black));
header.Cell().Element(c => c.BorderBottom(1).BorderColor(Colors.Black)).AlignRight().TextSmall("USt. %", true);
header.Cell().Element(c => c.BorderBottom(1).BorderColor(Colors.Black)).AlignRight().TextSmall("(ohne USt.)", true);
header.Cell().Element(c => c.BorderBottom(1).BorderColor(Colors.Black)).AlignRight().TextSmall("USt.", true);
});
var totalTax = 0d;
// 7%
var tax7Items = Model.Items?.Where(x => x.TaxType == TaxType.Tax7).ToList() ?? [];
if (tax7Items.Count > 0)
{
var tax7Netto = tax7Items.Sum(x => x.PriceNetto * x.Quantity);
var tax7Tax = tax7Netto * 0.07;
totalTax += tax7Tax;
table.Cell();
table.Cell().AlignRight().TextSmall("7%");
table.Cell().AlignRight().TextSmall($"{tax7Netto:N2} €");
table.Cell().AlignRight().TextSmall($"{tax7Tax:N2} €");
}
// 19%
var tax19Items = Model.Items?.Where(x => x.TaxType == TaxType.Tax19).ToList() ?? [];
if (tax19Items.Count > 0)
{
var tax19Netto = tax19Items.Sum(x => x.PriceNetto * x.Quantity);
var tax19Tax = tax19Netto * 0.19;
totalTax += tax19Tax;
table.Cell();
table.Cell().AlignRight().TextSmall("19%");
table.Cell().AlignRight().TextSmall($"{tax19Netto:N2} €");
table.Cell().AlignRight().TextSmall($"{tax19Tax:N2} €");
}
// SUMME
table.Cell().Element(c => c.BorderTop(1).BorderColor(Colors.Black)).TextSmall("USt. Gesamt");
table.Cell().Element(c => c.BorderTop(1).BorderColor(Colors.Black));
table.Cell().Element(c => c.BorderTop(1).BorderColor(Colors.Black)).AlignRight().TextSmall($"{Model.Items?.Sum(x => x.PriceNetto * x.Quantity):N2} €");
table.Cell().Element(c => c.BorderTop(1).BorderColor(Colors.Black)).AlignRight().TextSmall($"{totalTax:N2} €");
});
}
private void ComposeItemTable(IContainer container)
{ {
container.Table(table => container.Table(table =>
{ {
// Define columns // Define columns
table.ColumnsDefinition(columns => table.ColumnsDefinition(columns =>
{ {
columns.ConstantColumn(30, Unit.Millimetre);
columns.RelativeColumn(3); columns.RelativeColumn(3);
columns.RelativeColumn(); columns.ConstantColumn(20, Unit.Millimetre);
columns.RelativeColumn();
columns.ConstantColumn(24, Unit.Millimetre);
columns.ConstantColumn(15, Unit.Millimetre);
columns.ConstantColumn(24, Unit.Millimetre);
columns.ConstantColumn(24, Unit.Millimetre);
}); });
// Describe header // Describe header
table.Header(header => table.Header(header =>
{ {
header.Cell().Element(CellStyle).AlignCenter().Text("Menge");
header.Cell().Element(CellStyle).Text("Bezeichnung"); header.Cell().Text("").SemiBold();
header.Cell().Element(CellStyle).AlignRight().Text("Einzelpreis"); header.Cell().Text("").SemiBold();
header.Cell().Element(CellStyle).AlignRight().Text("Gesamtpreis"); header.Cell().AlignRight().Text("Einzelpreis").SemiBold();
header.Cell().Text("").SemiBold();
header.Cell().AlignRight().Text("Einzelpreis").SemiBold();
header.Cell().AlignRight().Text("Gesamtpreis").SemiBold();
header.Cell().Element(CellStyle).Text("Beschreibung").SemiBold();
header.Cell().Element(CellStyle).AlignCenter().Text("Menge").SemiBold();
header.Cell().Element(CellStyle).AlignRight().Text("(ohne USt.)").SemiBold();
header.Cell().Element(CellStyle).AlignRight().Text("USt. %").SemiBold();
header.Cell().Element(CellStyle).AlignRight().Text("(inkl USt.)").SemiBold();
header.Cell().Element(CellStyle).AlignRight().Text("(inkl USt.)").SemiBold();
static IContainer CellStyle(IContainer container) static IContainer CellStyle(IContainer container)
{ {
@@ -71,54 +166,28 @@ namespace Server.Model
// Describe content // Describe content
foreach (var item in Model.Items ?? []) foreach (var item in Model.Items ?? [])
{ {
table.Cell().Element(CellStyle).AlignCenter().Text(txt => txt.Span($"{item.Quantity:N2}"));
// Beschreibung
table.Cell().Element(CellStyle).Column(column => table.Cell().Element(CellStyle).Column(column =>
{ {
column.Item().Text(item.Name); column.Item().Text(item.Name);
if(!string.IsNullOrWhiteSpace(item.Description)) column.Item().Text(txt => if(!string.IsNullOrWhiteSpace(item.Description))
{ column.Item().TextSmall(item.Description);
txt.Span(item.Description).FontSize(8);
});
}); });
table.Cell().Element(CellStyle).AlignCenter().Text(txt => txt.Span($"{item.Quantity:N2}"));
// string as currency format // string as currency format
table.Cell().Element(CellStyle).AlignRight().Text($"{item.PriceNetto:N2} €"); table.Cell().Element(CellStyle).AlignRight().Text($"{item.PriceNetto:N2} €");
table.Cell().Element(CellStyle).AlignRight().Text($"{item.PriceNetto * item.Quantity:N2} €"); table.Cell().Element(CellStyle).AlignRight().Text($"{(int)item.TaxType}%");
table.Cell().Element(CellStyle).AlignRight().Text($"{item.PriceBrutto:N2} €");
table.Cell().Element(CellStyle).AlignRight().Text($"{item.PriceBrutto * item.Quantity:N2} €");
continue; continue;
} }
// Gesamt Netto table.Cell().ColumnSpan(5).Element(CellStyle).PaddingTop(10).Text("Rechnungsbetrag").Medium();
table.Cell().ColumnSpan(3).PaddingTop(10).Text("Gesamt Netto");
table.Cell().PaddingTop(10).AlignRight().Text($"{Model.TotalNetto:N2} €");
// 7%
var tax7Items = Model.Items?.Where(x => x.TaxType == TaxType.Tax7).ToList() ?? [];
if (tax7Items.Count > 0)
{
var tax7Netto = tax7Items.Sum(x => x.PriceNetto * x.Quantity);
var tax7Tax = tax7Netto * 0.07;
table.Cell().ColumnSpan(2).Text("zzgl. 7% USt. auf");
table.Cell().AlignRight().Text($"{tax7Netto:N2} €");
table.Cell().AlignRight().Text($"{tax7Tax:N2} €");
}
// 19%
var tax19Items = Model.Items?.Where(x => x.TaxType == TaxType.Tax19).ToList() ?? [];
if (tax19Items.Count > 0)
{
var tax19Netto = tax19Items.Sum(x => x.PriceNetto * x.Quantity);
var tax19Tax = tax19Netto * 0.19;
table.Cell().ColumnSpan(2).Text("zzgl. 19% USt. auf");
table.Cell().AlignRight().Text($"{tax19Netto:N2} €");
table.Cell().AlignRight().Text($"{tax19Tax:N2} €");
}
table.Cell().ColumnSpan(3).Element(CellStyle).PaddingTop(10).Text("Rechnungsbetrag").Medium();
table.Cell().Element(CellStyle).PaddingTop(10).AlignRight().Text($"{Model.Items.Sum(x=> x.PriceBrutto*x.Quantity):N2} €").Medium(); table.Cell().Element(CellStyle).PaddingTop(10).AlignRight().Text($"{Model.Items.Sum(x=> x.PriceBrutto*x.Quantity):N2} €").Medium();
return; return;
@@ -140,37 +209,27 @@ namespace Server.Model
{ {
container.Column(outerColumn => container.Column(outerColumn =>
{ {
outerColumn.Item().DefaultTextStyle(style => style.FontSize(10)).Row(row => outerColumn.Item().Row(row =>
{ {
row.RelativeItem().Column(column => row.RelativeItem().Column(column =>
{ {
column.Item().Text(txt => txt.Span(Model.Seller?.Name).Bold()); column.Item().TextSmall(Model.Seller?.Name, true);
column.Item().Text(txt => txt.Span(Model.Seller?.Street)); column.Item().TextSmall(Model.Seller?.Street);
column.Item().Text(txt => txt.Span($"{Model.Seller?.Zip} {Model.Seller?.City}")); column.Item().TextSmall($"{Model.Seller?.Zip} {Model.Seller?.City}");
}); });
row.RelativeItem().Column(column => row.RelativeItem().Column(column =>
{ {
if(!string.IsNullOrWhiteSpace(Model.Seller?.Phone)) if(!string.IsNullOrWhiteSpace(Model.Seller?.Phone)) column.Item().TextSmall($"Tel.: {Model.Seller?.Phone}");
column.Item().Text(txt => txt.Span($"Tel.: {Model.Seller?.Phone}")); if(!string.IsNullOrWhiteSpace(Model.Seller?.Email)) column.Item().TextSmall($"E-Mail: {Model.Seller?.Email}");
if(!string.IsNullOrWhiteSpace(Model.Seller?.Web)) column.Item().TextSmall($"Web: {Model.Seller?.Web}");
if(!string.IsNullOrWhiteSpace(Model.Seller?.Email))
column.Item().Text(txt => txt.Span($"E-Mail: {Model.Seller?.Email}"));
if(!string.IsNullOrWhiteSpace(Model.Seller?.Web))
column.Item().Text(txt => txt.Span($"Web: {Model.Seller?.Web}"));
}); });
row.RelativeItem().Column(column => row.RelativeItem().Column(column =>
{ {
if(!string.IsNullOrWhiteSpace(Model.PaymentData?.BankName)) if(!string.IsNullOrWhiteSpace(Model.PaymentData?.BankName)) column.Item().TextSmall(Model.PaymentData?.BankName);
column.Item().Text(txt => txt.Span(Model.PaymentData?.BankName)); if(!string.IsNullOrWhiteSpace(Model.PaymentData?.Iban)) column.Item().TextSmall($"IBAN: {Model.PaymentData?.Iban}");
if(!string.IsNullOrWhiteSpace(Model.PaymentData?.Bic)) column.Item().TextSmall($"BIC: {Model.PaymentData?.Bic}");
if(!string.IsNullOrWhiteSpace(Model.PaymentData?.Iban))
column.Item().Text(txt => txt.Span($"IBAN: {Model.PaymentData?.Iban}"));
if(!string.IsNullOrWhiteSpace(Model.PaymentData?.Bic))
column.Item().Text(txt => txt.Span($"BIC: {Model.PaymentData?.Bic}"));
}); });
}); });
@@ -187,9 +246,9 @@ namespace Server.Model
{ {
container.Column(outerColumn => container.Column(outerColumn =>
{ {
outerColumn.Item().AlignCenter().Row(row => outerColumn.Item().Row(row =>
{ {
row.RelativeItem().AlignCenter().Column(col => row.RelativeItem().Column(col =>
{ {
if (!string.IsNullOrWhiteSpace(SettingsData.Instance.Logo) && File.Exists(SettingsData.Instance.Logo)) if (!string.IsNullOrWhiteSpace(SettingsData.Instance.Logo) && File.Exists(SettingsData.Instance.Logo))
@@ -198,13 +257,18 @@ namespace Server.Model
col.Item().Height(25, Unit.Millimetre); col.Item().Height(25, Unit.Millimetre);
}); });
row.RelativeItem().AlignMiddle().PaddingRight(10, Unit.Millimetre).Background(Colors.Red.Medium).Column(col =>
{
col.Item().AlignRight().Text("www.example.com");
});
}); });
outerColumn.Item().PaddingTop(15, Unit.Millimetre).Row(row => outerColumn.Item().PaddingTop(15, Unit.Millimetre).Row(row =>
{ {
row.AutoItem().Column(column => row.AutoItem().Column(column =>
{ {
column.Item().Text(Model.Seller?.ToString()).Style(new TextStyle().FontSize(8).SemiBold().Underline()); column.Item().PaddingBottom(5).TextSmall(Model.Seller?.ToString(), true);
if(!string.IsNullOrWhiteSpace(Model.Customer?.Name)) column.Item().Text(Model.Customer?.Name); if(!string.IsNullOrWhiteSpace(Model.Customer?.Name)) column.Item().Text(Model.Customer?.Name);
if(!string.IsNullOrWhiteSpace(Model.Customer?.Name2)) column.Item().Text(Model.Customer?.Name2); if(!string.IsNullOrWhiteSpace(Model.Customer?.Name2)) column.Item().Text(Model.Customer?.Name2);
column.Item().Text(Model.Customer?.Street); column.Item().Text(Model.Customer?.Street);
@@ -213,27 +277,24 @@ namespace Server.Model
row.RelativeItem(); row.RelativeItem();
row.AutoItem().DefaultTextStyle(style => style.FontSize(10)).Column(column => row.AutoItem().Column(col =>
{ {
column.Item().Text(txt => col.Item().Table(table =>
{ {
txt.Span("Steuer-Nr:").Bold().Underline(); table.ColumnsDefinition(c =>
txt.Span(" "); {
txt.Span(Model.Seller?.TaxId); c.ConstantColumn(50);
c.ConstantColumn(50);
}); });
column.Item().Text(txt => table.Cell().TextSmall("Steuer-Nr:", true);
{ table.Cell().TextSmall(Model.Seller?.TaxId);
txt.Span("Datum:").Bold().Underline();
txt.Span(" ");
txt.Span(Model.IssueDate.ToShortDateString());
});
column.Item().Text(txt => table.Cell().TextSmall("Datum:", true);
{ table.Cell().TextSmall(Model.IssueDate.ToShortDateString());
txt.Span("Rechnung:").Bold();
txt.Span(" "); table.Cell().TextSmall("Rechnung:", true);
txt.Span($"#{Model.InvoiceId}"); table.Cell().TextSmall($"#{Model.InvoiceId}");
}); });
}); });
}); });

3
Server/Model/InvoiceModel.cs
View File

@@ -69,6 +69,7 @@
public enum TaxType public enum TaxType
{ {
Tax19, Tax7 Tax19 = 19,
Tax7 = 7
} }
} }

BIN
Server/NotoSans-VariableFont_wdth,wght.ttf Normal file
View File

Binary file not shown.