Changeset 793

Timestamp:

Feb 3, 2016, 10:57:54 AM (9 years ago)

Author:

chronos

Message:

• Fixed: Error using $System global variable instead of class fields.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Modules/Customer/Customer.php (modified) (2 diffs)
• Modules/Finance/Finance.php (modified) (1 diff)
• Modules/Finance/Manage.php (modified) (1 diff)
• Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php (modified) (2 diffs)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 792; // Subversion revision
+$Revision = 793; // Subversion revision
 $DatabaseRevision = 792; // SQL structure revision
-$ReleaseTime = strtotime('2016-02-02');
+$ReleaseTime = strtotime('2016-02-03');

trunk/Modules/Customer/Customer.php

@@ -36 +36 @@
         'Consumption' => array('Type' => 'TCustomerStockSerialNumber', 'Caption' => 'Spotřeba zařízení', 'Default' => ''),
         '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' => 'TMember', 'Caption' => 'Změna - položka', 'Default' => '0', 'Null' => true),
+        'ChangeTime' => array('Type' => 'DateTime', 'Caption' => 'Změna - čas', 'Default' => '', 'Null' => true, 'NotInList' => true),
+        'ChangeReplaceId' => array('Type' => 'TMember', 'Caption' => 'Změna - položka', 'Default' => '0', 'Null' => true, 'NotInList' => true),
       ),
       'ItemActions' => array(
@@ -105 +105 @@
         'Customer' => array('Type' => 'TMember', 'Caption' => 'Zákazník', 'Default' => ''),
         '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' => 'TServiceCustomerRel', 'Caption' => 'Změna - položka', 'Default' => '', 'Null' => true),
+        'ChangeTime' => array('Type' => 'DateTime', 'Caption' => 'Změna - čas', 'Default' => '', 'Null' => true, 'NotInList' => true),
+        'ChangeReplaceId' => array('Type' => 'TServiceCustomerRel', 'Caption' => 'Změna - položka', 'Default' => '', 'Null' => true, 'NotInList' => true),
       ),
     ));

trunk/Modules/Finance/Finance.php

@@ -508 +508 @@
         'TopTariffPrice' => array('Type' => 'Integer', 'Caption' => 'Nejvyšší cena tarifu', 'Default' => '0', 'Suffix' => 'Kč'),
         '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),
+        'ChangeTime' => array('Type' => 'DateTime', 'Caption' => 'Změna - čas', 'Default' => '', 'Null' => true, 'NotInList' => true),
+        'ChangeReplaceId' => array('Type' => 'TFinanceCharge', 'Caption' => 'Změna - položka', 'Default' => '0', 'Null' => true, 'NotInList' => true),
       ),
     ));

trunk/Modules/Finance/Manage.php

@@ -199 +199 @@
         {
           $TimePeriodText = date('j.n.Y', $Period['From']).' - '.date('j.n.Y', $Period['To']);
-          $Output .= $TimePeriodText.': '.$MonthlyTotal.' * '.$Period['MonthCount'].' = '.$PayPerPeriod.'<br />';
+          $Output .= $TimePeriodText.': '.$MonthlyTotal.' * '.$Period['MonthCount'].' = '.$PayPerPeriod;
           $this->InsertInvoice($Member['Subject'], time(), time() + 3600 * 24 * INVOICE_DUE_DAYS,
-            $InvoiceItems, $FinanceGroup, $Period['From'],
-            $Period['To']);
+            $InvoiceItems, $FinanceGroup, $Period['From'], $Period['To']);
 
           $Output .= $this->SendPaymentEmail($Member['Id']);

trunk/Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php

@@ -56 +56 @@
                 TimeToMysqlDateTime($StartTime).'", NULL)');
             // Update previous record duration in UpDown table
-            $System->Database->query('UPDATE `NetworkInterfaceUpDown` AS `TM` SET `Duration` = TIMESTAMPDIFF(SECOND, '.
+            $this->Database->query('UPDATE `NetworkInterfaceUpDown` AS `TM` SET `Duration` = TIMESTAMPDIFF(SECOND, '.
                 '`TM`.`Time`, (SELECT `Time` FROM (SELECT * FROM `NetworkInterfaceUpDown`) AS `TA` WHERE (`TA`.`Time` > `TM`.`Time`) '.
                 'AND (`TA`.`Interface`=`TM`.`Interface`) ORDER BY `TA`.`Time` ASC LIMIT 1)) '.
                 'WHERE (`TM`.`Duration` IS NULL) AND (`TM`.`Interface` ='.$Interface['Id'].')');
-            $System->Database->update('NetworkInterface', '`Id` = "'.$Interface['Id'].'"',
+            $this->Database->update('NetworkInterface', '`Id` = "'.$Interface['Id'].'"',
                 array('Online' => $Interface['NewOnline']));
           }
@@ -84 +84 @@
       {
         if($Device['SumOnline'] > 0)
-          $System->Database->update('NetworkDevice', 'Id='.$Device['Device'], array('LastOnline' => TimeToMysqlDateTime($StartTime), 'Online' => 1));
+          $this->Database->update('NetworkDevice', 'Id='.$Device['Device'], array('LastOnline' => TimeToMysqlDateTime($StartTime), 'Online' => 1));
       }
       $DbResult = $this->Database->update('NetworkDevice', '`LastOnline` < "'.TimeToMysqlDateTime($StartTime).'"', array('Online' => 0));