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

trunk/Modules/Finance/Import.php

@@ -3 +3 @@
 class PageFinanceImportPayment extends Page
 {
-  var $FullTitle = 'Import plateb';
-  var $ShortTitle = 'Import plateb';
-  var $ParentClass = 'PageFinance';
+  function __construct(System $System)
+  {
+    parent::__construct($System);
+    $this->FullTitle = 'Import plateb';
+    $this->ShortTitle = 'Import plateb';
+    $this->ParentClass = 'PageFinance';
+  }
 
-  function Show()
+  function Show(): string
   {
-    if (!$this->System->User->CheckPermission('Finance', 'SubjectList')) return 'Nemáte oprávnění';
+    if (!ModuleUser::Cast($this->System->GetModule('User'))->User->CheckPermission('Finance', 'SubjectList')) return 'Nemáte oprávnění';
     if (array_key_exists('Operation', $_GET))
     {
@@ -26 +30 @@
   }
 
-  function Prepare()
+  function Prepare(): string
   {
-    $Finance = $this->System->Modules['Finance'];
+    $Finance = &ModuleFinance::Cast($this->System->GetModule('Finance'))->Finance;
     $Finance->LoadMonthParameters(0);
     $Data = explode("\n", $_POST['Source']);
@@ -124 +128 @@
   }
 
-  function InsertMoney($Subject, $Value, $Cash, $Taxable, $Time, $Text, $Group)
+  function InsertMoney(string $Subject, string $Value, string $Cash, string $Taxable, string $Time, string $Text, array $Group)
   {
     $Year = date('Y', $Time);
-    $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumberId($Group['DocumentLine'], $Year);
+    $BillCode = ModuleFinance::Cast($this->System->GetModule('Finance'))->Finance->GetNextDocumentLineNumberId($Group['DocumentLine'], $Year);
     // TODO: Fixed BankAccount=1, allow to select bank account for import
     $this->Database->insert('FinanceOperation', array('Text' => $Text,
@@ -136 +140 @@
   }
 
-  function Insert()
+  function Insert(): string
   {
-    $Finance = $this->System->Modules['Finance'];
+    $Finance = &ModuleFinance::Cast($this->System->GetModule('Finance'))->Finance;
     $Finance->LoadMonthParameters(0);
     $Output = '';
@@ -144 +148 @@
     for ($I = $_POST['ItemCount'] - 1; $I >= 0 ; $I--)
     {
-      if ($_POST['Money'.$I] < 0) {
-        $FinanceGroup = $this->System->Modules['Finance']->GetFinanceGroupById(OPERATION_GROUP_ACCOUNT_OUT, 'FinanceOperationGroup');
-      } else {
-        $FinanceGroup = $this->System->Modules['Finance']->GetFinanceGroupById(OPERATION_GROUP_ACCOUNT_OUT, 'FinanceOperationGroup');
+      if ($_POST['Money'.$I] < 0)
+      {
+        $FinanceGroup = $Finance->GetFinanceGroupById(OPERATION_GROUP_ACCOUNT_OUT, 'FinanceOperationGroup');
+      } else
+      {
+        $FinanceGroup = $Finance->GetFinanceGroupById(OPERATION_GROUP_ACCOUNT_OUT, 'FinanceOperationGroup');
       }
       $Date = explode('-', $_POST['Date'.$I]);
@@ -154 +160 @@
         0, $_POST['Taxable'.$I], $Date, $_POST['Text'.$I], $FinanceGroup);
       $Output .= $I.', ';
-      $this->System->ModuleManager->Modules['Log']->NewRecord('Finance', 'NewPaymentInserted');
+      ModuleLog::Cast($this->System->GetModule('Log'))->NewRecord('Finance', 'NewPaymentInserted');
     }
     return $Output;