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

Merge branch 'fronkdev' into 'master'

Browse Source 
Added generating/downloading Print Invoices

See merge request fronk/thetool!467
This commit is contained in:
Frank Schubert
2024-07-10 15:48:03 +00:00
parent 31166b5a50 bf4b294ca6
commit 0640961983
3 changed files with 64 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Layout/default/Invoice/Index.php
+19 -19
View File
@@ -66,28 +66,28 @@ $pagination_entity_name = "Rechnungen";
<div class="col-6">
<div class="card">
<div class="card-body">
<div class="row">
<div class="col-6">
<h4>Rechnungsversand</h4>
<form method="post" action="<?=self::getUrl("Invoice","sendInvoices")?>">
<div class="row">
<div class="col-6">
<label class="form-label" for="delivery_start_date">Rechungsdatum von</label>
<input type="text" class="form-control" name="delivery_start_date" id="delivery_start_date" value="" />
</div>
<div class="col-6">
<label class="form-label" for="delivery_end_date">Rechungsdatum bis</label>
<input type="text" class="form-control" name="delivery_end_date" id="delivery_end_date" value="" />
</div>
<div class="row">
<div class="col-6">
<h4>Rechnungsversand</h4>
<form method="post" action="<?=self::getUrl("Invoice","sendInvoices")?>">
<div class="row">
<div class="col-6">
<label class="form-label" for="delivery_start_date">Rechungsdatum von</label>
<input type="text" class="form-control" name="delivery_start_date" id="delivery_start_date" value="" />
</div>
<div class="row mt-2">
<div class="col-12">
<button name="type" value="paper" class="btn btn-lg btn-purple"><i class="far fa-fw fa-print"></i> Rechnungen für Postversand drucken</button>
</div>
<div class="col-6">
<label class="form-label" for="delivery_end_date">Rechungsdatum bis</label>
<input type="text" class="form-control" name="delivery_end_date" id="delivery_end_date" value="" />
</div>
</form>
</div>
</div>
<div class="row mt-2">
<div class="col-12">
<button name="type" value="paper" class="btn btn-lg btn-purple"><i class="far fa-fw fa-print"></i> Rechnungen für Postversand drucken</button>
</div>
</div>
</form>
</div>
</div>
Layout/default/Invoice/PDF_MAIN.php
+1 -1
View File
@@ -213,7 +213,7 @@ $this->setReturnValue(['filename' => $invoice->invoice_number . ".pdf"]);
<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; padding-right: 4pt;"><?=$zone->price_total_gross?> €</td>
<td style="text-align: right; padding-right: 4pt;"><?=number_format($zone->price_total_gross, 4, ",",".")?> €</td>
</tr>
<?php $v++; ?>
<?php endforeach; ?>