Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

small changes to invoice & removed debugging

Browse Source
This commit is contained in:
Frank Schubert
2024-07-07 16:10:39 +02:00
parent dde832d6a8
commit 5bb0f1978c
7 changed files with 45 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Layout/default/Invoice/PDF_MAIN.php
View File

@@ -72,7 +72,7 @@ $this->setReturnValue(['filename' => $invoice->invoice_number . ".pdf"]);
tr.position td:first-child {
vertical-align: middle !important;
padding-left: 2pt;
padding-left: 4pt;
}
#invoiceTable tr td:first-child {
@@ -108,7 +108,7 @@ $this->setReturnValue(['filename' => $invoice->invoice_number . ".pdf"]);
$price = number_format($p->price, 2, ",",".");
$price_total = number_format($p->price_total, 2, ",",".");
$price_gross = number_format($p->price_gross, 2, ",",".");
$vatrate = number_format($p->vatrate, 2, ",",".");
$vatrate = number_format($p->vatrate, 0, ",",".");
?>
@@ -137,7 +137,7 @@ $this->setReturnValue(['filename' => $invoice->invoice_number . ".pdf"]);
<td style="text-align: center"><?=$amount?></td>
<td><?=$price_total?> €</td>
<td style="text-align: right;"><?=$vatrate?>%</td>
<td style="padding-right: 2pt;"><?=$price_gross?> €</td>
<td style="padding-right: 4pt;"><?=$price_gross?> €</td>
</tr>
<?php if($p->matchcode): ?>
<!--tr class="additionalRow <?=($i%2 == 0) ? "even" : "uneven" ?>">
@@ -149,15 +149,15 @@ $this->setReturnValue(['filename' => $invoice->invoice_number . ".pdf"]);
?>
<tr style="font-weight: bold; background-color: #ebebeb; border-bottom: 1px solid black;border-top: 1px solid black">
<td colspan="5">Gesamt Netto:</td>
<td colspan="2" style="text-align: right; padding-right: 2pt;"><?=number_format($net_total, 2, ",","."). " €"?></td>
<td colspan="2" style="text-align: right; padding-right: 4pt;"><?=number_format($net_total, 2, ",","."). " €"?></td>
</tr>
<?php foreach ($vat as $rate => $vat_total): ?>
<?php if($rate > 0): ?>
<tr style="font-size: 11px;border-bottom: 1px solid black;">
<td colspan="5">USt. <?=$rate?>%:</td>
<td colspan="2" style="text-align: right; padding-right: 2pt;"><?=number_format($vat_total, 2, ",","."). " €"?></td>
<td colspan="5">USt. <?=number_format($rate, 0, ",", ".")?>%:</td>
<td colspan="2" style="text-align: right; padding-right: 4pt;"><?=number_format($vat_total, 2, ",","."). " €"?></td>
</tr>
<?php endif; ?>
@@ -166,7 +166,7 @@ $this->setReturnValue(['filename' => $invoice->invoice_number . ".pdf"]);
<!-- double underline border on bottom -->
<tr style="font-weight: bold; border-bottom: 3px double black; background-color: #ebebeb;">
<td colspan="5">Gesamt Brutto:</td>
<td colspan="2" style="text-align: right; padding-right: 2pt;"><?=number_format($gross_total, 2, ",","."). " €"?></td>
<td colspan="2" style="text-align: right; padding-right: 4pt;"><?=number_format($gross_total, 2, ",","."). " €"?></td>
</tr>
</table>
@@ -180,7 +180,7 @@ $this->setReturnValue(['filename' => $invoice->invoice_number . ".pdf"]);
<?php elseif($invoice->billing_type == "sepa"): ?>
<p style="color: #FF0000; font-weight: bold">BITTE NICHT EINZAHLEN, DER BETRAG WIRD AUTOMATISCH VON IHREM KONTO ABGEBUCHT !</p>
<?php else: ?>
Bitte <b>überweisen</b> Sie den Rechnungsbetrag bis zum <b><?=(new DateTime("@".$invoice->invoice_date))->modify("+14 days")->format("d.m.Y")?></b> auf folgendes Konto:<br />
Bitte <b>überweisen</b> Sie den Rechnungsbetrag bis zum &nbsp;<b><?=(new DateTime("@".$invoice->invoice_date))->modify("+14 days")->format("d.m.Y")?></b> auf folgendes Konto:<br />
<b style="padding-left: 4pt;">IBAN: <?=$bank_iban?></b><br />
<b style="padding-left: 4pt;">BIC: <?=$bank_bic?></b><br /><br />
Bitte geben Sie als Verwendungszweck unbedingt die Rechnungsnummer an, nur so können wir Ihre Zahlung eindeutig zuordnen
@@ -197,23 +197,23 @@ $this->setReturnValue(['filename' => $invoice->invoice_number . ".pdf"]);
<table style="border-collapse: collapse; width: 100%;">
<tr style="text-align: left;" class="uneven">
<th>Ziel</th>
<th style="padding-left: 4px;">Ziel</th>
<th style="text-align: right">Preis pro Minute</th>
<th style="text-align: right; padding-right: 8pt;">Anzahl</th>
<th style="text-align: right;">Dauer</th>
<th style="text-align: right">Netto €</th>
<th style="text-align: right">Brutto €</th>
<th style="text-align: right; padding-right: 4pt;">Brutto €</th>
</tr>
<?php $v = 0; ?>
<?php foreach($voicenumber->zones as $zone): ?>
<?php if($zone->price_total < 0.000000001) continue; ?>
<tr class="<?=($v%2 == 0) ? "even" : "uneven" ?>">
<td><?=$zone->zone?></td>
<td style="padding-left: 4px;"><?=$zone->zone?></td>
<td style="text-align: right"><?=number_format($zone->price * 60, 4, ",",".")?> €</td>
<td style="text-align: right; padding-right: 8pt;"><?=number_format($zone->call_count, 0, ",",".")?></td>
<td style="text-align: right"><?=self::getHumanReadableInterval($zone->duration)?></td>
<td style="text-align: right"><?=number_format($zone->price_total, 4, ",",".")?> €</td>
<td style="text-align: right"><?=$zone->price_total_gross?> €</td>
<td style="text-align: right; padding-right: 4pt;"><?=$zone->price_total_gross?> €</td>
</tr>
<?php $v++; ?>
<?php endforeach; ?>