Merge branch 'fronkdev' into 'master'

Billing changes

See merge request fronk/thetool!565

Layout/default/Billing/Index.php

@@ -48,6 +48,14 @@ $pagination_entity_name = "Billingrecords";
                                 <label class="form-label" for="filter_product">Produkt</label>
                                 <input type="text" class="form-control" name="filter[product]" id="filter_product" value="<?=(array_key_exists("product", $filter)) ? $filter['product'] : ""?>"/>
                             </div>
+                            <div class="col-1">
+                                <label class="form-label" for="filter_start_date_from">Periode von</label>
+                                <input type="text" class="form-control" name="filter[start_date_from]" id="filter_start_date_from" value="<?=(array_key_exists("start_date_from", $filter)) ? $filter['start_date_from'] : ""?>"/>
+                            </div>
+                            <div class="col-1">
+                                <label class="form-label" for="filter_start_date_to">Periode bis</label>
+                                <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_show_credit">Gutschriften</label>
                                 <select class="form-control" name="filter[show_credit]" id="filter_show_credit">
@@ -105,7 +113,7 @@ $pagination_entity_name = "Billingrecords";
                             </div>
                             <div class="float-right">
                                 <a class="btn btn-outline-primary mb-2" href="<?=self::getUrl("Billing", "importContracts")?>">
-                                    <i class="fas fa-fw fa-file-import"></i> Aktuell verrechenbare Contracts neu importieren
+                                    <i class="fas fa-fw fa-file-import"></i> Rechnungsdatensätze aus Contracts erstellen
                                 </a>
                             </div>
                         </div>
@@ -218,5 +226,22 @@ $pagination_entity_name = "Billingrecords";
 
     </div>
 
-
+<script>
+    $("#filter_start_date_from").datepicker({
+        orientation: "bottom",
+        language: 'de',
+        format: "dd.mm.yyyy",
+        showWeekDays: true,
+        todayBtn: 'linked',
+        autoclose: true
+    });
+    $("#filter_start_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"); ?>

Layout/default/Invoice/Index.php

@@ -103,7 +103,8 @@ $pagination_entity_name = "Rechnungen";
                         <div class="col-12">
                             <h4 class="header-title">Rechnungen</h4>
                             <div class="float-right">
-                                <a href="<?=self::getUrl("Invoice", "exportBmd")?>" class="btn btn-outline-primary"><i class="far fa-fw fa-file-export"></i> Rechnungsexport für BMD</a>
+                                <a href="<?=self::getUrl("Invoice", "exportBmd", ["type" => "credit"])?>" class="btn btn-outline-danger"><i class="far fa-fw fa-file-export"></i> Provisionsexport für BMD</a>
+                                <a href="<?=self::getUrl("Invoice", "exportBmd")?>" class="btn btn-outline-primary ml-2"><i class="far fa-fw fa-file-export"></i> Rechnungsexport für BMD</a>
 
                             </div>
                         </div>