Changeset 507 for trunk/finance/finance.php

Timestamp:

Apr 1, 2013, 7:14:59 PM (11 years ago)

Author:

chronos

Message:

• Opraveno: Generování nastavení sítě. Generování front Queue nyní pracuje s přiřazením služeb k zařízením a podsítím.
• Opraveno: Zjišťování adresáře souborů na disku dle id adresáře.

File:

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

trunk/finance/finance.php

@@ -26 +26 @@
   var $Tariffs;
   var $ExternalSubject = 96;
-  var $MainSubject = 71;
+  var $MainSubject;
   var $BillingPeriods;
+  var $DirectoryId;
   
   function LoadTariffs()
@@ -35 +36 @@
     while($Tariff = $DbResult->fetch_array())
     {
-      $Tariff['InternetSpeedMin'] = $Tariff['InternetSpeedMin'] * 1024;
-      $Tariff['InternetSpeedMax'] = $Tariff['InternetSpeedMax'] * 1024;
+      $Tariff['InternetSpeedMin'] = $Tariff['InternetSpeedMin'] * 1000;
+      $Tariff['InternetSpeedMax'] = $Tariff['InternetSpeedMax'] * 1000;
       $this->Tariffs[$Tariff['Id']] = $Tariff;
     }  
@@ -43 +44 @@
   function RecalculateTariffs()
   {
-    $ResidualSpeed = $this->MaxSpeed * 1024;
+    $ResidualSpeed = $this->MaxSpeed * 1000;
   
     $this->LoadTariffs();
@@ -92 +93 @@
       }
       $this->Database->update('Service', 'Id='.$Tariff['Id'], 
-        array('InternetSpeedMin' => ($Tariff['InternetSpeedMin'] / 1024), 
+        array('InternetSpeedMin' => ($Tariff['InternetSpeedMin'] / 1000), 
         'CustomerCount' => $Tariff['CustomerCount']));
     }
@@ -211 +212 @@
         else $MonthlyInet = 0;
       
-      //if($Row['inet'] == 1)
       $Monthly += $MonthlyInet; 
       $Monthly -= $this->W2Kc($ConsumptionPlus); 
-      $Monthly -= $Member['Hire'];
-      //if($Row['overheads'] == 1) $Monthly += $Sprava; // + W2Kc($Consumption); 
       $Monthly = round($Monthly);