FDS2610/Steuerkram
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request 'Fix: horstoeko/zugferd in composer.json versionieren + Dockerfile-Composer-Fehler nicht mehr verschlucken' (#64) from fds2610-bot/Steuerkram:main into main

Browse source 
Reviewed-on: https://codeberg.org/fds2610/Steuerkram/pulls/64
This commit is contained in:
fds2610 2026-05-03 18:25:37 +02:00
commit 4682ed7440
4 changed files with 1898 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -23,7 +23,7 @@ WORKDIR /var/www/html
# Copy composer files first for layer caching # Copy composer files first for layer caching
COPY composer.json composer.lock* ./ COPY composer.json composer.lock* ./
RUN composer install --no-dev --no-interaction --optimize-autoloader 2>/dev/null || true RUN composer install --no-dev --no-interaction --optimize-autoloader
# Copy application # Copy application
COPY . . COPY . .

3
composer.json
View file

@ -4,7 +4,8 @@
"type": "project", "type": "project",
"require": { "require": {
"php": ">=8.3", "php": ">=8.3",
"mpdf/mpdf": "^8.2" "mpdf/mpdf": "^8.2",
"horstoeko/zugferd": "^1.0"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

1892
composer.lock generated Normal file
View file

File diff suppressed because it is too large Load diff

5
src/Services/PdfInvoiceService.php
View file

@ -144,7 +144,7 @@ class PdfInvoiceService
<tr> <tr>
<!-- Linke Spalte: Anschriftfeld 85mm (Kuvertfenster) --> <!-- Linke Spalte: Anschriftfeld 85mm (Kuvertfenster) -->
<td class="address-left"> <td class="address-left">
<div class="return-address">{$h($settings['firma'] ?? '')} · {$h($settings['strasse'] ?? '')} · {$h($settings['plz'] ?? '')} {$h($settings['ort'] ?? '')}</div> <table class="return-address-wrap"><tr><td class="return-address">{$h($settings['firma'] ?? '')} · {$h($settings['strasse'] ?? '')} · {$h($settings['plz'] ?? '')} {$h($settings['ort'] ?? '')}</td></tr></table>
<div style="height:2.5mm;font-size:2.5mm;line-height:2.5mm">&nbsp;</div> <div style="height:2.5mm;font-size:2.5mm;line-height:2.5mm">&nbsp;</div>
<div class="recipient"> <div class="recipient">
{$h($customerName)}<br> {$h($customerName)}<br>
@ -263,10 +263,11 @@ body { font-family: opensans, sans-serif; font-size: 7.8pt; color: #000; }
.address-left { width: 85mm; vertical-align: top; padding: 0; } .address-left { width: 85mm; vertical-align: top; padding: 0; }
.address-right { vertical-align: top; padding: 0 0 0 5mm; } .address-right { vertical-align: top; padding: 0 0 0 5mm; }
.return-address-wrap { border-collapse: collapse; margin: 0; }
.return-address { .return-address {
font-size: 5.5pt; color: #555; font-size: 5.5pt; color: #555;
border-bottom: 0.3pt solid #aaa; border-bottom: 0.3pt solid #aaa;
padding-bottom: 1mm; padding: 0 0 1mm 0;
} }
.recipient { font-size: 10pt; line-height: 1.5; min-height: 27.3mm; } .recipient { font-size: 10pt; line-height: 1.5; min-height: 27.3mm; }