Changeset 724 for trunk/Modules/Finance

Timestamp:

Jan 3, 2015, 8:40:52 PM (10 years ago)

Author:

chronos

Message:

• Removed: Do not need preload tariffs anymore. They were replaced by more generalized services.

Location:

trunk/Modules/Finance

Files:

• Finance.php (modified) (3 diffs)
• Manage.php (modified) (1 diff)
• UserState.php (modified) (1 diff)
• Zivnost.php (modified) (1 diff)

trunk/Modules/Finance/Finance.php

@@ -7 +7 @@
 include_once(dirname(__FILE__).'/Zivnost.php');
 
+// TODO: Move constants to Finance module configuration
 define('TARIFF_FREE', 7);
 define('INVOICE_DUE_DAYS', 15);
@@ -34 +35 @@
   var $TotalPaid;
   var $TotalInternetPaid;
-  var $Tariffs;
   var $MainSubject;
   var $BillingPeriods;
   var $DirectoryId;
-
-  function LoadTariffs()
-  {
-    $this->Tariffs = array();
-    $DbResult = $this->Database->select('Service', '*', '`ReplaceId` IS NULL ORDER BY `Name`, `InternetSpeedMax`');
-    while($Tariff = $DbResult->fetch_array())
-    {
-      $Tariff['InternetSpeedMin'] = $Tariff['InternetSpeedMin'] * 1000;
-      $Tariff['InternetSpeedMax'] = $Tariff['InternetSpeedMax'] * 1000;
-      $this->Tariffs[$Tariff['Id']] = $Tariff;
-    }
-  }
 
   function LoadMonthParameters($Period = 1) // 0 - now, 1 - next month
@@ -85 +73 @@
     $this->TotalInternetPaid = $Row['MonthlyInternet'];
     $this->TotalPaid = $Row['MonthlyTotal'];
-
-    $this->LoadTariffs($Period);
   }
 

trunk/Modules/Finance/Manage.php

@@ -238 +238 @@
     $MonthCurrent = date('m') + 0;
 
-    $Output .= $Finance->LoadTariffs();
     $Output .= $Finance->RecalculateMemberPayment();
 

trunk/Modules/Finance/UserState.php

@@ -68 +68 @@
     $Finance = &$this->System->Modules['Finance'];
     $Finance->LoadMonthParameters(0);
-    $this->System->Modules['Finance']->LoadTariffs(1);
 
     // Determine which customer should be displayed

trunk/Modules/Finance/Zivnost.php

@@ -55 +55 @@
   {
     if(!$this->System->User->CheckPermission('Finance', 'TradingStatus')) return('Nemáte oprávnění');
-    $this->System->Modules['Finance']->LoadTariffs(1);
-    //TransformFinance();
 
     $Output = '';