From 4e210c1698e945093281cf08028a2242a639adfa Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sat, 8 Mar 2025 17:09:38 +0100 Subject: [PATCH] add pagination to footer --- README.md | 31 ++++++++++++++++++++++++- flake.lock | 6 ++--- flake.nix | 12 +--------- heinrichmalerbetrieb.php | 50 +++++++++++++++++++++++++++++----------- 4 files changed, 70 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 1392648..496e4db 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,36 @@ General default settings which should be set - User profile (company contact information), such as mail, address, phone and mail - System settings in general and invoice: Upload company logo for login and invoice logo (WebP image format currently not supported https://github.com/InvoicePlane/InvoicePlane/issues/1189 ). - - System settings - invoice: Enable embed ZUGFeRD XML into PDF (e-invoice) + - System settings - invoice + - Enable embed ZUGFeRD XML into PDF (e-invoice) + - PDF footer + +``` + + + + + + + + +
Seite: {PAGENO}/{nb}
+``` + - System settings - general, currency settings - Change symbol to: € - Symbol after sum with space diff --git a/flake.lock b/flake.lock index 093fb0b..144a9c8 100644 --- a/flake.lock +++ b/flake.lock @@ -2,10 +2,10 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1739834344, - "narHash": "sha256-PUAcU3YlKNFYrBBHkqshO4wRfMunzhMTEIH1dyhjTtk=", + "lastModified": 1741310760, + "narHash": "sha256-aizILFrPgq/W53Jw8i0a1h1GZAAKtlYOrG/A5r46gVM=", "ref": "nixpkgs-unstable", - "rev": "f0295845e58ada369322524631821b01c0db13a7", + "rev": "de0fe301211c267807afd11b12613f5511ff7433", "shallow": true, "type": "git", "url": "https://github.com/NixOS/nixpkgs" diff --git a/flake.nix b/flake.nix index 2874e2c..e5a67db 100644 --- a/flake.nix +++ b/flake.nix @@ -35,19 +35,9 @@ services.invoiceplane.sites."localhost" = { enable = true; - settings = { - IP_URL = "http://localhost:8080"; - #DISABLE_SETUP = true; - #SETUP_COMPLETED = true; - }; + settings.IP_URL = "http://localhost:8080"; }; - # FIXME - # https://github.com/NixOS/nixpkgs/pull/309908 - services.caddy.virtualHosts."http://localhost".logFormat = lib.mkForce '' - output discard - ''; - nixos-shell.mounts.extraMounts = { "/var/lib/invoiceplane/localhost/pdf" = { target = /home/onny/projects/invoiceplane-heinrichmalerbetrieb; diff --git a/heinrichmalerbetrieb.php b/heinrichmalerbetrieb.php index c1545e6..f0db37c 100755 --- a/heinrichmalerbetrieb.php +++ b/heinrichmalerbetrieb.php @@ -15,7 +15,7 @@ float: right; } .company { - font-size: 0.8rem; + font-size: 0.9rem; } .invoice-details table { width: 200px; @@ -35,6 +35,11 @@ color: #408236; font-size: 0.8rem; } + .page-number { + font-size: 0.8rem; + margin-top: 1.5rem; + text-align: center; + } table.footer td.first-child { width: 180px; } @@ -43,6 +48,14 @@ } h1.invoice-title { color: #3a3a3a; + margin-bottom: 0rem; + font-weight: 800; + } + p.invoice-subtitle { + color: #3a3a3a; + font-weight: bold; + margin-top: 0.5rem; + margin-bottom: 2rem; } @@ -56,7 +69,9 @@
Heinrich GmbH • Blumenstraße 16-18 • 75233 Tiefenbronn
- per Email: info@test.de
+ client_email && $custom_fields['invoice']['Via Email']) { + echo 'per Email: ' . $invoice->client_email . '
'; + } ?> client_title) { echo $invoice->client_title . '
'; } ?> @@ -164,6 +179,16 @@

+ ' . $rechnungs_betreff . '

'; + } + if ($rechnungs_text) { + echo '

' . $rechnungs_text . '

'; + } + ?> @@ -211,7 +236,7 @@ @@ -219,7 +244,7 @@ invoice_item_tax_total > 0) { ?> - - - - -
class="text-right"> - Nettosumme + Summe invoice_item_subtotal); ?>
class="text-right"> - + 19% MwSt. invoice_item_tax_total); ?> @@ -258,18 +283,9 @@
class="text-right"> - 0% MwSt - - 0,00€ -
class="text-right"> - Gesamtbetrag + Endsumme invoice_balance); ?> @@ -289,5 +305,11 @@ +
+ Zahlungsbedingungen: zahlbar ab Rechnungsdatum innerhalb 8 Tagen rein netto. +

+Bitte überweisen Sie den Rechnungsbetrag unter Angabe der Rechnungsnummer auf unser Geschäftskonto. Vielen Dank.

+Wir weisen Sie darauf hin, dass Sie nach § 14b Abs. 1 S. 5 UStG verpflichtet sind, diese Rechnung zwei Jahre lang aufzubewahren.

+