Changeset 494 for trunk/finance

Timestamp:

Mar 1, 2013, 10:44:18 PM (12 years ago)

Author:

chronos

Message:

• Opraveno: Přepočítávání stavu placení zákazníků.

Location:

trunk/finance

Files:

• finance.php (modified) (9 diffs)
• user_state.php (modified) (2 diffs)

trunk/finance/finance.php

@@ -59 +59 @@
       $Tariffs['CustomerCount'] = $Row[0];
       
-      //echo($Tariff['Name'].' '.$Tariff['MemberCount'].' '.$Tariff['SpeedMax'] * $Tariff['MemberCount'].' '.$ResidualSpeed.'<br />');
       switch($Tariff['Category'])
       {
@@ -73 +72 @@
       }
     }
-    $Aggregation = $ResidualSpeed / $TotalMaxSpeed;
-    //echo($TotalMaxSpeed.' '.$Aggregation.'<br />');
+    if($TotalMaxSpeed > 0) $Aggregation = $ResidualSpeed / $TotalMaxSpeed;
+      else $Aggregation = 1;
   
     // Recalculate price
@@ -82 +81 @@
       {
         case 1:
-          // Přepočítávání rychlostí koliduje s rozdílovým zapisováním stromu front do mikrotiku. Vždy při změně počtu počítačů či domácností docházelo ke změně minima a přepočtu všeho.
+          // Přepočítávání rychlostí koliduje s rozdílovým zapisováním stromu front do mikrotiku. 
+          // Vždy při změně počtu počítačů či domácností docházelo ke změně minima a přepočtu všeho.
           //$Tariff['InternetSpeedMin'] = round($Tariff['InternetSpeedMax'] * $Aggregation);
           break;
@@ -90 +90 @@
           break;
       }
-      //echo('MinSpeed: '.$Tariff['InternetSpeedMin'].'<br />');
       $this->Database->update('Service', 'Id='.$Tariff['Id'], 
         array('InternetSpeedMin' => ($Tariff['InternetSpeedMin'] / 1024), 
@@ -196 +195 @@
         $DbResult2 = $this->Database->query('SELECT * FROM `NetworkSegment` WHERE `Id`='.$Id);
         $Device = $DbResult2->fetch_assoc();
-        //print_r($Device);
-        //echo($Id.': '.$NetworkDevice.', '.$Device['Price'].', '.$Device['Users']."<br/>\n");
-        $NetworkDevice += $Device['Price'] / $Device['Users'];
-        $Consumption += $Device['Consumption'] / $Device['UsersOverheads'];
-        //echo($ID.' '.$InternetSegment.' '.$InternetSegmentId.' '.$Row['inet_hw'].' '.$Price.'<br>');
+        if($Device['Users'] > 0) $NetworkDevice += $Device['Price'] / $Device['Users'];
+        if($Device['UsersOverheads'] > 0) $Consumption += $Device['Consumption'] / $Device['UsersOverheads'];
         $Id = $Device['Parent'];
       }
@@ -210 +206 @@
       $DbRow = $DbResult2->fetch_assoc();      
       $Monthly = 0;
-      $MonthlyInet = $DbRow['Price'];
+      if($DbRow['Price'] != '') $MonthlyInet = $DbRow['Price'];
+        else $MonthlyInet = 0;
+      
       //if($Row['inet'] == 1)
       $Monthly += $MonthlyInet; 
@@ -216 +214 @@
       $Monthly -= $Member['Hire'];
       //if($Row['overheads'] == 1) $Monthly += $Sprava; // + W2Kc($Consumption); 
-      //echo($Row['fullname'].' '.$Row['inet'].' '.$Monthly.'<br>');
       $Monthly = round($Monthly);
-      //echo($Row['fullname'].' '.$Row['inet'].' '.$Monthly.'<br>')
       
       if($Member['BillingPeriodNext'] == 1)
@@ -246 +242 @@
     while($NetworkSegment = $DbResult->fetch_array())
     {
-      //echo('Segment '.$Row['name'].'<br>');
       $DbResult2 = $this->Database->query('SELECT `Users` FROM `NetworkSegment` WHERE `Id`='.$NetworkSegment['Id']);
       $RowP = $DbResult2->fetch_array();
@@ -262 +257 @@
       while($ID != 0)
       {
-        //echo($ID.', ');
         $DbResult2 = $this->Database->query('SELECT * FROM NetworkSegment WHERE Id='.$ID);
         $Row4 = $DbResult2->fetch_array();

trunk/finance/user_state.php

@@ -63 +63 @@
     
     // Account state    
-    $UserOperationTableQuery = '((SELECT Text, Time, Value AS Value, Bill, BillCode, NULL AS PeriodFrom, NULL AS PeriodTo '.
+    $UserOperationTableQuery = '((SELECT Text, Time, Value AS Value, File, BillCode, NULL AS PeriodFrom, NULL AS PeriodTo '.
       'FROM FinanceOperation WHERE (Subject='.$Subject['Id'].')) UNION ALL '.
       '(SELECT (SELECT GROUP_CONCAT(Description SEPARATOR ",") FROM FinanceInvoiceItem WHERE FinanceInvoice=FinanceInvoice.Id) AS Text, '.
-      'TimeCreation as Time, -Value as Value, Bill, BillCode, PeriodFrom, PeriodTo FROM FinanceInvoice WHERE (Subject='.$Subject['Id'].')) ORDER BY Time DESC) AS T1';
+      'TimeCreation as Time, -Value as Value, File, BillCode, PeriodFrom, PeriodTo FROM FinanceInvoice 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();
@@ -87 +87 @@
       if($Row['Value'] > 0) $Row['Value'] = '+'.$Row['Value'];
       if($Row['BillCode'] == '') $Row['BillCode'] = 'PDF';
-      if($Row['Bill'] > 0) $Invoice = '<a href="bill.php?Id='.$Row['Bill'].'">'.$Row['BillCode'].'</a>'; 
+      if($Row['File'] > 0) $Invoice = '<a href="'.$this->System->Link('/FileDownload.php?Id='.$Row['File']).'">'.$Row['BillCode'].'</a>'; 
         else $Invoice = '&nbsp;';
       if($Row['PeriodFrom'] != '') $Period = HumanDate($Row['PeriodFrom']).' - '.HumanDate($Row['PeriodTo']);