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

More changes to Billing and Invoice

Browse Source
This commit is contained in:
Frank Schubert
2024-08-07 16:32:18 +02:00
parent 4bc7ef960e
commit 9a0d0791e7
6 changed files with 119 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Layout/default/Billing/Index.php
View File

@@ -135,6 +135,12 @@ $pagination_entity_name = "Billingrecords";
</tr><tr>
<th class="text-right">Summe Gutschriften Einmalig:</th>
<td>€ <?=number_format($sum_credit_price_setup, 2, ",", ".")?></td>
</tr><tr>
<th></th>
<td></td>
</tr><tr>
<th class="text-right">Summe Rechnungen Bankeinzug:</th>
<td>€ <?=number_format($sum_price_sepa, 2, ",", ".")?></td>
</tr>
</table>

2
Layout/default/Contract/Form.php
View File

@@ -386,7 +386,7 @@
* billingaddress autocomplete
*/
<?php if($contract->billingaddress_id && is_object($contract->billingaddress)): ?>
$('#billingaddress_id').autoComplete('set', { value: <?=$contract->billingaddress_id?>, text: '<?=($contract->billingaddress_id) ? str_replace("'", "\\'", str_replace(["\n", "\r"], " ", $contract->billingaddress->getCompanyOrName()))." (".$contract->billingaddress->zip." ".$contract->billingaddress->city.", ".$contract->billingaddress->street.")".(($contract->owner->customer_number) ? " [".$contract->owner->customer_number."]" : "") : ""?>'});
$('#billingaddress_id').autoComplete('set', { value: <?=$contract->billingaddress_id?>, text: '<?=($contract->billingaddress_id) ? str_replace("'", "\\'", str_replace(["\n", "\r"], " ", $contract->billingaddress->getCompanyOrName()))." (".$contract->billingaddress->zip." ".$contract->billingaddress->city.", ".$contract->billingaddress->street.")".(($contract->billingaddress->customer_number) ? " [".$contract->billingaddress->customer_number."]" : "") : ""?>'});
<?php else: ?>
$('#billingaddress_id').autoComplete();
<?php endif; ?>

30
Layout/default/Invoice/Index.php
View File

@@ -52,6 +52,14 @@ $pagination_entity_name = "Rechnungen";
<label class="form-label" for="filter_address">Adresse</label>
<input type="text" class="form-control" name="filter[address]" id="filter_address" value="<?=(array_key_exists("address", $filter)) ? $filter['address'] : ""?>"/>
</div>
<div class="col-2">
<label class="form-label" for="filter_invoice_date_from">Rechnungsdatum von</label>
<input type="text" class="form-control" name="filter[invoice_date_from]" id="filter_invoice_date_from" value="<?=(array_key_exists("invoice_date_from", $filter)) ? $filter['invoice_date_from'] : ""?>"/>
</div>
<div class="col-2">
<label class="form-label" for="filter_invoice_date_to">Rechnungsdatum bis</label>
<input type="text" class="form-control" name="filter[invoice_date_to]" id="filter_invoice_date_to" value="<?=(array_key_exists("invoice_date_to", $filter)) ? $filter['invoice_date_to'] : ""?>"/>
</div>
</div>
<div class="row mt-2">
<div class="col">
@@ -140,7 +148,10 @@ $pagination_entity_name = "Rechnungen";
<td>
<a href="<?=self::getUrl("Invoice", "downloadInvoice", ["id" => $invoice->id])?>"><i class="fas fa-download fa-fw"></i> <?=$invoice->invoice_number?></a>
<?php if($invoice->pdf): ?>
<i class="fas fa-fw fa-check"></i>
<i class="fas fa-fw fa-check" title="PDF generiert"></i>
<?php endif; ?>
<?php if($invoice->date_delivered): ?>
<i class="fas fa-fw fa-mail" title="per Email versendet am <?=date("d.m.Y H:i", $invoice->date_delivered)?>"></i>
<?php endif; ?>
</td>
<td><?=date("d.m.Y", $invoice->invoice_date)?></td>
@@ -197,6 +208,23 @@ $pagination_entity_name = "Rechnungen";
todayBtn: 'linked',
autoclose: true
});
$('#filter_invoice_date_from').datepicker({
orientation: "bottom",
language: 'de',
format: "dd.mm.yyyy",
showWeekDays: true,
todayBtn: 'linked',
autoclose: true
});
$('#filter_invoice_date_to').datepicker({
orientation: "bottom",
language: 'de',
format: "dd.mm.yyyy",
showWeekDays: true,
todayBtn: 'linked',
autoclose: true
});
</script>
<?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/footer.php"); ?>