Changeset 227 for trunk/finance

Timestamp:

Jun 1, 2009, 11:07:05 AM (15 years ago)

Author:

george

Message:

• Opraveno: Stav účtu u měsíčních plateb byl posunut o poslední platbu.
• Upraveno: Zobrazovat stav účtu ve výpisu uživatele nahoře.

Location:

trunk/finance

Files:

• manage.php (modified) (1 diff)
• user_state.php (modified) (2 diffs)

trunk/finance/manage.php

@@ -596 +596 @@
         'Vaše platební období: <strong>'.$this->System->Modules['Finance']->BillingPeriods[$Member['BillingPeriod']]['Name'].'</strong><br />'."\n".
         'Pravidelná platba za období: <strong>'.$MemberPayment['MonthlyTotal'].' Kč</strong><br />'."\n".
-        'Stav vašeho účtu: <strong>'.$MemberPayment['Cash'].' Kč</strong><br /><br />'."\n";
+        'Stav vašeho účtu: <strong>'.($MemberPayment['Cash'] - $MemberPayment['MonthlyTotal']).' Kč</strong><br /><br />'."\n";
       $Content .= 'Nové finanční operace:<br/>'.
         '<table style="margin-left: auto; margin-right: auto; border-style: solid; border-width: 1px; border-collapse: collapse;"><tr><th style="border-style: solid; border-width: 1px; padding: 1px 5px 1px 5px; text-align: center; font-weight: bold;">Čas</th><th style="border-style: solid; border-width: 1px; padding: 1px 5px 1px 5px; text-align: center;; font-weight: bold;">Popis</th><th style="border-style: solid; border-width: 1px; padding: 1px 5px 1px 5px; text-align: center;; font-weight: bold;">Částka [Kč]</th></tr>'."\n";

trunk/finance/user_state.php

@@ -42 +42 @@
     $Output = '<table width="100%" border="0" cellspacing="0" cellpadding="3"><tr><td valign="top">';
 
+    $UserOperationTableQuery = '((SELECT Text, Time, Value AS Value, Bill FROM FinanceOperation WHERE (Subject='.$Subject['Id'].')) UNION ALL '.
+      '(SELECT Text, TimeCreation as Time, -Value as Value, Bill FROM FinanceClaimsLiabilities WHERE (Subject='.$Subject['Id'].')) ORDER BY Time DESC) AS T1';
+    $DbResult = $this->Database->query('SELECT SUM(T1.Value) AS Total FROM '.$UserOperationTableQuery);
+    $DbRow = $DbResult->fetch_array();
+    $Total = $DbRow['Total'];
+    $Output .= 'Stav účtu: <strong>'.$Total.' Kč</strong<br /><br />';
+
     // Tabulka operaci
-    $Output .= 'Výpis operací pro subjekt '.$Subject['Name'].':<br>';
+    $Output .= 'Výpis operací pro subjekt '.$Subject['Name'].':<br />';
     $Output .= '<table style="font-size: smaller;" class="WideTable"><tr><th>Datum</th><th>Popis</th><th>Částka</th><th>Doklad</th></tr>';
     $Operations = array();
-    $UserOperationTableQuery = '((SELECT Text, Time, Value AS Value, Bill FROM FinanceOperation WHERE (Subject='.$Subject['Id'].')) UNION ALL '.
-      '(SELECT Text, TimeCreation as Time, -Value as Value, Bill FROM FinanceClaimsLiabilities WHERE (Subject='.$Subject['Id'].')) ORDER BY Time DESC) AS T1';
     $DbResult = $this->Database->query('SELECT T1.* FROM '.$UserOperationTableQuery);
     while($DbRow = $DbResult->fetch_array())
@@ -60 +65 @@
     //echo('<tr><td>&nbsp;</td><td>-'.$Row2['network_device'].'</td><td>Proměnná cena za zařízení</td></tr>
     $Output .= '</table>';
-    $DbResult = $this->Database->query('SELECT SUM(T1.Value) AS Total FROM '.$UserOperationTableQuery);
-    $DbRow = $DbResult->fetch_array();
-    $Total = $DbRow['Total'];
-    $Output .= '<h3><strong>Stav účtu: </strong>'.$Total.' Kč</h3><br>';
     $Output .= '</td><td valign="top">';