Changeset 413 for trunk/finance/user_state.php

Timestamp:

Oct 7, 2012, 4:35:04 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Zobrazení čísla účtu a variabilního symbolu v emailu.\n* Upraveno: Odesílání emailů pomocí třídy Mail.

File:

• trunk/finance/user_state.php (modified) (2 diffs)

trunk/finance/user_state.php

@@ -59 +59 @@
     
     // Account state    
-    $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';
+    $UserOperationTableQuery = '((SELECT Text, Time, Value AS Value, Bill, BillCode FROM FinanceOperation WHERE (Subject='.$Subject['Id'].')) UNION ALL '.
+      '(SELECT Text, TimeCreation as Time, -Value as Value, Bill, BillCode 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 />';
+    $Output .= 'Stav účtu: <strong>'.$Total.' Kč</strong<br /><br /><br/>';
 
     
@@ -79 +79 @@
       if($Row['Value'] == -0) $Row['Value'] = 0;
       if($Row['Value'] > 0) $Row['Value'] = '+'.$Row['Value'];
-      if($Row['Bill'] > 0) $Invoice = '<a href="bill.php?Id='.$Row['Bill'].'">PDF</a>'; else $Invoice = '&nbsp;';
+      if($Row['BillCode'] == '') $Row['BillCode'] = 'PDF';
+      if($Row['Bill'] > 0) $Invoice = '<a href="bill.php?Id='.$Row['Bill'].'">'.$Row['BillCode'].'</a>'; else $Invoice = '&nbsp;';
       $Output .= '<tr><td style="text-align: right;">'.HumanDate($Row['Time']).'</td><td style="text-align: left;">'.$Row['Text'].'</td><td style="text-align: right;">'.$Row['Value'].'</td><td style="text-align: center;">'.$Invoice.'</td></tr>';
       $SumValue = $SumValue + $Row['Value'];