Changeset 887 for trunk/Modules/FinanceBankAPI/FileImport.php

Timestamp:

Nov 20, 2020, 12:08:12 AM (4 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/FinanceBankAPI/FileImport.php (modified) (11 diffs)

trunk/Modules/FinanceBankAPI/FileImport.php

@@ -5 +5 @@
 class BankImport
 {
-  var $System;
-  var $Database;
-  var $BankAccount;
-
-  function __construct($System)
+  public System $System;
+  public Database $Database;
+  public int $BankAccount;
+
+  function __construct(System $System)
   {
     $this->Database = &$System->Database;
@@ -15 +15 @@
   }
 
-  function Import()
-  {
+  function Import(): string
+  {
+    return '';
   }
 
@@ -23 +24 @@
   }
 
-  function PairOperations()
-  {
+  function PairOperations(): void
+  {
+    $Finance = &ModuleFinance::Cast($this->System->GetModule('Finance'))->Finance;
     $DbResult = $this->Database->select('FinanceBankImport', '*', 'FinanceOperation IS NULL');
     while ($DbRow = $DbResult->fetch_assoc())
@@ -34 +36 @@
         {
           $DbRow2 = $DbResult2->fetch_assoc();
-          if ($DbRow['Value'] >= 0) {
-            $FinanceGroup = $this->System->Modules['Finance']->GetFinanceGroupById(OPERATION_GROUP_ACCOUNT_IN, 'FinanceOperationGroup');
-          } else {
-            $FinanceGroup = $this->System->Modules['Finance']->GetFinanceGroupById(OPERATION_GROUP_ACCOUNT_OUT, 'FinanceOperationGroup');
+          if ($DbRow['Value'] >= 0)
+          {
+            $FinanceGroup = $Finance->GetFinanceGroupById(OPERATION_GROUP_ACCOUNT_IN, 'FinanceOperationGroup');
+          } else
+          {
+            $FinanceGroup = $Finance->GetFinanceGroupById(OPERATION_GROUP_ACCOUNT_OUT, 'FinanceOperationGroup');
           }
           $Year = date('Y', MysqlDateToTime($DbRow['Time']));
-          $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumberId($FinanceGroup['DocumentLine'], $Year);
-          $DbResult3 = $this->Database->insert('FinanceOperation', array('Subject' => $DbRow2['Id'], 'Cash' => 0,
+          $BillCode = $Finance->GetNextDocumentLineNumberId($FinanceGroup['DocumentLine'], $Year);
+          $this->Database->insert('FinanceOperation', array('Subject' => $DbRow2['Id'], 'Cash' => 0,
             'ValueUser' => Abs($DbRow['Value']), 'Value' => 0, 'Taxable' => 1, 'BankAccount' => $DbRow['BankAccount'], 'Network' => 1,
             'Time' => $DbRow['Time'], 'Text' => $DbRow['Description'], 'BillCode' => $BillCode, 'Group' => $FinanceGroup['Id']));
@@ -65 +69 @@
 class PageImportAPI extends Page
 {
-  var $FullTitle = 'Import plateb přes API';
-  var $ShortTitle = 'Import plateb přes API';
-  var $ParentClass = 'PageFinance';
-
-  function Import($Id)
+  function __construct(System $System)
+  {
+    parent::__construct($System);
+    $this->FullTitle = 'Import plateb přes API';
+    $this->ShortTitle = 'Import plateb přes API';
+    $this->ParentClass = 'PageFinance';
+  }
+
+  function Import(int $Id): string
   {
     $Output = '';
@@ -92 +100 @@
   }
 
-  function Show()
-  {
-    if (!$this->System->User->CheckPermission('Finance', 'SubjectList'))
+  function Show(): string
+  {
+    if (!ModuleUser::Cast($this->System->GetModule('User'))->User->CheckPermission('Finance', 'SubjectList'))
       return 'Nemáte oprávnění';
 
@@ -104 +112 @@
 class PageImportFile extends Page
 {
-  var $FullTitle = 'Import plateb ze souboru';
-  var $ShortTitle = 'Import plateb ze souboru';
-  var $ParentClass = 'PageFinance';
-
-  function Show()
+  function __construct(System $System)
+  {
+    parent::__construct($System);
+    $this->FullTitle = 'Import plateb ze souboru';
+    $this->ShortTitle = 'Import plateb ze souboru';
+    $this->ParentClass = 'PageFinance';
+  }
+
+  function Show(): string
   {
     $Output = '';
-    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))
     {
@@ -121 +133 @@
   }
 
-  function ShowForm()
+  function ShowForm(): string
   {
     $Form = new Form($this->System->FormManager);
@@ -156 +168 @@
   }
 
-  function InsertMoney($Subject, $Value, $Cash, $Taxable, $Time, $Text, $Group)
+  function InsertMoney($Subject, $Value, $Cash, $Taxable, $Time, $Text, $Group): void
   {
     $Year = date('Y', $Time);
-    $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumberId(
+    $BillCode = ModuleFinance::Cast($this->System->GetModule('Finance'))->Finance->GetNextDocumentLineNumberId(
       $Group['DocumentLine'], $Year);
     $this->Database->insert('FinanceOperation', array('Text' => $Text,
@@ -166 +178 @@
   }
 
-  function Insert()
-  {
-    $Finance = $this->System->Modules['Finance'];
+  function Insert(): string
+  {
+    $Finance = $ModuleFinance::Cast($this->System->GetModule('Finance'))->Finance;
     $Output = '';
 
     for ($I = $_POST['ItemCount'] - 1; $I >= 0 ; $I--)
     {
-      if ($_POST['Money'.$I] >= 0) {
+      if ($_POST['Money'.$I] >= 0)
+      {
         $FinanceGroup = $Finance->GetFinanceGroupById(OPERATION_GROUP_ACCOUNT_IN,
           'FinanceOperationGroup');
-      } else {
+      } else
+      {
         $FinanceGroup = $Finance->GetFinanceGroupById(OPERATION_GROUP_ACCOUNT_OUT,
           'FinanceOperationGroup');
@@ -185 +199 @@
         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;