diff --git a/services/invoice/InvoiceService.js b/services/invoice/InvoiceService.js index dfb49fd..4bc264d 100644 --- a/services/invoice/InvoiceService.js +++ b/services/invoice/InvoiceService.js @@ -368,6 +368,9 @@ class InvoiceService { let customerName; let customerEmail = ''; let orderedByBlock = ''; + const taxTreatmentBlock = isReverseCharge + ? '' + : `
${isDe ? 'Steuerhinweis' : 'Tax treatment'}

${this._escapeHtml(isDe ? 'MwSt.' : 'Tax')} (${this._escapeHtml(vatRate ? `${vatRate}%` : '0%')})

`; if (isGift) { // Recipient info for "Bill To" @@ -412,6 +415,7 @@ class InvoiceService { customerPostalCity: this._escapeHtml([invoice.buyer_postal_code, invoice.buyer_city].filter(Boolean).join(' ')), customerCountry: this._escapeHtml(invoice.buyer_country || ''), orderedByBlock, + taxTreatmentBlock, issuedAt: this._escapeHtml(issuedAt), dueAt: this._escapeHtml(dueAt), descriptionHeader: isDe ? 'Beschreibung' : 'Description', diff --git a/templates/invoice/invoice_company_DE.html b/templates/invoice/invoice_company_DE.html index 13a02d4..f18567b 100644 --- a/templates/invoice/invoice_company_DE.html +++ b/templates/invoice/invoice_company_DE.html @@ -21,7 +21,7 @@ border: 1px solid #dbe3f0; border-radius: 20px; overflow: hidden; - box-shadow: 0 24px 60px -38px rgba(15, 23, 42, 0.35); + box-shadow: none; } .hero { padding: 34px 38px 28px; @@ -161,6 +161,9 @@ margin: 0; color: #334155; } + .tax-banner:empty { + display: none; + } .items-table { width: 100%; border-collapse: collapse; @@ -277,6 +280,110 @@ text-align: left; } } + @page { + size: A4; + margin: 12mm; + } + @media print { + html, + body { + width: 210mm; + } + body { + background: #ffffff; + color: #111827; + font-size: 10.8px; + line-height: 1.3; + } + .page { + max-width: none; + width: 100%; + margin: 0; + border: 0; + border-radius: 0; + box-shadow: none; + overflow: visible; + } + .hero { + padding: 14px 16px 12px; + } + .hero h1 { + font-size: 22px; + } + .invoice-card { + min-width: 160px; + padding: 10px 12px; + } + .invoice-card .number { + font-size: 18px; + } + .content { + padding: 14px 16px 16px; + } + .info-grid, + .summary-grid { + gap: 10px; + } + .info-grid { + margin-bottom: 10px; + } + .info-card, + .payment-card, + .totals-card, + .tax-banner { + padding: 10px; + } + .tax-banner { + margin-bottom: 10px; + } + .items-table { + margin-bottom: 10px; + } + .items-table thead th, + .items-table tbody td { + padding: 6px 7px; + } + .bank-list { + margin-top: 8px; + gap: 4px; + } + .totals-row { + padding: 4px 0; + } + .totals-row.total { + margin-top: 3px; + padding-top: 6px; + } + .footer { + margin-top: 10px; + padding-top: 8px; + font-size: 9.4px; + } + .hero, + .info-grid, + .info-card, + .tax-banner, + .summary-grid, + .payment-card, + .totals-card, + .footer { + page-break-inside: avoid; + break-inside: avoid; + } + .summary-grid { + grid-template-columns: 1fr; + } + .items-table { + page-break-inside: auto; + } + .items-table thead { + display: table-header-group; + } + .items-table tr { + page-break-inside: avoid; + break-inside: avoid; + } + } @@ -327,10 +434,7 @@ {{orderedByBlock}} -
-
Steuerhinweis
-

{{taxLabel}} ({{vatRateDisplay}})

-
+ {{taxTreatmentBlock}} diff --git a/templates/invoice/invoice_company_EN.html b/templates/invoice/invoice_company_EN.html index 880bc0f..9dc696d 100644 --- a/templates/invoice/invoice_company_EN.html +++ b/templates/invoice/invoice_company_EN.html @@ -21,7 +21,7 @@ border: 1px solid #dbe3f0; border-radius: 20px; overflow: hidden; - box-shadow: 0 24px 60px -38px rgba(15, 23, 42, 0.35); + box-shadow: none; } .hero { padding: 34px 38px 28px; @@ -161,6 +161,9 @@ margin: 0; color: #334155; } + .tax-banner:empty { + display: none; + } .items-table { width: 100%; border-collapse: collapse; @@ -277,6 +280,110 @@ text-align: left; } } + @page { + size: A4; + margin: 12mm; + } + @media print { + html, + body { + width: 210mm; + } + body { + background: #ffffff; + color: #111827; + font-size: 10.8px; + line-height: 1.3; + } + .page { + max-width: none; + width: 100%; + margin: 0; + border: 0; + border-radius: 0; + box-shadow: none; + overflow: visible; + } + .hero { + padding: 14px 16px 12px; + } + .hero h1 { + font-size: 22px; + } + .invoice-card { + min-width: 160px; + padding: 10px 12px; + } + .invoice-card .number { + font-size: 18px; + } + .content { + padding: 14px 16px 16px; + } + .info-grid, + .summary-grid { + gap: 10px; + } + .info-grid { + margin-bottom: 10px; + } + .info-card, + .payment-card, + .totals-card, + .tax-banner { + padding: 10px; + } + .tax-banner { + margin-bottom: 10px; + } + .items-table { + margin-bottom: 10px; + } + .items-table thead th, + .items-table tbody td { + padding: 6px 7px; + } + .bank-list { + margin-top: 8px; + gap: 4px; + } + .totals-row { + padding: 4px 0; + } + .totals-row.total { + margin-top: 3px; + padding-top: 6px; + } + .footer { + margin-top: 10px; + padding-top: 8px; + font-size: 9.4px; + } + .hero, + .info-grid, + .info-card, + .tax-banner, + .summary-grid, + .payment-card, + .totals-card, + .footer { + page-break-inside: avoid; + break-inside: avoid; + } + .summary-grid { + grid-template-columns: 1fr; + } + .items-table { + page-break-inside: auto; + } + .items-table thead { + display: table-header-group; + } + .items-table tr { + page-break-inside: avoid; + break-inside: avoid; + } + } @@ -327,10 +434,7 @@ {{orderedByBlock}} -
-
Tax treatment
-

{{taxLabel}} ({{vatRateDisplay}})

-
+ {{taxTreatmentBlock}}
@@ -370,4 +474,4 @@ - \ No newline at end of file +> \ No newline at end of file