Changeset 726 for trunk/Modules/Finance/Manage.php

Timestamp:

Jan 5, 2015, 10:01:40 PM (10 years ago)

Author:

chronos

Message:

• Modified: Added time designation for scheduled table change actions. This applies to tables Service, ServiceCustomerRel and FinanceCharge. Now time of taking effect is not determined just by customer pay period but by more generally by specified time.

File:

• trunk/Modules/Finance/Manage.php (modified) (8 diffs)

trunk/Modules/Finance/Manage.php

@@ -54 +54 @@
       '(SELECT GROUP_CONCAT(`Service`.`Name`) FROM `ServiceCustomerRel` LEFT JOIN `Service` '.
       'ON `Service`.`Id`=`ServiceCustomerRel`.`Service` WHERE `ServiceCustomerRel`.`Customer`=`Member`.`Id` AND '.
-      '`ServiceCustomerRel`.`Action` IS NULL) AS `ServicesNextMonth`, '.
+      '`ServiceCustomerRel`.`ChangeAction` IS NULL) AS `ServicesNextMonth`, '.
       'UNIX_TIMESTAMP(`Member`.`BillingPeriodLastDate`) AS `LastDate`, `Subject`.`Name` AS `SubjectName`, '.
       '`FinanceBillingPeriod`.`Name` AS `BillingPeriodName` '.
@@ -156 +156 @@
           'ON `Service`.`Id`=`ServiceCustomerRel`.`Service` '.
           'WHERE (`ServiceCustomerRel`.`Customer`='.
-          $Member['Id'].') AND (`ServiceCustomerRel`.`Action` IS NULL) ');
+          $Member['Id'].') AND (`ServiceCustomerRel`.`ChangeAction` IS NULL) ');
         while($Service = $DbResult2->fetch_assoc())
         {
@@ -192 +192 @@
   }
 
