Merge pull request 'Fix: horstoeko/zugferd in composer.json versionieren + Dockerfile-Composer-Fehler nicht mehr verschlucken' (#64) from fds2610-bot/Steuerkram:main into main
Reviewed-on: https://codeberg.org/fds2610/Steuerkram/pulls/64
This commit is contained in:
commit
4682ed7440
4 changed files with 1898 additions and 4 deletions
|
|
@ -23,7 +23,7 @@ WORKDIR /var/www/html
|
|||
|
||||
# Copy composer files first for layer caching
|
||||
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 . .
|
||||
|
|
|
|||
|
|
@ -4,7 +4,8 @@
|
|||
"type": "project",
|
||||
"require": {
|
||||
"php": ">=8.3",
|
||||
"mpdf/mpdf": "^8.2"
|
||||
"mpdf/mpdf": "^8.2",
|
||||
"horstoeko/zugferd": "^1.0"
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
|
|
|
|||
1892
composer.lock
generated
Normal file
1892
composer.lock
generated
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -144,7 +144,7 @@ class PdfInvoiceService
|
|||
<tr>
|
||||
<!-- Linke Spalte: Anschriftfeld 85mm (Kuvertfenster) -->
|
||||
<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"> </div>
|
||||
<div class="recipient">
|
||||
{$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-right { vertical-align: top; padding: 0 0 0 5mm; }
|
||||
|
||||
.return-address-wrap { border-collapse: collapse; margin: 0; }
|
||||
.return-address {
|
||||
font-size: 5.5pt; color: #555;
|
||||
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; }
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue