Changeset 726 for trunk/Modules/Finance/Finance.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/Finance.php (modified) (5 diffs)

trunk/Modules/Finance/Finance.php

@@ -46 +46 @@
 
     // Period parameter is not used as it have to be determined from item replacement
-    $DbResult = $this->Database->query('SELECT * FROM `FinanceCharge` WHERE `ReplaceId` IS NULL LIMIT 1');
+    $DbResult = $this->Database->query('SELECT * FROM `FinanceCharge` WHERE (`ChangeAction` IS NULL) LIMIT 1');
     $Row = $DbResult->fetch_array();
     $this->kWh = $Row['kWh'];
@@ -115 +115 @@
     while($Member = $DbResult->fetch_assoc())
     {
-      $DbResult2 = $this->Database->query('SELECT ((SELECT COALESCE(-SUM(Value*Direction), 0) FROM FinanceOperation '.
-          'WHERE Subject='.$Member['Subject'].') + (SELECT COALESCE(-SUM(Value*Direction), 0) FROM FinanceInvoice '.
+      $DbResult2 = $this->Database->query('SELECT ((SELECT COALESCE(SUM(Value*Direction), 0) FROM FinanceOperation '.
+          'WHERE Subject='.$Member['Subject'].') - (SELECT COALESCE(SUM(Value*Direction), 0) FROM FinanceInvoice '.
           'WHERE Subject='.$Member['Subject'].')) AS Cash');
       $Cash = $DbResult2->fetch_row();
@@ -129 +129 @@
       $DbResult2 = $this->Database->query('SELECT SUM(`Service`.`Price`) AS `Price` '.
           'FROM `ServiceCustomerRel` LEFT JOIN '.
-          '`Service` ON `Service`.`Id` = `ServiceCustomerRel`.`Service` WHERE `ServiceCustomerRel`.`Customer`='.
-          $Member['Id'].' AND `ServiceCustomerRel`.`Action` IS NULL');
+          '`Service` ON `Service`.`Id` = `ServiceCustomerRel`.`Service` WHERE (`ServiceCustomerRel`.`Customer`='.
+          $Member['Id'].') AND (`ServiceCustomerRel`.`ChangeAction` IS NULL)');
       $DbRow = $DbResult2->fetch_assoc();
       $Monthly = 0;
@@ -149 +149 @@
       }
       $this->Database->insert('MemberPayment', array('Member' => $Member['Id'],
-          'NetworkDevice' => $NetworkDevice, 'MonthlyInternet' => $MonthlyInet,
+          'MonthlyInternet' => $MonthlyInet,
           'MonthlyTotal' => $Monthly, 'MonthlyConsumption' => $this->W2Kc($Consumption),
           'Cash' => $Cash, 'MonthlyPlus' => $this->W2Kc($ConsumptionPlus)));
@@ -430 +430 @@
         'BaseTariffPrice' => array('Type' => 'Integer', 'Caption' => 'Základní cena tarifu', 'Default' => '0', 'Suffix' => 'Kč'),
         'TopTariffPrice' => array('Type' => 'Integer', 'Caption' => 'Nejvyšší cena tarifu', 'Default' => '0', 'Suffix' => 'Kč'),
-        'Action' => array('Type' => 'TActionEnum', 'Caption' => 'Změna období', 'Default' => '', 'Null' => true),
-        'ReplaceId' => array('Type' => 'TFinanceCharge', 'Caption' => 'Cílová položka', 'Default' => '0', 'Null' => true),
+        'ChangeAction' => array('Type' => 'TActionEnum', 'Caption' => 'Změna - akce', 'Default' => '', 'Null' => true),
+                'ChangeTime' => array('Type' => 'DateTime', 'Caption' => 'Změna - čas', 'Default' => '', 'Null' => true),
+        'ChangeReplaceId' => array('Type' => 'TFinanceCharge', 'Caption' => 'Změna - položka', 'Default' => '0', 'Null' => true),
       ),
     ));