From 1fe01048153ae2dfdb3f74d060cd3e3aa9637a05 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Tue, 18 Feb 2025 13:46:30 +0100 Subject: [PATCH] Change footer styling --- README.md | 9 +++++++++ flake.lock | 21 +++++++++++---------- flake.nix | 11 ++++++++--- heinrichmalerbetrieb.php | 40 ++++++++++++++++++++++++++++------------ 4 files changed, 56 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 8c1e2d8..1392648 100644 --- a/README.md +++ b/README.md @@ -16,3 +16,12 @@ 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 - general, currency settings + - Change symbol to: € + - Symbol after sum with space + - Currency code EUR + - Number format to European format + - System settings - general, time format: j.n.Y + - Product units: m², Std. diff --git a/flake.lock b/flake.lock index 2dfc896..093fb0b 100644 --- a/flake.lock +++ b/flake.lock @@ -2,18 +2,19 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1736100068, - "narHash": "sha256-wtipqLxpphkpxTGJvVuej+msDzABUfWm5TeO31d00MY=", - "owner": "onny", - "repo": "nixpkgs", - "rev": "68a0940f753446728b57c74db999ab08421e9d46", - "type": "github" + "lastModified": 1739834344, + "narHash": "sha256-PUAcU3YlKNFYrBBHkqshO4wRfMunzhMTEIH1dyhjTtk=", + "ref": "nixpkgs-unstable", + "rev": "f0295845e58ada369322524631821b01c0db13a7", + "shallow": true, + "type": "git", + "url": "https://github.com/NixOS/nixpkgs" }, "original": { - "owner": "onny", - "ref": "invoiceplane-https", - "repo": "nixpkgs", - "type": "github" + "ref": "nixpkgs-unstable", + "shallow": true, + "type": "git", + "url": "https://github.com/NixOS/nixpkgs" } }, "root": { diff --git a/flake.nix b/flake.nix index 36f3cd5..2874e2c 100644 --- a/flake.nix +++ b/flake.nix @@ -1,8 +1,9 @@ { description = "Invoiceplane invoice template development shell"; + inputs.nixpkgs.url = "git+https://github.com/NixOS/nixpkgs?shallow=1&ref=nixpkgs-unstable"; #inputs.nixpkgs.url = "nixpkgs/nixos-24.11"; - inputs.nixpkgs.url = "github:onny/nixpkgs/invoiceplane-https"; + #inputs.nixpkgs.url = "github:onny/nixpkgs/invoiceplane-https"; outputs = { self, nixpkgs, ... }@inputs: let @@ -41,11 +42,15 @@ }; }; - services.caddy.virtualHosts."localhost".hostName = "http://localhost"; + # 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 = ./.; + target = /home/onny/projects/invoiceplane-heinrichmalerbetrieb; cache = "none"; }; }; diff --git a/heinrichmalerbetrieb.php b/heinrichmalerbetrieb.php index acb394f..03421d4 100755 --- a/heinrichmalerbetrieb.php +++ b/heinrichmalerbetrieb.php @@ -17,6 +17,23 @@ .company { font-size: 0.8rem; } + .invoice-details table { + width: 200px; + } + .client small.sender { + color: #408236; + } + table.footer th, table.footer td { + vertical-align: top; + color: #408236; + font-size: 0.8rem; + } + table.footer td.first-child { + width: 180px; + } + hr.footer { + color: #408236; + } @@ -26,8 +43,8 @@ -
- : +
+ Heinrich GmbH • Blumenstraße 16-18 • 75233 Tiefenbronn
@@ -113,18 +130,17 @@
+ + + + + + + - - - - - - - - @@ -146,7 +162,7 @@ - + @@ -251,7 +267,7 @@ -
+
invoice_terms) : ?>

Rechnung Nr.:invoice_number; ?>
(Bitte bei Zahlungen immer angeben.)
invoice_date_created, true); ?>
invoice_date_due, true); ?>
invoice_balance); ?>
Gesamt