Changeset 204 for trunk/finance/finance.php

Timestamp:

May 1, 2009, 12:13:50 PM (16 years ago)

Author:

george

Message:

• Upraveno: Tabulka finance_tariffs přejmenována na FinanceTariff a přepracována její struktura podle aktuálních potřeb. Do tabulky uloženy průběžné výpočty jako sloupec MemberCount či dynamicky přepočítavaný sloupce SpeedMin. Zrušeno přepočítávání ceny a rychlosti dle cenových jednotek a rychlostních jednotek.
• Přidáno: Sloupec Hire v tabulce Member sloužící pro záznam placení nájmu členům.

File:

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

trunk/finance/finance.php

@@ -20 +20 @@
   var $TotalPaid;
   var $TotalInternetPaid;
-  var $Tarify;
+  var $Tariffs;
   var $ExternalSubject = 96;
   var $MainSubject = 71;
         var $BillingPeriods;
   
+  function LoadTariffs($Period = 1)
+  {
+    $this->Tariffs = array();
+    $DbResult = $this->Database->select('FinanceTariff', '*', 'Period='.$Period.' ORDER BY Tariff, SpeedMax');
+    while($Tariff = $DbResult->fetch_array())
+    {
+      $Tariff['SpeedMin'] = $Tariff['SpeedMin'] * 1024;
+      $Tariff['SpeedMax'] = $Tariff['SpeedMax'] * 1024;
+      $this->Tariffs[$Tariff['Tariff']] = $Tariff;
+    }  
+  }
+  
   function RecalculateTariffs($Period = 1)
   {
-    $ResidualPrice = $this->Internet;
-    $ResidualSpeed = $this->MaxSpeed;
-  
-    $Tarify = array();
-    $DbResult = $this->Database->select('finance_tariffs', '*', 'period='.$Period.' ORDER BY id,speed_factor');
-    while($Tariff = $DbResult->fetch_array())
-    {
-      $Tarify[$Tariff['id']] = $Tariff;
-    }  
-
-    if($Period == 0) $Column = 'Current'; else $Column = 'Next';
-    $TotalUserCount = 0;
-    $TotalUnits = 0;
-    $TotalTarifUnits = 0;
-    $TotalTarifSpeedUnits = 0;
-    foreach($Tarify as $Index => $Tarif)
-    {
-      $DbResult = $this->Database->select('Member', 'COUNT(*)', 'InternetTariff'.$Column.'Month='.$Index);
+    $ResidualSpeed = $this->MaxSpeed * 1024;
+  
+    $this->LoadTariffs($Period);
+    
+    $Column = array('Current', 'Next');
+    $TotalMemberCount = 0;
+    $TotalMaxSpeed = 0;
+    foreach($this->Tariffs as $Index => $Tariff)
+    {
+      $DbResult = $this->Database->select('Member', 'COUNT(*)', 'InternetTariff'.$Column[$Period].'Month='.$Index);
       $Row = $DbResult->fetch_row();
-      $Tarify[$Index]['user_count'] = $Row[0];    
-      switch($Tarif['group_id'])
+      $this->Tariffs[$Index]['MemberCount'] = $Row[0];
+      $Tariffs['MemberCount'] = $Row[0];
+      
+      //echo($Tariff['Name'].' '.$Tariff['MemberCount'].' '.$Tariff['SpeedMax'] * $Tariff['MemberCount'].' '.$ResidualSpeed.'<br />');
+      switch($Tariff['Group'])
       {
         case 1:
-          $TotalUserCount = $TotalUserCount + $Tarify[$Index]['user_count'];
-          $Tarify[$Index]['total_units'] = $Tarify[$Index]['price_units'] * $Tarify[$Index]['user_count'];
-          $TotalTarifUnits = $TotalTarifUnits + $Tarify[$Index]['total_units'];
-    
-          if($Index == 3) // Zarizeni site v tarifu 3 neplati penize, ale ma internet
-            $Tarify[$Index]['total_speed_factor'] = $Tarify[$Index]['speed_factor'] * ($Tarify[$Index]['user_count']+1);
-            else $Tarify[$Index]['total_speed_factor'] = $Tarify[$Index]['speed_factor'] * $Tarify[$Index]['user_count'];
-          $TotalTarifSpeedUnits = $TotalTarifSpeedUnits + $Tarify[$Index]['total_speed_factor'];
+          $TotalMemberCount += $Tariff['MemberCount'];
+          $TotalMaxSpeed += $Tariff['SpeedMax'] * $Tariff['MemberCount'];
           break;
         case 2:
-          $ResidualPrice -= $Tarif['price'] * $Tarify[$Index]['user_count'];
-          $ResidualSpeed -= $Tarif['min_speed'] * $Tarify[$Index]['user_count'];
-          $Tarify[$Index]['total_units'] = $Tarify[$Index]['price_units'] * $Tarify[$Index]['user_count'];
+          $ResidualSpeed -= $Tariff['SpeedMin'] * $Tariff['MemberCount'];
           break;
         case 3:
-          $Tarify[$Index]['total_units'] = $Tarify[$Index]['price_units'] * $Tarify[$Index]['user_count'];
-          break;
-      }
-    }
-    //$PricePerUnit = $TopTariffPrice / ;  // $ResidualPrice / $TotalTarifUnits;
-    $SpeedPerUnit = $ResidualSpeed * 1024 / $TotalTarifSpeedUnits;
+          break;
+      }
+    }
+    $Aggregation = $ResidualSpeed / $TotalMaxSpeed;
+    //echo($TotalMaxSpeed.' '.$Aggregation.'<br />');
   
     // Recalculate price
