Changeset 419 for trunk

Timestamp:

Oct 8, 2012, 11:17:43 PM (12 years ago)

Author:

chronos

Message:

• Opraveno: Propočty financí a počtu skutečně platících členů a vybraných pěněz.

Location:

trunk

Files:

• finance/finance.php (modified) (2 diffs)
• finance/index.php (modified) (3 diffs)
• finance/tarify.php (modified) (2 diffs)
• index.php (modified) (1 diff)

trunk/finance/finance.php

@@ -48 +48 @@
     foreach($this->Tariffs as $Index => $Tariff)
     {
-      $DbResult = $this->Database->select('Member', 'COUNT(*)', 'InternetTariffCurrentMonth='.$Index.' AND (BillingPeriod > 1)');
+      $DbResult = $this->Database->select('Member', 'COUNT(*)', '(InternetTariffCurrentMonth='.$Index.') AND (BillingPeriod > 1) AND (Blocked=0)');
       $Row = $DbResult->fetch_row();
       $this->Tariffs[$Index]['MemberCount'] = $Row[0];
@@ -111 +111 @@
     $Row = $DbResult->fetch_row();
     $this->InternetUsers = $Row[0];
-    
-    $this->SpravaUsers = $this->InternetUsers;
+    $DbResult = $this->Database->query('SELECT COUNT(*) FROM Member WHERE (Blocked=0) AND (BillingPeriod > 1)');
+    $Row = $DbResult->fetch_row();
+    $this->PayingUsers = $Row[0];
+    
+    $this->SpravaUsers = $this->PayingUsers;
+    
     $DbResult = $this->Database->query('SELECT SUM(Consumption) FROM NetworkSegment');
     $TotalConsumption = $DbResult->fetch_array();
     $this->TotalConsumption = $TotalConsumption[0];
 
-    $DbResult = $this->Database->query('SELECT SUM(`MonthlyInternet`) AS `MonthlyInternet`, SUM(`MonthlyTotal`) AS `MonthlyTotal` FROM MemberPayment');
+    $DbResult = $this->Database->query('SELECT SUM(`MemberPayment`.`MonthlyInternet`) AS `MonthlyInternet`, SUM(`MemberPayment`.`MonthlyTotal`) AS `MonthlyTotal` '.
+      'FROM MemberPayment JOIN Member ON Member.Id=MemberPayment.Member WHERE Member.Blocked=0');
     $Row = $DbResult->fetch_assoc();
     $this->TotalInternetPaid = $Row['MonthlyInternet'];

trunk/finance/index.php

@@ -26 +26 @@
     $Row = $DbResult->fetch_array();
     $Output .= 'Platba za internetovou linku ('.$Finance->RealMaxSpeed.'/'.$Finance->RealMaxSpeed.' kbit/s): <strong>'.$Finance->Internet.' Kč</strong><br />';
-
-    $DbResult = $this->Database->query('SELECT COUNT(*) FROM Member');
-    $Row2 = $DbResult->fetch_array();
-    $Output .= 'Počet registrovaných klientů: <strong>'.$Row2[0].'</strong><br />';
-    
-    $DbResult = $this->Database->query('SELECT COUNT(*) FROM Member WHERE (BillingPeriod > 1) AND (InternetTariffCurrentMonth > 0)');
-    $Row2 = $DbResult->fetch_array();
-    $Output .= 'Počet platících klientů: <strong>'.$Row2[0].'</strong><br />';
+    $Output .= 'Počet registrovaných klientů: <strong>'.$Finance->InternetUsers.'</strong><br />';
+    $Output .= 'Počet platících klientů: <strong>'.$Finance->PayingUsers.'</strong><br />';
 
     //$DbResult = $this->Database->query('SELECT SUM(Price) FROM Product WHERE Used=1');
@@ -39 +33 @@
     //$Output .= 'Celková cena zařízení sítě: <strong>'.$Row4[0].' Kč</strong><br />';
 
-    $DbResult = $this->Database->query('SELECT SUM(Cash) as Cash FROM MemberPayment');
+    //$DbResult = $this->Database->query('SELECT SUM(MemberPayment.Cash) AS Cash FROM MemberPayment JOIN Member ON Member.Id=MemberPayment.Member WHERE Member.Blocked=0');
+    $DbResult = $this->Database->query('SELECT SUM(Cash) AS Cash FROM MemberPayment');
     $Row4 = $DbResult->fetch_array();
-    $Output .= 'Celkem peněz na účtech: <strong>'.$Row4[0].' Kč</strong><br />';
+    $Output .= 'Celkem peněz na účtech: <strong>'.round($Row4[0]).' Kč</strong><br />';
     $Output .= 'Stanovená cena jedné kWh: <strong>'.$Finance->kWh.' Kč</strong><br />';
     //echo('Komunitou stanovený poplatek za správu sítě pro jednoho uživatele: <strong>'.$Sprava.' Kč</strong><br />');
     $DbResult = $this->Database->query('SELECT SUM(FamilyMemberCount) AS Family FROM Member');
     $Family = $DbResult->fetch_assoc();
-  $Family = $Family['Family'];
+    $Family = $Family['Family'];
     $TotalFamily = 600;
     $Output .= 'V připojených domácnostech celkem <strong>'.$Family.'</strong> občanů ze všech <strong>'.$TotalFamily.'</strong> ('.round($Family / $TotalFamily * 100).' %)<br />';
     $Output .= 'IČ: <strong>75904535</strong><br />'.
     'DIČ: <strong>CZ8303255884</strong><br />'.
-    'Bankovní účet: <strong>218098370 / 0300</strong><br />'.
+    'Bankovní spojení pro platby v CZK v ČR: <strong>2600134781 / 2010</strong><br/>'.
+    'Bankovní spojení pro platby v EUR v SR: <strong>2600134781 / 8330</strong><br/>'.
     '<br />';
 
@@ -80 +76 @@
     $Output .= '<tr><td colspan="2">&nbsp;</td></tr>';
     $Output .= '<tr><td><strong>Rozdíl</strong></td><td align="right"><strong>'.($TotalGain - $TotalExpense).'</strong></td></tr>';
-    $Output .= '<tr><td>Převod do dalšího měsíce</td><td align="right">'.($TotalGain - $TotalExpense).'</td></tr>';
+    $Output .= '<tr><td>Investice</td><td align="right">'.($TotalGain - $TotalExpense).'</td></tr>';
     $Output .= '</table><br />';
     /* $DbResult = $this->Database->select('', 'cash', 'id='.$Finance->UserIdNetwork);

trunk/finance/tarify.php

@@ -25 +25 @@
       $Output .= '<tr><td style="color: blue;">'.$Tariff['Name'].'</td><td align="center">'.round($Tariff['SpeedMin'] / 1024).'</td><td align="center" style="color: blue;">'.round($Tariff['SpeedMax'] / 1024).'</td><td align="center">'.$Tariff['Aggregation'].'</td><td align="center">'.$Tariff['MemberCount'].'</td><td align="center" style="color: blue;">'.$Tariff['Price'].'</td><td align="center">'.$Tariff['MemberCount'] * $Tariff['Price'].'</td></tr>';
       $TotalPrice = $TotalPrice + $Tariff['Price'] * $Tariff['MemberCount'];
+      $TotalMemberCount = $TotalMemberCount + $Tariff['MemberCount'];
     }
-    $Output .= '<tr><td>Součty</td><td colspan="3">&nbsp;</td><td align="center">'.$Finance->InternetUsers.'</td><td>&nbsp;</td><td align="center">'.$TotalPrice.'</td></tr>';
+    $Output .= '<tr><td>Součty</td><td colspan="3">&nbsp;</td><td align="center">'.$TotalMemberCount.'</td><td>&nbsp;</td><td align="center">'.$TotalPrice.'</td></tr>';
     $Output .= '</table>';
     return($Output);
@@ -34 +35 @@
   {
         $Finance = &$this->System->Modules['Finance'];
-    $Output = 'Počet členů s internetovým připojením: <strong>'.$Finance->InternetUsers.'</strong><br /><br />';
+    $Output = 'Počet platících členů s internetovým připojením: <strong>'.$Finance->PayingUsers.'</strong><br /><br />';
 /*
     $Output .= '<table><tr><td valign="top">';

trunk/index.php

@@ -274 +274 @@
     // Show pannels
     //if(IsInternetAddr()) echo('Internet'); else echo('LAN');
-    $Output .= $this->InfoBar();
+    //$Output .= $this->InfoBar();
     $Output .= '<table id="MainTable"><tr>';
     $DbResult = $Database->select('PanelColumn', '*');