Changeset 916 for trunk/Modules/Finance

Timestamp:

Dec 7, 2021, 11:08:42 PM (3 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.

Location:

trunk/Modules/Finance

Files:

• Bill.php (modified) (1 diff)
• Finance.php (modified) (5 diffs)
• Manage.php (modified) (11 diffs)

trunk/Modules/Finance/Bill.php

@@ -16 +16 @@
       $Subject['AddressStreet'].'<br>'.
       $Subject['AddressPSC'].' '.$Subject['AddressTown'].'<br>';
-    if ($Subject['IC'] != 0) $Output .= 'IČ: '.$Subject['IC'].'<br>';
+    if (($Subject['IC'] != '') and ($Subject['IC'] != 0)) $Output .= 'IČ: '.$Subject['IC'].'<br>';
     if ($Subject['DIC'] != '') $Output .= 'DIČ: '.$Subject['DIC'].'<br>';
     if ($Subject['Account'] != '') $Output .= 'Účet: '.$Subject['Account'].'<br>';

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'));

trunk/Modules/Finance/Manage.php

@@ -49 +49 @@
 
   /* Get first day and last day of given billing period. Periods are aligned with year start/end. */
-  function GetBillingPeriod($Period)
+  function GetBillingPeriod(int $Period): array
   {
     $Time = time();
@@ -73 +73 @@
   }
 
-  function ShowMonthlyPayment()
+  function ShowMonthlyPayment(): string
   {
     if (!ModuleUser::Cast($this->System->GetModule('User'))->User->CheckPermission('Finance', 'Manage')) return 'Nemáte oprávnění';
@@ -126 +126 @@
   }
 
-  function InsertInvoice($Subject, $TimeCreation, $TimeDue, $Items,
-    $Group, $PeriodFrom, $PeriodTo)
+  function InsertInvoice(string $Subject, string $TimeCreation, string $TimeDue, array $Items,
+    array $Group, float $PeriodFrom, float $PeriodTo): string
   {
     global $LastInsertTime;
@@ -156 +156 @@
   }
 
-  function ProduceInvoices()
+  function ProduceInvoices(): string
   {
     $Output = '';
@@ -224 +224 @@
   }
 
-  function TableUpdateChanges($Table)
+  function TableUpdateChanges(string $Table): void
   {
     $Time = time();
@@ -256 +256 @@
   }
 
-  function ProcessTableUpdates()
+  function ProcessTableUpdates(): string
   {
     // Update customers
@@ -277 +277 @@
   }
 
-  function ProcessMonthlyPayment()
+  function ProcessMonthlyPayment(): string
   {
     if (!ModuleUser::Cast($this->System->GetModule('User'))->User->CheckPermission('Finance', 'Manage')) return 'Nemáte oprávnění';
@@ -344 +344 @@
   }
 
-  function SendPaymentEmail($MemberId, $FileId = '')
+  function SendPaymentEmail(string $MemberId, string $FileId = ''): string
   {
     global $Config;
@@ -418 +418 @@
   }
 
-  function GenerateInvoice($Where)
+  function GenerateInvoice(string $Where): string
   {
     $DirectoryId = ModuleFinance::Cast($this->System->GetModule('Finance'))->Finance->DirectoryId;
@@ -447 +447 @@
   }
 
-  function GenerateOperation($Where)
+  function GenerateOperation(string $Where): string
   {
     $DirectoryId = ModuleFinance::Cast($this->System->GetModule('Finance'))->Finance->DirectoryId;
@@ -476 +476 @@
   }
 
-  function GenerateBills()
+  function GenerateBills(): string
   {
     $Output = '';