-    foreach($Tarify as $Index => $Tarif)
-    {
-      switch($Tarif['group_id'])
+    foreach($this->Tariffs as $Index => $Tariff)
+    {
+      switch($Tariff['Group'])
       {
         case 1:
-          $Tarify[$Index]['price'] = $this->BaseTariffPrice + round($this->TopTariffPrice * $Tarif['price_units'] / 10) * 10;
-          $Tarify[$Index]['min_speed'] = round($Tarif['speed_factor'] * $SpeedPerUnit);
-          $Tarify[$Index]['max_speed'] = round($Tarify[$Index]['speed_factor'] * $this->BaseSpeedElement * 1024);
+          $Tariff['SpeedMin'] = round($Tariff['SpeedMax'] * $Aggregation);
           break;
         case 2:
-          $Tarify[$Index]['min_speed'] = $Tarify[$Index]['min_speed'] * 1024;
-          $Tarify[$Index]['max_speed'] = $Tarify[$Index]['max_speed'] * 1024;
           break;
         case 3:
-          $Tarify[$Index]['price'] = $this->BaseTariffPrice + round($this->TopTariffPrice * $Tarif['price_units']);
-          $Tarify[$Index]['min_speed'] = $Tarify[$Index]['min_speed'] * 1024;
-          $Tarify[$Index]['max_speed'] = $Tarify[$Index]['max_speed'] * 1024;
-          break;
-      }
-      $Tarify[$Index]['aggregation'] = '1:'.round($Tarify[$Index]['max_speed'] / $Tarify[$Index]['min_speed']);
-    }
-          $this->Tarify = $Tarify;
+          break;
+      }
+      //echo('MinSpeed: '.$Tariff['SpeedMin'].'<br />');
+      $this->Database->update('FinanceTariff', 'Tariff='.$Tariff['Tariff'], array('SpeedMin' => ($Tariff['SpeedMin'] / 1024), 'MemberCount' => $Tariff['MemberCount']));
+    }
+    $this->LoadTariffs($Period);
   }
 
@@ -130 +122 @@
   
     $this->RecalculateTariffs($Period);
+    $this->LoadTariffs($Period);
   }
 
@@ -175 +168 @@
           
       $Monthly = 0;
-      $MonthlyInet = $this->Tarify[$Member['InternetTariffNextMonth']]['price'];
+      $MonthlyInet = $this->Tariffs[$Member['InternetTariffNextMonth']]['Price'];
       //if($Row['inet'] == 1)
       $Monthly += $MonthlyInet; 
       $Monthly -= $this->W2Kc($ConsumptionPlus); 
+      $Monthly -= $Member['Hire'];
       //if($Row['overheads'] == 1) $Monthly += $Sprava; // + W2Kc($Consumption); 
       //echo($Row['fullname'].' '.$Row['inet'].' '.$Monthly.'<br>');