dh/Symcon_Belevo_Energiemanagement_testing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
Daniel Häfliger
2025-12-05 13:51:34 +01:00
parent 920bd27e9e
commit f5ddc77d36
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Abrechnung/form.json
View File

@@ -9,16 +9,17 @@
"name": "LogoMediaID", "name": "LogoMediaID",
"caption": "Logo auswählen" "caption": "Logo auswählen"
}, },
{
"type": "ValidationTextBox",
"name": "FooterText",
"caption": "Fusszeile"
},
{ {
"type": "ValidationTextBox", "type": "ValidationTextBox",
"name": "PropertyText", "name": "PropertyText",
"caption": "Liegenschaft" "caption": "Liegenschaft"
}, },
{
"type": "ValidationTextBox",
"name": "FooterText",
"caption": "Fusszeile"
},
{ {
"type": "List", "type": "List",

14
Abrechnung/module.php
View File

@@ -157,7 +157,7 @@ class Abrechnung extends IPSModule
<table width='100%' style='font-size:8px; margin-top:5px;'> <table width='100%' style='font-size:8px; margin-top:5px;'>
<tr> <tr>
<td width='60%'> <td width='60%'>
<strong>Zählpunkte:</strong><br>"; <br><strong>Zählpunkte:</strong><br>";
// Alle Zählerpunkte des Users auflisten // Alle Zählerpunkte des Users auflisten
foreach ($power as $m) { foreach ($power as $m) {
@@ -174,7 +174,7 @@ class Abrechnung extends IPSModule
$html .= " $html .= "
</td> </td>
<td width='40%'> <td width='40%'>
<strong>Rechnungsadresse:</strong><br> <br><strong>Rechnungsadresse:</strong><br>
{$user['name']}<br> {$user['name']}<br>
{$user['address']}<br> {$user['address']}<br>
{$user['city']}<br> {$user['city']}<br>
@@ -188,7 +188,7 @@ class Abrechnung extends IPSModule
"; ";
// ========================= Elektrizität ========================= // ========================= Elektrizität =========================
$html .= "<h2 style='margin-bottom:3px; font-size:10px;'>Elektrizität</h2>"; $html .= "<br><h2 style='margin-bottom:3px; font-size:10px;'>Elektrizität</h2>";
$powerResult = $this->GetCalculatedPowerCosts($user['id']); $powerResult = $this->GetCalculatedPowerCosts($user['id']);
$html .= $powerResult['html']; $html .= $powerResult['html'];
@@ -209,7 +209,7 @@ class Abrechnung extends IPSModule
} }
// ========================= Nebenkosten ========================= // ========================= Nebenkosten =========================
$html .= "<h2 style='margin-bottom:3px; font-size:10px;'>Nebenkosten</h2>"; $html .= "<br><h2 style='margin-bottom:3px; font-size:10px;'>Nebenkosten</h2>";
$additionalResult = $this->CalculateAdditionalCosts($water, $tariffs, $user['id'], $from, $to); $additionalResult = $this->CalculateAdditionalCosts($water, $tariffs, $user['id'], $from, $to);
$html .= $additionalResult['html']; $html .= $additionalResult['html'];
@@ -453,10 +453,10 @@ class Abrechnung extends IPSModule
</tr></table><br>"; </tr></table><br>";
if (!empty($usedTariffs)) { if (!empty($usedTariffs)) {
$html .= "<p><strong>Angewendete Nebenkostentarife:</strong></p><ul>"; $html .= "<p><strong>Angewendete Nebenkostentarife</strong></p><ul>";
foreach ($usedTariffs as $t) { foreach ($usedTariffs as $t) {
$html .= "<li>" . date('d.m.Y', $t['start']) . " – " . date('d.m.Y', $t['end']) . ": " . $html .= "<li>" . date('d.m.Y', $t['start']) . " – " . date('d.m.Y', $t['end']) . " — <strong> " .
number_format($t['price'], 2) . " Rp</li>"; number_format($t['price'], 2) . " Rp</strong></li>";
} }
$html .= "</ul><br><hr>"; $html .= "</ul><br><hr>";
} }