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

changed filters in PreorderBillingInvoice

Browse Source
This commit is contained in:
Frank Schubert
2025-04-08 15:49:31 +02:00
parent 9a92eadfa2
commit 4bc1a0c97b
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Layout/default/PreorderBillingInvoice/Index.php
View File

@@ -32,10 +32,6 @@ $pagination_entity_name = "Rechnungen";
<form method="get" action="<?=self::getUrl("PreorderBillingInvoice")?>">
<div class="row">
<div class="col-1">
<label class="form-label" for="filter_oaid">OAID</label>
<input type="text" class="form-control" name="filter[oaid]" id="filter_oaid" value="<?=(array_key_exists("oaid", $filter)) ? $filter['oaid'] : ""?>"/>
</div>
<div class="col-2">
<label class="form-label" for="filter_owner_id">Netzbetreiber</label>
<select class="form-control" name="filter[owner_id]" id="filter_owner_id">
@@ -50,6 +46,11 @@ $pagination_entity_name = "Rechnungen";
<input type="text" class="form-control" name="filter[fibu_account_number]" id="filter_fibu_account_number" value="<?=(array_key_exists("fibu_account_number", $filter)) ? $filter['fibu_account_number'] : ""?>"/>
</div>
<div class="col-2">
<label class="form-label" for="filter_name">Rechungsempfänger</label>
<input type="text" class="form-control" name="filter[name]" id="filter_name" value="<?=(array_key_exists("name", $filter)) ? $filter['name'] : ""?>"/>
</div>
<div class="col-2">
<label class="form-label" for="filter_product">Produkt</label>
<select class="form-control" name="filter[product_id]" id="filter_product_id">
@@ -68,19 +69,11 @@ $pagination_entity_name = "Rechnungen";
<input type="text" class="form-control" name="filter[start_date_to]" id="filter_start_date_to" value="<?=(array_key_exists("start_date_to", $filter)) ? $filter['start_date_to'] : ""?>"/>
</div>
<div class="col-2">
<label class="form-label" for="filter_status">Status</label>
<select class="form-control" name="filter[status]" id="filter_status">
<option value="open" <?=(array_key_exists("status", $filter) && $filter['status'] == "open") ? "selected='selected'" : ""?>>Nur offene</option>
<option value="billed" <?=(array_key_exists("status", $filter) && $filter['status'] == "billed" ) ? "selected='selected'" : ""?>>Nur verrechnete</option>
</select>
</div>
</div>
<div class="row mt-2">
<div class="col">
<button type="submit" class="btn btn-primary">Filter anwenden</button>
<a class="btn btn-secondary" href="<?=self::getUrl("PreorderBilling")?>?resetFilter=1">Filter zurücksetzen</a>
<a class="btn btn-secondary" href="<?=self::getUrl("PreorderBillingInvoice")?>?resetFilter=1">Filter zurücksetzen</a>
</div>
</div>
</form>

1
application/Api/v1/AddressdbApicontroller.php
View File

@@ -943,7 +943,6 @@ class AddressdbApicontroller extends mfBaseApicontroller {
"enduser_setup_price_gross" => (float)$prices["enduser_setup"]->price_setup * 1.2,
"enduser_setup_info" => $prices["enduser_setup"]->description,
"enduser_setup_valid_until" => $prices["enduser_setup"]->end_date,
"vatrate" => 20,
];