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

Timestamp:

Dec 7, 2021, 11:08:42 PM (2 years ago)

Author:

chronos

Message:

• Added: Allow to switch Mail class into test mode.
• Modified: Type checking related changes.
• Modified: Replace global $Config references with $this->System->Config is possible.

File:

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

trunk/Modules/Finance/Finance.php

@@ -36 +36 @@
   function DoStart(): void
   {
-    global $Config;
-
     $this->System->RegisterPage(['finance', 'sprava'], 'PageFinanceManage');
     $this->System->RegisterPage(['finance', 'platby'], 'PageFinanceUserState');
@@ -162 +160 @@
         'Value' => array('Type' => 'Integer', 'Caption' => 'Částka absolutní', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true),
         'ValueUser' => array('Type' => 'Integer', 'Caption' => 'Částka', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
-          'SQL' => 'SELECT ROUND(SUM(`Price`*`Quantity`), '.$Config['Finance']['Rounding'].') FROM `FinanceInvoiceItem` WHERE `FinanceInvoiceItem`.`FinanceInvoice`=#Id'),
+          'SQL' => 'SELECT ROUND(SUM(`Price`*`Quantity`), '.$this->System->Config['Finance']['Rounding'].') FROM `FinanceInvoiceItem` WHERE `FinanceInvoiceItem`.`FinanceInvoice`=#Id'),
         'File' => array('Type' => 'TFile', 'Caption' => 'Doklad', 'Default' => '', 'Null' => true),
         'Generate' => array('Type' => 'Boolean', 'Caption' => 'Generovat', 'Default' => ''),
@@ -244 +242 @@
         'VAT' => array('Type' => 'Integer', 'Caption' => 'Daň', 'Default' => '21', 'Suffix' => '%'),
         'Total' => array('Type' => 'Integer', 'Caption' => 'Celkem', 'Default' => '', 'Suffix' => 'Kč',
-          'ReadOnly' => true, 'SQL' => 'ROUND(`Price` * `Quantity`, '.$Config['Finance']['Rounding'].')'),
+          'ReadOnly' => true, 'SQL' => 'ROUND(`Price` * `Quantity`, '.$this->System->Config['Finance']['Rounding'].')'),
       ),
       'AfterInsert' => array($this, 'AfterInsertFinanceInvoiceItem'),
@@ -259 +257 @@
         'State' => array('Type' => 'Float', 'Caption' => 'Stav', 'Default' => '',
           'ReadOnly' => true, 'Suffix' => 'Kč', 'SQL' => 'IFNULL(ROUND((SELECT SUM(`FinanceOperation`.`Value`) FROM `FinanceOperation` '.
-          'WHERE `FinanceOperation`.`Treasury`=#Id), '.$Config['Finance']['Rounding'].'), 0)'),
+          'WHERE `FinanceOperation`.`Treasury`=#Id), '.$this->System->Config['Finance']['Rounding'].'), 0)'),
         'Operations' => array('Type' => 'TFinanceOperationListTreasury', 'Caption' => 'Operace', 'Default' => ''),
         'Check' => array('Type' => 'TFinanceTreasuryCheckListTreasury', 'Caption' => 'Kontrola', 'Default' => ''),
@@ -568 +566 @@
     ));
 
-    $this->Finance->MainSubject = $Config['Finance']['MainSubjectId'];
-    $this->Finance->DirectoryId = $Config['Finance']['DirectoryId'];
+    $this->Finance->MainSubject = $this->System->Config['Finance']['MainSubjectId'];
+    $this->Finance->DirectoryId = $this->System->Config['Finance']['DirectoryId'];
 
     ModuleIS::Cast($this->System->GetModule('IS'))->RegisterDashboardItem('Finance', array($this, 'ShowDashboardItem'));