Merge branch 'fronkdev' into 'master'

Added amount in Contractqueue/Index

See merge request fronk/thetool!572
This commit is contained in:
Frank Schubert
2024-08-06 19:34:16 +00:00

View File

@@ -242,6 +242,7 @@
<h5>Produkte</h5>
<table class="table table-striped table-hover" id="order-products-<?=$order_id?>">
<tr>
<th>Anzahl</th>
<th>Produkt</th>
<th>Matchcode</th>
<th>Preis</th>
@@ -255,6 +256,7 @@
<?php foreach($contracts as $contract): ?>
<tr id="contract-<?=$contract->id?>">
<td><?=(float)number_format($contract->amount, 4, ".", ",")?></td>
<td class="text-wrap product">
<div class="text">
<!--i class="fas fa-fw fa-pencil pointer text-primary" onclick="toggleEdit('contract', <?=$contract->id?>, 'product')"></i--> <span class="value"><?=$contract->product_name?></span>
@@ -330,7 +332,7 @@
2-jährlich
<?php elseif($contract->billing_period == 36): ?>
3-jährlich
<?php else: ?>
<?php elseif($contract->billing_period > 0): ?>
<?=(12 / $contract->billing_period)?>x Jährlich
<?php endif; ?>
</span>