Changeset 901 for trunk/Modules/Finance

Timestamp:

Feb 17, 2021, 9:27:32 PM (4 years ago)

Author:

chronos

Message:

• Added: Documents section accessible from users panel.
• Added: Contract model moved to separate module Contract.
• Added: New action to generate PDF from Contract.
• Fixed: Allow users to download files only by hash instead of direct id.
• Added: Support for SHA1 as allowed mysql function.

Location:

trunk/Modules/Finance

Files:

• Bill.php (modified) (1 diff)
• Finance.php (modified) (7 diffs)
• FinanceModels.php (modified) (2 diffs)
• Import.php (modified) (1 diff)
• Manage.php (modified) (4 diffs)
• UserState.php (modified) (5 diffs)

trunk/Modules/Finance/Bill.php

@@ -1 +1 @@
 <?php
 
-class Bill extends Model
+class Bill extends Pdf
 {
   public int $SpecificSymbol = 1; // computer network number
-  public bool $Checked = false;
-
-  function GenerateHTML(): string
-  {
-    return '';
-  }
-
-  function SaveToFile(string $FileName): void
-  {
-    $PdfData = $this->HtmlToPdf($this->GenerateHTML());
-    file_put_contents($FileName, $PdfData);
-  }
-
-  function HtmlToPdf(string $HtmlCode): string
-  {
-    $Encoding = new Encoding();
-    if ($this->Checked == false) {
-      if (CommandExist('htmldoc')) {
-        $this->Checked = true;
-      } else throw new Exception('htmldoc is not installed.');
-    }
-    $Output = shell_exec('echo "'.addslashes($Encoding->FromUTF8($HtmlCode)).
-      '"|htmldoc --no-numbered --webpage --no-embedfonts --charset 8859-2 -t pdf -');
-    return $Output;
-  }
 }
 

trunk/Modules/Finance/Finance.php

@@ -21 +21 @@
     $this->License = 'GNU/GPLv3';
     $this->Description = 'Base module for finance management';
-    $this->Dependencies = array(ModuleFile::GetName(), ModuleEmailQueue::GetName(), ModuleSubject::GetName(), ModuleDocument::GetName());
+    $this->Dependencies = array(ModuleFile::GetName(), ModuleEmailQueue::GetName(), ModuleSubject::GetName(),
+      ModuleDocument::GetName());
     $this->Models = array(FinanceBillingPeriod::GetClassName(), FinanceVatType::GetClassName(), FinanceVat::GetClassName(),
       FinanceGroup::GetClassName(), FinanceOperationGroup::GetClassName(), FinanceOperation::GetClassName(),
@@ -27 +28 @@
       Company::GetClassName(), FinanceTreasury::GetClassName(), FinanceTreasuryCheck::GetClassName(),
       Currency::GetClassName(), FinanceBank::GetClassName(), FinanceBankAccount::GetClassName(), FinanceCharge::GetClassName(),
-      Contract::GetClassName(), FinanceInvoiceOperationRel::GetClassName());
+      FinanceInvoiceOperationRel::GetClassName());
 
     $this->Bill = new Bill($this->System);
@@ -423 +424 @@
         'Name' => array('Type' => 'String', 'Caption' => 'Název', 'Default' => ''),
       ),
-    ));
-    $this->System->FormManager->RegisterClass('Contract', array(
-      'Title' => 'Smlouvy',
-      'Table' => 'Contract',
-      'Items' => array(
-        'DocumentLine' => array('Type' => 'TDocumentLine', 'Caption' => 'Dokladová řada', 'Default' => ''),
-        'BillCode' => array('Type' => 'TDocumentLineCode', 'Caption' => 'Kód', 'Default' => '', 'Null' => true),
-        'Subject' => array('Type' => 'TSubject', 'Caption' => 'Subjekt', 'Default' => ''),
-        'ValidFrom' => array('Type' => 'Date', 'Caption' => 'Platnost od', 'Default' => ''),
-        'ValidTo' => array('Type' => 'Date', 'Caption' => 'Platnost do', 'Default' => '', 'Null' => true),
-        'File' => array('Type' => 'TFile', 'Caption' => 'Soubor', 'Default' => '', 'Null' => true),
-      ),
-      'BeforeInsert' => array($this, 'BeforeInsertContract'),
-    ));
-    $this->System->FormManager->RegisterFormType('TContract', array(
-      'Type' => 'Reference',
-      'Table' => 'Contract',
-      'Id' => 'Id',
-      'Name' => 'BillCode',
-      'Filter' => '1',
     ));
     $this->System->FormManager->RegisterFormType('TFinanceVAT', array(
@@ -541 +522 @@
   }
 
-  function DoStop(): void
-  {
-  }
-
   function BeforeInsertFinanceOperation(Form $Form): array
   {
@@ -550 +527 @@
       else $Year = date("Y", $Form->Values['ValidFrom']);
     $FinanceGroup = $this->Finance->GetFinanceGroupById($Form->Values['Group'], 'FinanceOperationGroup');
-    $Form->Values['BillCode'] = $this->Finance->GetNextDocumentLineNumberId($FinanceGroup['DocumentLine'], $Year);
+    $Form->Values['BillCode'] = ModuleDocument::Cast($this->System->GetModule('Document'))->GetNextDocumentLineNumberId($FinanceGroup['DocumentLine'], $Year);
     return $Form->Values;
   }
@@ -576 +553 @@
       else $Year = date("Y", $Form->Values['ValidFrom']);
     $Group = $this->Finance->GetFinanceGroupById($Form->Values['Group'], 'FinanceInvoiceGroup');
-    $Form->Values['BillCode'] = $this->Finance->GetNextDocumentLineNumberId($Group['DocumentLine'], $Year);
+    $Form->Values['BillCode'] = ModuleDocument::Cast($this->System->GetModule('Document'))->GetNextDocumentLineNumberId($Group['DocumentLine'], $Year);
     return $Form->Values;
   }
