Changeset 50 for www/finance/include.php

Timestamp:

Feb 24, 2008, 2:07:52 PM (17 years ago)

Author:

george

Message:

Změněno: Odebrán proměnný podíl na zařízení sítě.
Změněno: Ceny tarifů změněny na pevné.
Změněno: Měsíční přehled nákladů a výnosů sítě.
Odebráno: Účtování spotřeby.
Upraveno: Systém zobrazení navigačního řádku.

File:

• www/finance/include.php (modified) (8 diffs)

www/finance/include.php

@@ -4 +4 @@
 function RecalculateTariffs($Period = 1)
 {
-  global $Tarify, $MaxSpeed, $Internet, $SpeedElement, $BaseSpeedElement, $Database;
+  global $Tarify, $MaxSpeed, $Internet, $SpeedElement, $BaseSpeedElement, $Database, $BaseTariffPrice, $TopTariffPrice;
     
   $ResidualPrice = $Internet;
@@ -10 +10 @@
   
   $Tarify = array();
-  $DbResult = $Database->select('finance_tariffs', '*', 'period='.$Period.' ORDER BY speed_factor');
+  $DbResult = $Database->select('finance_tariffs', '*', 'period='.$Period.' ORDER BY id,speed_factor');
   while($Tariff = $DbResult->fetch_array())
   {
@@ -23 +23 @@
   foreach($Tarify as $Index => $Tarif)
   {
-    $DbResult = $Database->select('users', 'COUNT(*)', 'inet_tarif_'.$Column.'='.$Index.' AND inet=1 AND role=0');
+    $DbResult = $Database->select('users', 'COUNT(*)', 'inet_tarif_'.$Column.'='.$Index.' AND inet=1 AND role=2');
     $Row = $DbResult->fetch_array();
     $Tarify[$Index]['user_count'] = $Row[0];    
@@ -48 +48 @@
     }
   }
-  $PricePerUnit = $ResidualPrice / $TotalTarifUnits;
+  //$PricePerUnit = $TopTariffPrice / ;  // $ResidualPrice / $TotalTarifUnits;
   $SpeedPerUnit = $ResidualSpeed * 1024 / $TotalTarifSpeedUnits;
   
@@ -57 +57 @@
     {
       case 1:
-        $Tarify[$Index]['price'] = round($Tarif['price_units'] * $PricePerUnit);
+        $Tarify[$Index]['price'] = $BaseTariffPrice + round($TopTariffPrice * $Tarif['price_units'] / 10) * 10;
         $Tarify[$Index]['min_speed'] = round($Tarif['speed_factor'] * $SpeedPerUnit);
         $Tarify[$Index]['max_speed'] = round($Tarify[$Index]['speed_factor'] * $BaseSpeedElement * 1024);
@@ -66 +66 @@
         break;
       case 3:
+        $Tarify[$Index]['price'] = $BaseTariffPrice + round($TopTariffPrice * $Tarif['price_units']);
         $Tarify[$Index]['min_speed'] = $Tarify[$Index]['min_speed'] * 1024;
         $Tarify[$Index]['max_speed'] = $Tarify[$Index]['max_speed'] * 1024;
@@ -77 +78 @@
 {
   global $kWh, $Internet, $Sprava, $DatumOdecteni, $InternetUsers, $SpravaUsers, $InternetSegmentId, 
-    $MaxSpeed, $RealMaxSpeed, $SpeedReserve, $BaseSpeedElement, $Database;
+    $MaxSpeed, $RealMaxSpeed, $SpeedReserve, $BaseSpeedElement, $Database, $TotalConsumption, $UserIdNetwork,
+    $BaseTariffPrice, $TopTariffPrice, $TotalPaid, $TotalInternetPaid;
     
   $DbResult = $Database->query("SELECT * FROM finance_charge WHERE period=".$Period);
@@ -88 +90 @@
   $BaseSpeedElement = $Row['base_speed_element'];
   $MaxSpeed = $RealMaxSpeed - $SpeedReserve;
+  $TopTariffPrice = $Row['TopTariffPrice'];
+  $BaseTariffPrice = $Row['BaseTariffPrice'];
 
-  $DbResult = $Database->query("SELECT COUNT(*) FROM users WHERE inet=1 AND role=0");
+  $DbResult = $Database->query("SELECT COUNT(*) FROM users WHERE inet=1 AND role=2");
   $Row = $DbResult->fetch_array();
   $InternetUsers = $Row[0];
 
-  $DbResult = $Database->query("SELECT COUNT(*) FROM users WHERE overheads=1 AND role=0");
+  $DbResult = $Database->query("SELECT COUNT(*) FROM users WHERE overheads=1 AND role=2");
   $SpravaUsers = $DbResult->fetch_array();
   $SpravaUsers = $SpravaUsers[0];
   $InternetSegmentId = 21;
+  $DbResult = $Database->query("SELECT SUM(consumption) FROM network_segments");
+  $TotalConsumption = $DbResult->fetch_array();
+  $TotalConsumption = $TotalConsumption[0];
+  $UserIdNetwork = 46;
 
+  $DbResult = $Database->query("SELECT SUM(`monthly`) as `internet`, SUM(`monthly` - `plus`) as `real` FROM users WHERE role=2");
+  $Row = $DbResult->fetch_array();
+  $TotalInternetPaid = $Row['internet'];
+  $TotalPaid = $Row['real'];
   
   RecalculateTariffs($Period);