Changeset 419 for trunk/finance/finance.php

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.

File:

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

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'];