@@ -621 +598 @@
   }
 
-  function BeforeInsertContract(Form $Form): array
-  {
-    if (array_key_exists('Time', $Form->Values)) $Year = date("Y", $Form->Values['Time']);
-      else $Year = date("Y", $Form->Values['ValidFrom']);
-    $Form->Values['BillCode'] = $this->Finance->GetNextDocumentLineNumberId($Form->Values['DocumentLine'], $Year);
-    return $Form->Values;
-  }
-
   static function Cast(Module $Module): ModuleFinance
   {

trunk/Modules/Finance/FinanceModels.php

@@ -77 +77 @@
   }
 
-  function CreateFinanceYear(int $Year)
-  {
-    $StartTime = mktime(0, 0, 0, 1, 1, $Year);
-    $EndTime = mktime(0, 0, 0, 12, 31, $Year);
-    $this->Database->insert('FinanceYear', array('Year' => $Year,
-            'DateStart' => TimeToMysqlDate($StartTime), 'DateEnd' => TimeToMysqlDate($EndTime), 'Closed' => 0));
-          $YearId = $this->Database->insert_id;
-
-    // Create DocumentLineSequence from previous
-    $DbResult = $this->Database->select('DocumentLine', 'Id', '`Yearly` = 1');
-    while ($DbRow = $DbResult->fetch_assoc())
+  function GetFinanceGroupById(string $Id, string $Table): ?array
+  {
+    $DbResult = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE `Id`= '.$Id);
+    if ($DbResult->num_rows == 1)
     {
-            $this->Database->insert('DocumentLineSequence', array('FinanceYear' => $YearId,
-              'NextNumber' => 1, 'YearPrefix' => 1, 'DocumentLine' => $DbRow['Id']));
-          }
-  }
-
-  function GetFinanceYear(int $Year): array
-  {
-    if ($Year == 0)
-    {
-      // Get latest year
-      $DbResult = $this->Database->select('FinanceYear', '*', '1 ORDER BY `Year` DESC LIMIT 1');
-    } else $DbResult = $this->Database->select('FinanceYear', '*', '`Year`='.$Year);
-    if ($DbResult->num_rows == 0)
-    {
-            if ($Year == date('Y'))
-            {
-                    $this->CreateFinanceYear($Year);
-        $DbResult = $this->Database->select('FinanceYear', '*', '`Year`='.$Year);
-            } else throw new Exception('Rok '.$Year.' nenalezen');
-          }
-    $FinanceYear = $DbResult->fetch_assoc();
-    if ($FinanceYear['Closed'] == 1)
-      throw new Exception('Rok '.$FinanceYear['Year'].' je již uzavřen. Nelze do něj přidávat položky.');
-    return $FinanceYear;
-  }
-
-  function GetNextDocumentLineNumber(string $Id, int $FinanceYear = 0): string
-  {
-          $FinanceYear = $this->GetFinanceYear($FinanceYear);
-
-    $DbResult = $this->Database->query('SELECT `Shortcut`, `Id` FROM `DocumentLine` WHERE `Id`='.$Id);
-    $DocumentLine = $DbResult->fetch_assoc();
-
-    $DbResult = $this->Database->query('SELECT * FROM `DocumentLineSequence` WHERE '.
-      '`DocumentLine`='.$Id.' AND `FinanceYear`='.$FinanceYear['Id']);
-    $Sequence = $DbResult->fetch_assoc();
-
-    if ($Sequence['YearPrefix'] == 1)
-    {
-      $Result = $DocumentLine['Shortcut'].$Sequence['NextNumber'].'/'.$FinanceYear['Year'];
-    } else $Result = $DocumentLine['Shortcut'].$Sequence['NextNumber'];
-
-    $this->Database->query('UPDATE `DocumentLineSequence` SET `NextNumber` = `NextNumber` + 1 '.
-      'WHERE (`DocumentLine`='.$Id.') AND (`FinanceYear`='.$FinanceYear['Id'].')');
-    return $Result;
-  }
-
-  function GetNextDocumentLineNumberId(string $Id, int $FinanceYear = 0): int
-  {
-    $Code = $this->GetNextDocumentLineNumber($Id, $FinanceYear);
-    $this->Database->insert('DocumentLineCode', array('DocumentLine' => $Id, 'Name' => $Code));
-    return $this->Database->insert_id;
-  }
-
-  function GetFinanceGroupById(string $Id, string $Table): ?array
-  {
-    $DbResult = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE `Id`= '.$Id);
-    if ($DbResult->num_rows == 1) {
       $Group = $DbResult->fetch_assoc();
       return $Group;
@@ -443 +378 @@
 }
 
-class Contract extends Model
-{
-  static function GetModelDesc(): ModelDesc
-  {
-    $Desc = new ModelDesc(self::GetClassName());
-    $Desc->AddReference('DocumentLine', DocumentLine::GetClassName());
-    $Desc->AddReference('BillCode', DocumentLineCode::GetClassName());
-    $Desc->AddReference('Subject', Subject::GetClassName());
-    $Desc->AddDate('ValidFrom');
-    $Desc->AddDate('ValidTo');
-    $Desc->AddReference('File', File::GetClassName());
-    return $Desc;
-  }
-}
-
 class FinanceBillingPeriod extends Model
 {

trunk/Modules/Finance/Import.php

@@ -131 +131 @@
   {
     $Year = date('Y', $Time);
-    $BillCode = ModuleFinance::Cast($this->System->GetModule('Finance'))->Finance->GetNextDocumentLineNumberId($Group['DocumentLine'], $Year);
+    $BillCode = ModuleDocument::Cast($this->System->GetModule('Document'))->GetNextDocumentLineNumberId($Group['DocumentLine'], $Year);
     // TODO: Fixed BankAccount=1, allow to select bank account for import
     $this->Database->insert('FinanceOperation', array('Text' => $Text,

trunk/Modules/Finance/Manage.php

@@ -135 +135 @@
 
     $Year = date('Y', $TimeCreation);
-    $BillCode = $Finance->GetNextDocumentLineNumberId($Group['DocumentLine'], $Year);
+    $BillCode = ModuleDocument::Cast($this->System->GetModule('Document'))->GetNextDocumentLineNumberId($Group['DocumentLine'], $Year);
     $SumValue = 0;
     foreach ($Items as $Item) {
@@ -377 +377 @@
       $Title = 'Pravidelné vyúčtování služeb';
       $Content = 'Vyúčtovaní zákazníka <strong>'.$Subject['Name'].'</strong> zastoupeného uživatelem <strong>'.
-        $User['Name'].'</strong> ke dni <strong>'.$this->System->HumanDate(time()).'</strong>.<br/><br/>'."\n".
+        $User['Name'].'</strong> ke dni <strong>'.Core::Cast($this->System)->HumanDate(time()).'</strong>.<br/><br/>'."\n".
         'Vaše aktuální služby: ';
       $DbResult = $this->Database->query('SELECT GROUP_CONCAT(`Service`.`Name`) AS `Name` FROM `ServiceCustomerRel` LEFT JOIN `Service` '.
@@ -441 +441 @@
       if (file_exists($FullFileName))
       {
-        $this->Database->update('File', 'Id='.$FileId, array('Name' => $FileName, 'Size' => filesize($FullFileName)));
+        $this->Database->update('File', 'Id='.$FileId, array('Name' => $FileName, 'Size' => filesize($FullFileName), 'Hash' => 'SHA1(CONCAT(Id,Name,Size,Time))'));
         $this->Database->update('FinanceInvoice', 'Id='.$Row['Id'], array('File' => $FileId));
         $Output .= 'Faktura '.$Row['Id'].' vygenerována do souboru '.$FileName.'<br/>'."\n";
@@ -472 +472 @@
       if (file_exists($FullFileName))
       {
-        $this->Database->update('File', 'Id='.$FileId, array('Name' => $FileName, 'Size' => filesize($FullFileName)));
+        $this->Database->update('File', 'Id='.$FileId, array('Name' => $FileName, 'Size' => filesize($FullFileName), 'Hash' => 'SHA1(CONCAT(Id,Name,Size,Time))'));
         $this->Database->update('FinanceOperation', 'Id='.$Row['Id'], array('File' => $FileId));
         $Output .= 'Doklad pro platbu '.$Row['Id'].' vygenerován do souboru '.$FileName.'<br/>'."\n";

trunk/Modules/Finance/UserState.php

@@ -11 +11 @@
   }
 
-  function ShowFinanceOperation(int $Subject): string
+  function ShowFinanceOperation(int $SubjectId): string
   {
-    $UserOperationTableQuery = '((SELECT `Text`, `Time`, `Value`, `File`, `BillCode`, NULL AS `PeriodFrom`, NULL AS `PeriodTo`, `DocumentLineCode`.`Name` AS `BillName` '.
+    $UserOperationTableQuery = '((SELECT `Text`, `FinanceOperation`.`Time`, `Value`, `File`.`Hash` AS `FileHash`, `BillCode`, NULL AS `PeriodFrom`, NULL AS `PeriodTo`, `DocumentLineCode`.`Name` AS `BillName` '.
       'FROM `FinanceOperation` '.
       'LEFT JOIN `DocumentLineCode` ON `DocumentLineCode`.`Id`=`FinanceOperation`.`BillCode` '.
-      'WHERE (`Subject`='.$Subject['Id'].') '.
+      'LEFT JOIN `File` ON `File`.`Id`=`FinanceOperation`.`File` '.
+      'WHERE (`Subject`='.$SubjectId.') '.
       ') UNION ALL '.
       '(SELECT (SELECT GROUP_CONCAT(`Description` SEPARATOR ",") FROM `FinanceInvoiceItem` WHERE `FinanceInvoice`=`FinanceInvoice`.`Id`) AS `Text`, '.
-      '`Time`, -`Value`, `File`, `BillCode`, `PeriodFrom`, `PeriodTo`, `DocumentLineCode`.`Name` AS `BillName` FROM `FinanceInvoice` '.
+      '`FinanceInvoice`.`Time`, -`Value`, `File`.`Hash` AS `FileHash`, `BillCode`, `PeriodFrom`, `PeriodTo`, `DocumentLineCode`.`Name` AS `BillName` '.
+      'FROM `FinanceInvoice` '.
       'LEFT JOIN `DocumentLineCode` ON `DocumentLineCode`.`Id`=`FinanceInvoice`.`BillCode` '.
-      'WHERE (`Subject`='.$Subject['Id'].') AND (`VisibleToUser` = 1)))';
+      'LEFT JOIN `File` ON `File`.`Id`=`FinanceInvoice`.`File` '.
+      'WHERE (`Subject`='.$SubjectId.') AND (`VisibleToUser` = 1)))';
 
     $Output = '<div style="text-align:center">Výpis finančních operací</div>';
@@ -56 +59 @@
       if ($Row['Value'] > 0) $Row['Value'] = '+'.$Row['Value'];
       if ($Row['BillName'] == '') $Row['BillName'] = 'PDF';
-      if ($Row['File'] > 0) $Invoice = '<a href="'.$this->System->Link('/file?id='.$Row['File']).'">'.$Row['BillName'].'</a>';
+      if ($Row['FileHash'] != '') $Invoice = '<a href="'.$this->System->Link('/file?h='.$Row['FileHash']).'">'.$Row['BillName'].'</a>';
         else $Invoice = NotBlank($Row['BillName']);
       if ($Row['PeriodFrom'] != '') $Period = HumanDate($Row['PeriodFrom']).' - '.HumanDate($Row['PeriodTo']);
@@ -102 +105 @@
     } else return $this->SystemMessage('Položka nenalezena', 'Zákazník nenalezen');
 
-
     // Load subject info
     $DbResult = $this->Database->query('SELECT * FROM `Subject` WHERE `Id`='.$Customer['Subject']);
@@ -109 +111 @@
       $Subject = $DbResult->fetch_assoc();
     } else return $this->SystemMessage('Položka nenalezena', 'Subjekt nenalezen');
-
 
     $Output = '<table width="100%" border="0" cellspacing="0" cellpadding="3"><tr><td valign="top">';
@@ -124 +125 @@
 
     // Tabulka operaci
-    $Output .= $this->ShowFinanceOperation($Subject);
+    $Output .= $this->ShowFinanceOperation($Subject['Id']);
 
     $Output .= '</td><td valign="top">';