Changeset 481 for trunk

Timestamp:

Feb 5, 2013, 10:47:05 PM (12 years ago)

Author:

chronos

Message:

• Opraveno: Přepočet měsíčních plateb.

File:

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

trunk/finance/finance.php

@@ -32 +32 @@
   {
     $this->Tariffs = array();
-    $DbResult = $this->Database->select('Service', '*', 'ReplaceId IS NULL ORDER BY InternetSpeedMax');
+    $DbResult = $this->Database->select('Service', '*', '`ReplaceId` IS NULL ORDER BY `InternetSpeedMax`');
     while($Tariff = $DbResult->fetch_array())
     {
@@ -52 +52 @@
     foreach($this->Tariffs as $Index => $Tariff)
     {
-      $DbResult = $this->Database->query('SELECT COUNT(*) FROM Member '.
-        'LEFT JOIN ServiceCustomerRel ON ServiceCustomerRel.Customer=Member.Id '.
-        '(ServiceCustomerRel.Service='.$Index.') AND (Member.BillingPeriod > 1) AND (Member.Blocked=0)');
+      $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Member` '.
+        'LEFT JOIN `ServiceCustomerRel` ON `ServiceCustomerRel`.`Customer`=`Member`.`Id` '.
+        'WHERE (`ServiceCustomerRel`.`Service`='.$Index.') AND (`Member`.`BillingPeriod` > 1) AND (`Member`.`Blocked`=0)');
       $Row = $DbResult->fetch_row();
       $this->Tariffs[$Index]['CustomerCount'] = $Row[0];
@@ -100 +100 @@
   function LoadMonthParameters($Period = 1) // 0 - now, 1 - next month
   {   
-    $DbResult = $this->Database->query('SELECT * FROM FinanceBillingPeriod');
+    $DbResult = $this->Database->query('SELECT * FROM `FinanceBillingPeriod`');
     while($BillingPeriod = $DbResult->fetch_assoc())
       $this->BillingPeriods[$BillingPeriod['Id']] = $BillingPeriod;
     
-    $DbResult = $this->Database->query('SELECT * FROM FinanceCharge WHERE Period='.$Period);
+    $DbResult = $this->Database->query('SELECT * FROM `FinanceCharge` WHERE `Period`='.$Period);
     $Row = $DbResult->fetch_array();
     $this->kWh = $Row['kWh'];
@@ -116 +116 @@
     $this->BaseTariffPrice = $Row['BaseTariffPrice'];
 
-    $DbResult = $this->Database->query('SELECT COUNT(*) FROM Member');
+    $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Member`');
     $Row = $DbResult->fetch_row();
     $this->InternetUsers = $Row[0];
-    $DbResult = $this->Database->query('SELECT COUNT(*) FROM Member WHERE (Blocked=0) AND (BillingPeriod > 1)');
+    $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Member` WHERE (`Blocked`=0) AND (`BillingPeriod` > 1)');
     $Row = $DbResult->fetch_row();
     $this->PayingUsers = $Row[0];
@@ -125 +125 @@
     $this->SpravaUsers = $this->PayingUsers;
     
-    $DbResult = $this->Database->query('SELECT SUM(Consumption) FROM NetworkSegment');
+    $DbResult = $this->Database->query('SELECT SUM(`Consumption`) FROM `NetworkSegment`');
     $TotalConsumption = $DbResult->fetch_array();
     $this->TotalConsumption = $TotalConsumption[0];
 
-    $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');
+    $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'];
@@ -148 +149 @@
     {
       // Get latest year
-      $DbResult = $this->Database->select('FinanceYear', '*', '1 ORDER BY Year DESC LIMIT 1');
+      $DbResult = $this->Database->select('FinanceYear', '*', '1 ORDER BY `Year` DESC LIMIT 1');
     } else $DbResult = $this->Database->select('FinanceYear', '*', 'Id='.$FinanceYear);
     $FinanceYear = $DbResult->fetch_assoc();
     
-    $DbResult = $this->Database->query('SELECT Shortcut, Id FROM DocumentLine WHERE Id='.$Id);
+    $DbResult = $this->Database->query('SELECT `Shortcut`, `Id` FROM `DocumentLine` WHERE `Id`='.$Id);
     $DocumentLine = $DbResult->fetch_assoc();
     
-    $DbResult = $this->Database->query('SELECT * FROM DocumentLineSequence WHERE DocumentLine='.$Id.' AND FinanceYear='.$FinanceYear['Id']);
+    $DbResult = $this->Database->query('SELECT * FROM `DocumentLineSequence` WHERE '.
+       '`DocumentLine`='.$Id.' AND `FinanceYear`='.$FinanceYear['Id']);
     $Sequence = $DbResult->fetch_assoc();
     
@@ -163 +165 @@
     } else $Result = $DocumentLine['Shortcut'].$Sequence['NextNumber'];
         
-    $this->Database->query('UPDATE DocumentLineSequence SET NextNumber = NextNumber + 1 WHERE DocumentLine='.$Id.' AND FinanceYear='.$FinanceYear['Id']);
+    $this->Database->query('UPDATE `DocumentLineSequence` SET `NextNumber` = `NextNumber` + 1 '.
+       'WHERE `DocumentLine`='.$Id.' AND `FinanceYear`='.$FinanceYear['Id']);
     return($Result);
   }
@@ -170 +173 @@
   {
     $Output = 'Aktualizuji finance členů...<br />';
-    $this->Database->query('TRUNCATE TABLE MemberPayment');
-    $DbResult = $this->Database->query('SELECT * FROM Member');
+    $this->Database->query('TRUNCATE TABLE `MemberPayment`');
+    $DbResult = $this->Database->query('SELECT * FROM `Member`');
     while($Member = $DbResult->fetch_assoc())
     {
@@ -199 +202 @@
       }
     
+      $DbResult2 = $this->Database->query('SELECT SUM(`Service`.`Price`) AS `Price` '.
+         'FROM `ServiceCustomerRel` LEFT JOIN '.
+         '`Service` ON `Service`.`Id` = `ServiceCustomerRel`.`Service` WHERE `ServiceCustomerRel`.`Customer`='.
+         $Member['Id'].' AND `ServiceCustomerRel`.`Period`=1');
+      $DbRow = $DbResult2->fetch_assoc();      
       $Monthly = 0;
-      $MonthlyInet = $this->Tariffs[$Member['InternetTariffNextMonth']]['Price'];
+      $MonthlyInet = $DbRow['Price'];
       //if($Row['inet'] == 1)
       $Monthly += $MonthlyInet;