Merge branch 'fronkdev' into 'master'

Added Sums in Billing/Index

See merge request fronk/thetool!449
This commit is contained in:
Frank Schubert
2024-07-08 19:11:51 +00:00
3 changed files with 145 additions and 1 deletions

View File

@@ -63,6 +63,25 @@ $pagination_entity_name = "Billingrecords";
<option value="12" <?=(array_key_exists("billing_period", $filter) &&$filter['billing_period'] == 12 ) ? "selected='selected'" : ""?>>Jährlich</option>
</select>
</div>
<!--div class="col-1">
<label class="form-label" for="filter_start_month">Zeitraum Monat</label>
<input type="text" class="form-control" name="filter[start_month]" id="filter_start_month" value="<?=(array_key_exists("start_month", $filter)) ? $filter['start_month'] : ""?>"/>
</div>
<div class="col-1">
<label class="form-label" for="filter_start_year">Zeitraum Jahr</label>
<input type="text" class="form-control" name="filter[start_year]" id="filter_start_year" value="<?=(array_key_exists("start_year", $filter)) ? $filter['start_year'] : ""?>"/>
</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">
@@ -81,7 +100,7 @@ $pagination_entity_name = "Billingrecords";
<div class="row">
<div class="col-12">
<div class="float-left">
<h4 class="header-title">Fertiggestellte Bestellungen</h4>
<h4 class="header-title">Verrechnungsdatensätze</h4>
<!--button type="submit" class="btn btn-primary"><i class="fas fa-fw fa-check"></i> Markierte Elemente als Contract übernehmen</button-->
</div>
<div class="float-right">
@@ -92,6 +111,31 @@ $pagination_entity_name = "Billingrecords";
</div>
</div>
<div class="row">
<div class="col-4">
<div>
<h4>Summen</h4>
<table class="table table-striped table-bordered">
<tr>
<th class="text-right">Summe Rechnungen Periodisch:</th>
<td><?=$sum_price?></td>
</tr><tr>
<th class="text-right">Summe Rechnungen Einmalig:</th>
<td><?=$sum_price_setup?></td>
</tr><tr>
<th class="text-right">Summe Gutschriften Periodisch:</th>
<td><?=$sum_credit_price?></td>
</tr><tr>
<th class="text-right">Summe Gutschriften Einmalig:</th>
<td><?=$sum_credit_price_setup?></td>
</tr>
</table>
</div>
</div>
</div>
<div class="row">
<div class="col-12">
<?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination.php"); ?>