Changeset 715 for trunk/Modules/Finance/Finance.php

Timestamp:

Jan 1, 2015, 2:18:20 PM (10 years ago)

Author:

chronos

Message:

• Removed: Unused table NetworkSegment which was previously used to compute exact member participation on device and consumption payment. Now consumption is handled with customer Service table.

File:

• trunk/Modules/Finance/Finance.php (modified) (7 diffs)

trunk/Modules/Finance/Finance.php

@@ -2 +2 @@
 
 include_once(dirname(__FILE__).'/Overview.php');
-include_once(dirname(__FILE__).'/Consumption.php');
-include_once(dirname(__FILE__).'/Devices.php');
 include_once(dirname(__FILE__).'/Bill.php');
 include_once(dirname(__FILE__).'/Services.php');
@@ -34 +32 @@
   var $SpeedReserve;
   var $BaseSpeedElement;
-  var $TotalConsumption;
   var $UserIdNetwork = 46;
   var $BaseTariffPrice;
@@ -143 +140 @@
     $this->SpravaUsers = $this->PayingUsers;
 
-    $DbResult = $this->Database->query('SELECT SUM(`Consumption`) FROM `NetworkSegment`');
-    $TotalConsumption = $DbResult->fetch_array();
-    $this->TotalConsumption = $TotalConsumption[0];
-
     $DbResult = $this->Database->query('SELECT SUM(`MemberPayment`.`MonthlyInternet`) AS `MonthlyInternet`, '.
         'SUM(`MemberPayment`.`MonthlyTotal`) AS `MonthlyTotal` '.
@@ -208 +201 @@
       $ConsumptionPlus = $DbResult2->fetch_row();
       $ConsumptionPlus = $ConsumptionPlus[0];
-
-      $NetworkDevice = 0;
-      $Consumption = 0;
-      $Id = $Member['NetworkSegment'];
-      while(($Id != '') and ($Id != 0))
-      {
-        $DbResult2 = $this->Database->query('SELECT * FROM `NetworkSegment` WHERE `Id`='.$Id);
-        $Device = $DbResult2->fetch_assoc();
-        if($Device['Users'] > 0) $NetworkDevice += $Device['Price'] / $Device['Users'];
-        if($Device['UsersOverheads'] > 0) $Consumption += $Device['Consumption'] / $Device['UsersOverheads'];
-        $Id = $Device['Parent'];
-      }
 
       $DbResult2 = $this->Database->query('SELECT SUM(`Service`.`Price`) AS `Price` '.
@@ -253 +234 @@
   }
 
-  function RecalculateSegmentParameters()
-  {
-    $Output = 'Aktualizuji parametry segmentů...<br />';
-    $this->Database->query('UPDATE `NetworkSegment` SET `Users` = 0, `UsersOverheads` = 0');     // Vynulovat počty uživatelů
-    $DbResult = $this->Database->query('SELECT * FROM `NetworkSegment`');
-    while($NetworkSegment = $DbResult->fetch_array())
-    {
-      $DbResult2 = $this->Database->query('SELECT `Users` FROM `NetworkSegment` WHERE `Id`='.$NetworkSegment['Id']);
-      $RowP = $DbResult2->fetch_array();
-      $DbResult2 = $this->Database->query('SELECT `UsersOverheads` FROM `NetworkSegment` WHERE `Id`='.$NetworkSegment['Id']);
-      $RowP2 = $DbResult2->fetch_array();
-
-      $DbResult2 = $this->Database->query('SELECT SUM(`Product`.`BuyPrice`) * `StockSerialNumber`.`Amount` AS `Price`, '.
-          'SUM(`Product`.`Consumption`) * `StockSerialNumber`.`Amount` AS `Consumption` '.
-          'FROM `StockSerialNumber` JOIN `Product` ON `Product`.`Id` = `StockSerialNumber`.`Product` '.
-          'WHERE (`StockSerialNumber`.`Segment`='.$NetworkSegment['Id'].') AND (`StockSerialNumber`.`TimeElimination` IS NULL)');
-      $Row2 = $DbResult2->fetch_array();
-      $DbResult2 = $this->Database->query('SELECT COUNT(*) FROM Member WHERE NetworkSegment='.$NetworkSegment['Id']);
-      $Row3 = $DbResult2->fetch_array();
-      $ID = $NetworkSegment['Parent'];
-      while($ID != 0)
-      {
-        $DbResult2 = $this->Database->query('SELECT * FROM NetworkSegment WHERE Id='.$ID);
-        $Row4 = $DbResult2->fetch_array();
-        $this->Database->update('NetworkSegment', 'Id='.$Row4['Id'],
-            array('Users' => ($Row4['Users'] + $Row3[0]), 'UsersOverheads' => ($Row4['UsersOverheads'] + $Row3[0])));
-        $ID = $Row4['Parent'];
-      }
-      $this->Database->update('NetworkSegment', 'Id='.$NetworkSegment['Id'],
-          array('Price' => $Row2['Price'], 'Users' => ($Row3[0] + $RowP['Users']), 'Consumption' => $Row2['Consumption'], 'UsersOverheads' => ($Row3[0] + $RowP2['UsersOverheads'])));
-    }
-
-    // Zkorigovat segment Internet
-    $DbResult = $this->Database->select('Member', 'COUNT(*)');
-    $Row = $DbResult->fetch_array();
-    $DbResult = $this->Database->update('NetworkSegment', 'Id='.$this->InternetSegmentId,
-        array('Users' => $Row[0], 'UsersOverheads' => $Row[0]));
-    $this->System->ModuleManager->Modules['Log']->NewRecord('Finance', 'RecalculateSegmentParameters');
-    return($Output);
-  }
-
   function GetVATByType($TypeId)
   {
@@ -331 +271 @@
 
     $this->System->RegisterPage('finance', 'PageFinance');
-    $this->System->RegisterPage(array('finance', 'spotreba'), 'PageFinanceConsumption');
-    $this->System->RegisterPage(array('finance', 'zarizeni'), 'PageFinanceDeviceList');
     $this->System->RegisterPage(array('finance', 'sluzby'), 'PageFinanceServices');
     $this->System->RegisterPage(array('finance', 'mesicni-prehledy'), 'PageFinanceMonthlyOverall');
@@ -433 +371 @@
         'Bank' => array('Type' => 'TFinanceBank', 'Caption' => 'Banka', 'Default' => ''),
         'TimeCreate' => array('Type' => 'Date', 'Caption' => 'Čas vytvoření', 'Default' => ''),
-        'TimeEnd' => array('Type' => 'Date', 'Caption' => 'Čas zrušení', 'Default' => ''),
+        'TimeEnd' => array('Type' => 'Date', 'Caption' => 'Čas zrušení', 'Default' => '', 'Null' => true),
         'Currency' => array('Type' => 'TCurrency', 'Caption' => 'Měna', 'Default' => ''),
         'LoginName' => array('Type' => 'String', 'Caption' => 'Přihlašovací jméno / token', 'Default' => ''),