-  function TableUpdatePeriod($Table)
-  {
-    $DbResult = $this->Database->select($Table, '*', '`Action` IS NOT NULL');
+  function TableUpdateChanges($Table)
+  {
+        $Time = time();
+    $DbResult = $this->Database->select($Table, '*', '(`ChangeAction` IS NOT NULL) AND '.
+        '(`ChangeTime` <= "'.TimeToMysqlDateTime($Time).'") ORDER BY `ChangeTime` ASC');
     while($Service = $DbResult->fetch_array())
     {
-      if($Service['Action'] == 'add')
+      if($Service['ChangeAction'] == 'add')
       {
         unset($Service['Id']);
-        unset($Service['ReplaceId']);
-        unset($Service['Action']);
+        unset($Service['ChangeReplaceId']);
+        unset($Service['ChangeAction']);
         $this->Database->insert($Table, $Service);
       } else
-      if($Service['Action'] == 'modify')
+      if($Service['ChangeAction'] == 'modify')
       {
         unset($Service['Id']);
-        unset($Service['Action']);
-        $ReplaceId = $Service['ReplaceId'];
-        unset($Service['ReplaceId']);
+        unset($Service['ChangeAction']);
+        $ReplaceId = $Service['ChangeReplaceId'];
+        unset($Service['ChangeReplaceId']);
         $this->Database->update($Table, 'Id='.$ReplaceId, $Service);
       } else
-      if($Service['Action'] == 'delete')
+      if($Service['ChangeAction'] == 'delete')
       {
         $this->Database->delete($Table, '`Id`='.$Service['ReplaceId']);
       }
     }
-    $this->Database->delete($Table, '`Action` IS NOT NULL');
-  }
-
+    $this->Database->delete($Table, '(`ChangeAction` IS NOT NULL) AND (`ChangeTime` <= "'.TimeToMysqlDateTime($Time).'")');
+  }
+
+  function ProcessTableUpdates()
+  {
+        // Update finance charge
+        $Output = 'Měním aktuální parametry sítě...<br>';
+        $this->TableUpdateChanges('FinanceCharge');
+        
+        // Update services
+        $Output .= 'Aktualizuji služby....<br>';
+        $this->TableUpdateChanges('Service');
+        
+        // Update customer service selections
+        $Output .= 'Aktualizuji výběr služeb zákazníků....<br>';
+        $this->TableUpdateChanges('ServiceCustomerRel');
+
+        return($Output);
+  }
+  
   function ProcessMonthlyPayment()
   {
@@ -225 +244 @@
     $Output = '';
 
+    $Output .= $this->ProcessTableUpdates();
+    
     $Finance = &$this->System->Modules['Finance'];
     $Finance->LoadMonthParameters(0);
 
     // Načti poslední měsíční přehled a nastavení
-    $DbResult = $this->Database->select('FinanceMonthlyOverall', '*', '1 ORDER BY Date DESC LIMIT 1');
+    $DbResult = $this->Database->select('FinanceMonthlyOverall', '*', '1 ORDER BY `Date` DESC LIMIT 1');
     $Overall = $DbResult->fetch_array();
 
-    $Output -= 'Datum: '.date('j.n.Y').'<br />';
+    $Output .= 'Datum: '.date('j.n.Y').'<br />';
 
     $DateParts = explode('-', $Overall['Date']);
@@ -240 +261 @@
     $Output .= $Finance->RecalculateMemberPayment();
 
-    $DbResult = $this->Database->query('SELECT SUM(NetworkDevice) FROM MemberPayment');
-    $Row = $DbResult->fetch_row();
-    $TotalMemberDeviceCost = $Row[0];
-    $Output .= '), Členové('.$TotalMemberDeviceCost.')<br />';
-
-    $DbResult = $this->Database->query('SELECT SUM(Cash) FROM MemberPayment');
+    $DbResult = $this->Database->query('SELECT SUM(`Cash`) FROM `MemberPayment`');
     $Row = $DbResult->fetch_row();
     $TotalMemberCash = $Row[0];
     $Output .= 'Stav pokladny: Členové('.$TotalMemberCash.')';
 
-    $DbResult = $this->Database->query('SELECT SUM(Product.Consumption) AS Consumption FROM StockSerialNumber '.
-      'JOIN Product ON StockSerialNumber.Product = Product.Id WHERE (StockSerialNumber.TimeElimination IS NULL) '.
-        'AND (StockSerialNumber.Segment IS NOT NULL)');
+    $DbResult = $this->Database->query('SELECT SUM(`Product`.`Consumption`) AS `Consumption` FROM `StockSerialNumber` '.
+      'JOIN `Product` ON `StockSerialNumber`.`Product` = `Product`.`Id` WHERE (`StockSerialNumber`.`TimeElimination` IS NULL) ');
     $Row = $DbResult->fetch_row();
     $TotalConsumption = $Row[0];
@@ -266 +281 @@
       $Output .= 'Odečítám měsíční poplatek...<br />';
       $Output .= $this->ProduceInvoices();
-
-      // Update finance charge
-      $Output .= 'Měním aktuální parametry sítě...<br>';
-      $this->TableUpdatePeriod('FinanceCharge');
-
+      
       $Output .= 'Přidávám měsíční přehled...<br />';
-      $DbResult = $this->Database->query('SELECT * FROM FinanceCharge WHERE Action IS NULL LIMIT 1');
+      $DbResult = $this->Database->query('SELECT * FROM `FinanceCharge` WHERE (`ChangeAction` IS NULL) LIMIT 1');
       $Charge = $DbResult->fetch_assoc();
       $this->Database->insert('FinanceMonthlyOverall', array('Date' => 'NOW()',
@@ -281 +292 @@
         'TopTariffPrice' => $Charge['TopTariffPrice'], 'MemberCount' => $Finance->InternetUsers));
 
-      // Update services
-      $Output .= 'Aktualizuji služby....<br>';
-      $this->TableUpdatePeriod('Service');
-      
-      // Update customer service selections
-      $Output .= 'Aktualizuji výběr služeb zákazníků....<br>';
-      $this->TableUpdatePeriod('ServiceCustomerRel');
-
       $Finance->RecalculateMemberPayment();
       //CreateMonthlyOverallBill();
@@ -335 +338 @@
       $DbResult = $this->Database->query('SELECT GROUP_CONCAT(Service.Name) AS Name FROM ServiceCustomerRel LEFT JOIN Service '.
         'ON Service.Id=ServiceCustomerRel.Service WHERE (ServiceCustomerRel.Customer='.$Member['Id'].') '.
-        'AND ServiceCustomerRel.Action IS NULL');
+        'AND ServiceCustomerRel.ChangeAction IS NULL');
       $Service = $DbResult->fetch_assoc();
       $Content .= '<strong>'.$Service['Name'].'</strong><br />'."\n".