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

Timestamp:

Nov 20, 2020, 12:08:12 AM (3 years ago)

Author:

chronos

Message:

• Added: Static types added to almost all classes, methods and function. Supported by PHP 7.4.
• Fixed: Various found code issues.

File:

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

trunk/Modules/Finance/Manage.php

@@ -3 +3 @@
 class PageFinanceManage extends Page
 {
-  var $FullTitle = 'Správa financí';
-  var $ShortTitle = 'Správa financí';
-  var $ParentClass = 'PageFinance';
-
-  function Show()
-  {
-    $Output = '';
-    if (!$this->System->User->CheckPermission('Finance', 'Manage'))
+  function __construct(System $System)
+  {
+    parent::__construct($System);
+    $this->FullTitle = 'Správa financí';
+    $this->ShortTitle = 'Správa financí';
+    $this->ParentClass = 'PageFinance';
+  }
+
+  function Show(): string
+  {
+    $Output = '';
+    if (!ModuleUser::Cast($this->System->GetModule('User'))->User->CheckPermission('Finance', 'Manage'))
       return 'Nemáte oprávnění';
 
@@ -18 +22 @@
     {
       case 'Recalculate':
-        $Output .= $this->System->Modules['Finance']->RecalculateMemberPayment();
+        $Output .= ModuleFinance::Cast($this->System->GetModule('Finance'))->Finance->RecalculateMemberPayment();
         break;
       case 'ShowMonthlyPayment':
@@ -51 +55 @@
     $Year = date('Y', $Time);
 
-    $MonthCount = $this->System->Modules['Finance']->BillingPeriods[$Period]['MonthCount'];
+    $MonthCount = ModuleFinance::Cast($this->System->GetModule('Finance'))->Finance->BillingPeriods[$Period]['MonthCount'];
     if ($MonthCount <= 0) return array('From' => NULL, 'To' => NULL, 'MonthCount' => 0);
     $MonthCurrent = date('n', $Time);
@@ -72 +76 @@
   function ShowMonthlyPayment()
   {
-    if (!$this->System->User->CheckPermission('Finance', 'Manage')) return 'Nemáte oprávnění';
+    if (!ModuleUser::Cast($this->System->GetModule('User'))->User->CheckPermission('Finance', 'Manage')) return 'Nemáte oprávnění';
     $SQL = 'SELECT `Member`.*, `MemberPayment`.`MonthlyTotal` AS `Monthly`, '.
       '`MemberPayment`.`Cash` AS `Cash`, '.
@@ -128 +132 @@
     global $LastInsertTime;
 
+    $Finance = ModuleFinance::Cast($this->System->GetModule('Finance'))->Finance;
+
     $Year = date('Y', $TimeCreation);
-    $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumberId($Group['DocumentLine'], $Year);
+    $BillCode = $Finance->GetNextDocumentLineNumberId($Group['DocumentLine'], $Year);
     $SumValue = 0;
     foreach ($Items as $Item) {
       $SumValue = $SumValue + $Item['Price'] * $Item['Quantity'];
     }
-    $Finance = &$this->System->Modules['Finance'];
     $SumValue = round($SumValue, $Finance->Rounding);
     $this->Database->insert('FinanceInvoice', array(
@@ -181 +186 @@
         {
           $InvoiceItems[] = array('Description' => $Service['Name'], 'Price' => $Service['Price'],
-            'Quantity' => $Period['MonthCount'], 'VAT' => $this->System->Modules['Finance']->GetVATByType($Service['VAT']));
+            'Quantity' => $Period['MonthCount'], 'VAT' => ModuleFinance::Cast($this->System->GetModule('Finance'))->Finance->GetVATByType($Service['VAT']));
           $MonthlyTotal += $Service['Price'];
         }
@@ -196 +201 @@
 
         // Load invoice group
-        $FinanceGroup = $this->System->Modules['Finance']->GetFinanceGroupById($InvoiceGroupId, 'FinanceInvoiceGroup');
+        $FinanceGroup = ModuleFinance::Cast($this->System->GetModule('Finance'))->Finance->GetFinanceGroupById($InvoiceGroupId, 'FinanceInvoiceGroup');
         foreach ($InvoiceItems as $Index => $Item)
         {
@@ -275 +280 @@
   function ProcessMonthlyPayment()
   {
-    if (!$this->System->User->CheckPermission('Finance', 'Manage')) return 'Nemáte oprávnění';
+    if (!ModuleUser::Cast($this->System->GetModule('User'))->User->CheckPermission('Finance', 'Manage')) return 'Nemáte oprávnění';
     $Output = '';
 
     $Output .= $this->ProcessTableUpdates();
 
-    $Finance = &$this->System->Modules['Finance'];
+    $Finance = &ModuleFinance::Cast($this->System->GetModule('Finance'))->Finance;
     $Finance->LoadMonthParameters(0);
 
@@ -334 +339 @@
       //flush();
       //$this->GenerateBills();
-      $this->System->ModuleManager->Modules['Log']->NewRecord('Finance', 'ProcessMonthlyPayment', $Output);
+      ModuleLog::Cast($this->System->GetModule('Log'))->NewRecord('Finance', 'ProcessMonthlyPayment', $Output);
     }
     $Output = str_replace("\n", '<br/>', $Output);
@@ -379 +384 @@
       $Service = $DbResult->fetch_assoc();
       $Content .= '<strong>'.$Service['Name'].'</strong><br />'."\n".
-        'Vaše platební období: <strong>'.$this->System->Modules['Finance']->BillingPeriods[$Member['BillingPeriod']]['Name'].'</strong><br />'."\n".
+        'Vaše platební období: <strong>'.ModuleFinance::Cast($this->System->GetModule('Finance'))->Finance->BillingPeriods[$Member['BillingPeriod']]['Name'].'</strong><br />'."\n".
         'Pravidelná platba za období: <strong>'.($MemberPayment['MonthlyTotal'] * $Period['MonthCount']).' Kč</strong><br />'."\n".
         'Bankovní účet: <strong>'.$MainSubjectAccount['NumberFull'].'</strong><br/>'."\n".
@@ -407 +412 @@
 
       $Content .= '<br />Tento email je generován automaticky. V případě zjištění nesrovnalostí napište zpět.';
-      $this->System->ModuleManager->Modules['EmailQueue']->AddItem($User['Name'].' <'.$User['Email'].'>', $Title, $Content,
+      ModuleEmailQueue::Cast($this->System->GetModule('EmailQueue'))->AddItem($User['Name'].' <'.$User['Email'].'>', $Title, $Content,
          $Config['Web']['Admin'].' <'.$Config['Web']['AdminEmail'].'>');
       $Output = '';
@@ -416 +421 @@
   function GenerateInvoice($Where)
   {
+    $DirectoryId = ModuleFinance::Cast($this->System->GetModule('Finance'))->Finance->DirectoryId;
     $Output = '';
     $DbResult = $this->Database->query('SELECT * FROM `FinanceInvoice` WHERE (`BillCode` <> "") '.
@@ -423 +429 @@
       if ($Row['File'] == null)
       {
-        $DbResult2 = $this->Database->insert('File', array('Name' => '', 'Size' => 0,
-          'Directory' => $this->System->Modules['Finance']->DirectoryId, 'Time' => 'NOW()'));
+        $this->Database->insert('File', array('Name' => '', 'Size' => 0, 'Directory' => $DirectoryId, 'Time' => 'NOW()'));
         $FileId = $this->Database->insert_id;
       } else $FileId = $Row['File'];
@@ -432 +437 @@
       $Bill->System = &$this->System;
       $Bill->InvoiceId = $Row['Id'];
-      $FullFileName = $this->System->Modules['File']->GetDir($this->System->Modules['Finance']->DirectoryId).$FileName;
+      $FullFileName = ModuleFile::Cast($this->System->GetModule('File'))->File->GetDir($DirectoryId).$FileName;
       $Bill->SaveToFile($FullFileName);
       if (file_exists($FullFileName))
@@ -446 +451 @@
   function GenerateOperation($Where)
   {
+    $DirectoryId = ModuleFinance::Cast($this->System->GetModule('Finance'))->Finance->DirectoryId;
     $Output = '';
     $DbResult = $this->Database->query('SELECT * FROM `FinanceOperation` WHERE (`BillCode` <> "") '.
@@ -454 +460 @@
       {
         $DbResult2 = $this->Database->insert('File', array('Name' => '', 'Size' => 0,
-          'Directory' => $this->System->Modules['Finance']->DirectoryId, 'Time' => 'NOW()'));
+          'Directory' => $DirectoryId, 'Time' => 'NOW()'));
         $FileId = $this->Database->insert_id;
       } else $FileId = $Row['File'];
@@ -462 +468 @@
       $Bill->System = &$this->System;
       $Bill->OperationId = $Row['Id'];
-      $FullFileName = $this->System->Modules['File']->GetDir($this->System->Modules['Finance']->DirectoryId).$FileName;
+      $FullFileName = ModuleFile::Cast($this->System->GetModule('File'))->File->GetDir($DirectoryId).$FileName;
       $Bill->SaveToFile($FullFileName);
       if (file_exists($FullFileName))