From 4bc1a0c97b5572c756bab2f760bb6549e98a5de9 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Tue, 8 Apr 2025 15:49:31 +0200
Subject: [PATCH] changed filters in PreorderBillingInvoice

---
 .../default/PreorderBillingInvoice/Index.php  | 19 ++++++-------------
 application/Api/v1/AddressdbApicontroller.php |  1 -
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/Layout/default/PreorderBillingInvoice/Index.php b/Layout/default/PreorderBillingInvoice/Index.php
index f8351b483..eea886900 100644
--- a/Layout/default/PreorderBillingInvoice/Index.php
+++ b/Layout/default/PreorderBillingInvoice/Index.php
@@ -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>
diff --git a/application/Api/v1/AddressdbApicontroller.php b/application/Api/v1/AddressdbApicontroller.php
index 950fdf973..b22bf53e4 100644
--- a/application/Api/v1/AddressdbApicontroller.php
+++ b/application/Api/v1/AddressdbApicontroller.php
@@ -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,
         ];