Changeset 479 for trunk/finance/finance.php

Timestamp:

Feb 5, 2013, 9:45:44 PM (12 years ago)

Author:

chronos

Message:

• Přidáno: Tabulka pro přiřazení více služeb jednomu zákazníkovi. Původní data jsou převedena do nové struktury. Tabulka Service je společná pro všechny typy služeb a pro každou službu se zobrazí nebo vyplní pouze určité použitelné sloupce.
• Opraveno: Korekce názvů modulů na názvy začínající slovem Module.

File:

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

trunk/finance/finance.php

@@ -2 +2 @@
 
 define('TARIFF_FREE', 7);
+define('INVOICE_DUE_DAYS', 15);
+define('INVOICE_OUT_DOC_LINE', 6);
 
 class Finance extends Module
@@ -30 +32 @@
   {
     $this->Tariffs = array();
-    $DbResult = $this->Database->select('FinanceTariff', '*', 'ReplaceId IS NULL ORDER BY SpeedMax');
+    $DbResult = $this->Database->select('Service', '*', 'ReplaceId IS NULL ORDER BY InternetSpeedMax');
     while($Tariff = $DbResult->fetch_array())
     {
-      $Tariff['SpeedMin'] = $Tariff['SpeedMin'] * 1024;
-      $Tariff['SpeedMax'] = $Tariff['SpeedMax'] * 1024;
+      $Tariff['InternetSpeedMin'] = $Tariff['InternetSpeedMin'] * 1024;
+      $Tariff['InternetSpeedMax'] = $Tariff['InternetSpeedMax'] * 1024;
       $this->Tariffs[$Tariff['Id']] = $Tariff;
     }  
@@ -50 +52 @@
     foreach($this->Tariffs as $Index => $Tariff)
     {
-      $DbResult = $this->Database->select('Member', 'COUNT(*)', '(InternetTariffCurrentMonth='.$Index.') AND (BillingPeriod > 1) AND (Blocked=0)');
+      $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)');
       $Row = $DbResult->fetch_row();
-      $this->Tariffs[$Index]['MemberCount'] = $Row[0];
-      $Tariffs['MemberCount'] = $Row[0];
+      $this->Tariffs[$Index]['CustomerCount'] = $Row[0];
+      $Tariffs['CustomerCount'] = $Row[0];
       
       //echo($Tariff['Name'].' '.$Tariff['MemberCount'].' '.$Tariff['SpeedMax'] * $Tariff['MemberCount'].' '.$ResidualSpeed.'<br />');
-      switch($Tariff['Group'])
+      switch($Tariff['Category'])
       {
         case 1:
-          $TotalMemberCount += $Tariff['MemberCount'];
-          $TotalMaxSpeed += $Tariff['SpeedMax'] * $Tariff['MemberCount'];
+          $TotalMemberCount += $Tariff['CustomerCount'];
+          $TotalMaxSpeed += $Tariff['InternetSpeedMax'] * $Tariff['CustomerCount'];
           break;
         case 2:
-          $ResidualSpeed -= $Tariff['SpeedMin'] * $Tariff['MemberCount'];
+          $ResidualSpeed -= $Tariff['InternetSpeedMin'] * $Tariff['CustomerCount'];
           break;
         case 3:
@@ -75 +79 @@
     foreach($this->Tariffs as $Index => $Tariff)
     {
-      switch($Tariff['Group'])
+      switch($Tariff['Category'])
       {
         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.
-          //$Tariff['SpeedMin'] = round($Tariff['SpeedMax'] * $Aggregation);
+          //$Tariff['InternetSpeedMin'] = round($Tariff['InternetSpeedMax'] * $Aggregation);
           break;
         case 2:
@@ -86 +90 @@
           break;
       }
-      //echo('MinSpeed: '.$Tariff['SpeedMin'].'<br />');
-      $this->Database->update('FinanceTariff', 'Id='.$Tariff['Id'], array('SpeedMin' => ($Tariff['SpeedMin'] / 1024), 'MemberCount' => $Tariff['MemberCount']));
+      //echo('MinSpeed: '.$Tariff['InternetSpeedMin'].'<br />');
+      $this->Database->update('Service', 'Id='.$Tariff['Id'], 
+        array('InternetSpeedMin' => ($Tariff['InternetSpeedMin'] / 1024), 
+        'CustomerCount' => $Tariff['CustomerCount']));
     }
     $this->LoadTariffs();