Changeset 502

Timestamp:

Mar 12, 2013, 10:58:10 PM (12 years ago)

Author:

chronos

Message:

• Přidáno: Akce pro import plateb přes API nebo ze souboru z tabulky "Bankovní účty" ze správy dat.
• Přidáno: Prozatím zkoušení importu z Fio a Poštovní spořitelny.

Location:

trunk

Files:

• Common/Form/Form.php (modified) (1 diff)
• Common/Form/Types/File.php (modified) (5 diffs)
• Common/Form/Types/File/FileDownload.php (modified) (1 diff)
• Common/Form/Types/FileContent.php (deleted)
• Common/Form/Types/OneToMany.php (modified) (1 diff)
• Common/Form/Types/Type.php (modified) (2 diffs)
• Common/Version.php (modified) (1 diff)
• Modules/FinanceBankAPI/FileImport.php (modified) (3 diffs)
• Modules/FinanceBankAPI/FinanceBankAPI.php (modified) (2 diffs)
• Modules/FinanceBankAPI/ImportFio.php (added)
• Modules/FinanceBankAPI/ImportPS.php (added)
• Modules/IS/IS.php (modified) (1 diff)
• admin/Updates.php (modified) (2 diffs)
• form_classes.php (modified) (3 diffs)

trunk/Common/Form/Form.php

@@ -83 +83 @@
     if(!array_key_exists($Item['Type'], $this->FormManager->FormTypes) or 
     (array_key_exists($Item['Type'], $this->FormManager->FormTypes) and 
-    ($$this->FormManager->FormTypes[$Item['Type']]['Type'] != 'ManyToOne')))
+    ($this->FormManager->FormTypes[$Item['Type']]['Type'] != 'ManyToOne')))
     {
       if(!array_key_exists($Index, $this->Values) and isset($Item['Default'])) $this->Values[$Index] = $Item['Default']; 

trunk/Common/Form/Types/File.php

@@ -1 +1 @@
 <?php
+
+class DbFile
+{
+  var $Id;
+  var $FileName;
+  var $Size;
+  var $Directory;
+  var $DirectoryId;
+  var $TempName;
+  
+  function DetectMimeType()
+  {
+    // For proper mime-type detection php-pecl-Fileinfo package should be installed on *nix systems
+    $FileInfo = new finfo(FILEINFO_MIME, '/usr/share/misc/magic');
+    $Result = $FileInfo->file($FileName);
+    //$FileInfo->close();
+    return($Result);
+  }
+  
+  function GetSize($Item)
+  {
+    $FileName = $this->GetFullName($Item);
+    if(file_exists($FileName)) $Result = filesize($FileName);
+      else $Result = 0;
+    return($Result); 
+  }
+  
+  function GetFullName()
+  {
+    $ParentId = $this->Directory;
+    while($ParenId != null)
+    {
+      $DbResult = $this->Database->select('FileDirectory', '*', 'Id='.$ParentId);
+      $DbRow = $DbResult->fetch_assoc();
+      $Path .= $DbRow['Name'].'/';
+      $ParentId = $DbRow['Parent'];
+    }     
+    $Result = $this->UploadFileFolder.'/'.$Path.$File->Name;
+    return($Result);
+  }
+  
+  function GetExt()
+  {
+    return(substr($this->Name, 0, strpos($this->Name, '.') - 1));
+  }
+  
+  function Delete()
+  {
+    if(file_exists($this->GetFullName())) unlink($this->GetFullName());
+  }
+  
+  function GetContent()
+  {
+    if($this->TempName != '') $Content = file_get_contents($this->TempName);
+      else $Content = file_get_contents($this->GetFullName());
+    return($Content);
+  }
+}
 
 class TypeFile extends TypeBase
@@ -7 +65 @@
   var $DirectoryId;
   
-  function __construct()
+  function __construct($FormManager)
   {
+    parent::__construct($FormManager);
     $this->FileDownloadURL = 'File.php';
     $this->DirectoryId = null;
@@ -15 +74 @@
   function OnView($Item)
   {
-    global $Database;
-
-    $DbResult = $Database->query('SELECT `Name`, `Size` FROM `SystemFile` WHERE `Id`='.$Item['Value']);
-    if($DbResult->num_rows > 0)
-    {
-      $DbRow = $DbResult->fetch_assoc();
-      return('<a href="'.$this->FileDownloadURL.'?Id='.$Item['Value'].'">'.$DbRow['Name'].'</a> ('.HumanSize($DbRow['Size']).')');
-    } else return('');
+    $File = &$Item['Value'];
+    return('<a href="'.$this->FileDownloadURL.'?Id='.$File->Id.'">'.
+      $File.'</a> ('.HumanSize($File->Size).')');
   }
 
@@ -30 +84 @@
     // ini_set("upload_max_filesize", "100M");
     // <input type="hidden" name="MAX_FILE_SIZE" value="10000000">
-    $Output = '<input type="file" name="'.$Item['Name'].'" value="">';
+    $File = &$Item['Value'];
+    $Output = '<input type="file" name="'.$Item['Name'].'" value="'.$File->Name.'">';
     return($Output);
   }
@@ -36 +91 @@
   function OnLoad($Item)
   {
-    global $Database, $Config;
-
-    $Result = 0;
-    print_r($_FILES);
-    print_r($_POST);
+    if(!is_object($Item['Value'])) $Item['Value'] = new DbFile();
+    $File = &$Item['Value'];
     if(array_key_exists($Item['Name'], $_FILES) and ($_FILES[$Item['Name']]['name'] != ''))
     {
-      if(file_exists($_FILES[$Item['Name']]['tmp_name']))
+      $UploadFile = $_FILES[$Item['Name']];
+      if(file_exists($UploadFile['tmp_name']))
       {
-        $FileName = substr($_FILES[$Item['Name']]['name'], strrpos($_FILES[$Item['Name']]['name'], '/'));
-        $Database->insert('File', array('Name' => $FileName, 'Size' => filesize($_FILES[$Item['Name']]['tmp_name']),
-           'Directory' => $this->DirectoryId));
-        $Result = $Database->insert_id;
-        if(!move_uploaded_file($_FILES[$Item['Name']]['tmp_name'], $this->UploadFileFolder.'/'.$Result)) 
-          SystemMessage('Nahrání souboru', 'Cílová složka není dostupná!');
+        $File->Name = $UploadFile['name'];
+        $File->Size = $UploadFile['size']; 
+        $File->TempName = $UploadFile['tmp_name'];
       }
     }
-    return($Result);
+    return($File);
   }
+  
+  function OnLoadDb($Item)
+  {
+    if(!is_object($Item['Value'])) $Item['Value'] = new DbFile();
+    $File = &$Item['Value'];
+    $DbResult = $this->Database->select('File', '*', 'Id='.$File->Id);
+    if($DbResult->num_rows() > 0)
+    {
+      $DbRow = $DbResult->fetch_assoc();
+      $File->Name = $DbRow['Name'];
+      $File->Size = $DbRow['Size'];
+      $File->Directory = $DbRow['Directory'];
+    }
+    return($File);
+  }
+  
+  function OnSaveDb($Item)
+  {
+    if(!is_object($Item['Value'])) $Item['Value'] = new DbFile();
+    $File = &$Item['Value'];
+    $Properties = array('Name' => $File->Name, 
+      'Size' => $File->GetSize(), 'Directory' => $File->Directory);
+    $DbResult = $this->Database->select('File', '*', 'Id='.$File->Id);
+    if($DbResult->num_rows() > 0)
+    {
+      $DbRow = $DbResult->fetch_assoc();
+      if($File->TempName != '') 
+      {
+        $FileName = $File->GetFullName();
+        unlink($FileName);
+      }
+      $this->Database->update('File', 'Id='.$File->Id, $Properties);
+    } else 
+    {
+      $this->Database->insert('File', $Properties);
+      $File->Id = $this->Database->insert_id;
+    }
+    if(!move_uploaded_file($File->TempName, $FileName))
+      SystemMessage('Nahrání souboru', 'Cílová složka není dostupná!');
+  }
+  
 }
 

trunk/Common/Form/Types/File/FileDownload.php

@@ -1 +1 @@
 <?php
 
-// For proper mime-type detection php-pecl-Fileinfo package should be installed on *nix systems
-function DetectMimeType($FileName)
-{
-  $FileInfo = new finfo(FILEINFO_MIME, '/usr/share/misc/magic');
-  $Result = $FileInfo->file($FileName);
-  //$FileInfo->close();
-  return($Result);
-}
 
 chdir('../..');

trunk/Common/Form/Types/OneToMany.php

@@ -7 +7 @@
   function OnView($Item)
   {
-    $Type = $this->System->Type->TypeDefinitionList[$Item['Type']];
+    $Type = $this->FormManager->Type->TypeDefinitionList[$Item['Type']];
     if($Item['Value'] != '')
     {
       if(array_key_exists('View', $Type['Parameters'])) $Table = $Type['Parameters']['View'];
         else $Table = $Type['Parameters']['Table'];
-      $DbResult = $this->System->Database->query('SELECT '.$Type['Parameters']['Name'].
+      $DbResult = $this->Database->query('SELECT '.$Type['Parameters']['Name'].
         ' AS `Name` FROM '.$Table.' WHERE `'.
         $Type['Parameters']['Id'].'`='.$Item['Value']);

trunk/Common/Form/Types/Type.php

@@ -17 +17 @@
 include(dirname(__FILE__).'/Hidden.php');
 include(dirname(__FILE__).'/File.php');
-include(dirname(__FILE__).'/FileContent.php');
 include(dirname(__FILE__).'/GPS.php');
 include(dirname(__FILE__).'/IPv4Address.php');
@@ -53 +52 @@
       'Color' => array('Name' => 'Color', 'Class' => 'Color', 'ParentType' => '', 'Parameters' => array()),
       'RandomHash' => array('Name' => 'RandomHash', 'Class' => 'RandomHash', 'ParentType' => '', 'Parameters' => array()),
-      'FileContent' => array('Name' => 'FileContent', 'Class' => 'FileContent', 'ParentType' => '', 'Parameters' => array()),
     );
   }

trunk/Common/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 501; // Subversion revision
-$DatabaseRevision = 501; 
+$Revision = 502; // Subversion revision
+$DatabaseRevision = 502; 
 $ReleaseTime = '2013-03-10';
 

trunk/Modules/FinanceBankAPI/FileImport.php

@@ -3 +3 @@
 include_once(dirname(__FILE__).'/../../Common/Global.php');
 
-class PageFileImport extends Page
+class FileImport
 {
-  var $FullTitle = 'Import plateb';
-  var $ShortTitle = 'Import plateb';
+  var $Database;
+  var $BankAccountId;
+  
+  function __construct($Database)
+  {
+    $this->Database = &$Database;
+  }
+     
+  function Import()
+  {
+  }
+  
+  function ImportFile($Content, $Ext)
+  {   
+  }
+}
+
+class PageImportAPI extends Page
+{
+  var $FullTitle = 'Import plateb přes API';
+  var $ShortTitle = 'Import plateb přes API';
+
+  function Show()
+  {   
+    if(!$this->System->Modules['User']->CheckPermission('Finance', 'SubjectList')) return('Nemáte oprávnění');
+    
+    $DbResult = $this->Database->select('FinanceBankAccount', '*', 'Id='.$_GET['id']);
+    $BankAccount = $DbResult->fetch_assoc();
+    
+    $DbResult = $this->Database->select('FinanceBank', '*', 'Id='.$BankAccount['Bank']);
+    $Bank = $DbResult->fetch_assoc();
+    $Output .= 'Účet: '.$BankAccount['Number'].'/'.$Bank['Code'].' ('.$Bank['Name'].')';
+    
+    if($Bank['Code'] == '2010') $Import = new ImportFio($this->Database);
+      else if($Bank['Code'] == '0300') $Import = new ImportPS($this->Database);
+      else $Output = $this->SystemMessage('Nepodporované API', 'Pro zvolenou banku není import podporován');
+    $Import->BankAccountId = $BankAccount['Id'];
+    $Output .= $Import->Import();
+   
+    return($Output);
+  }
+}
+  
+class PageImportFile extends Page
+{
+  var $FullTitle = 'Import plateb ze souboru';
+  var $ShortTitle = 'Import plateb ze souboru';
 
   function Show()
@@ -23 +68 @@
   function ShowForm()
   {
-    $FormImport = new Form('ImportBankFile');
-    $FormImport->OnSubmit = '?Operation=prepare';
-    $Output = $FormImport->ShowEditForm();
+    $Form = new Form($this->System->FormManager);
+    $Form->SetClass('ImportBankFile');
+    $Form->OnSubmit = '?Operation=prepare';
+    $Form->Values['BankAccount'] = $_GET['id'];
+    $Output = $Form->ShowEditForm();
     return($Output);
   }
@@ -31 +78 @@
   function Prepare()
   {   
-    $FormImport = new Form('ImportBankFile');
-    $FormImport->LoadValuesFromForm();
-    $Output = $FormImport->ShowEditForm();
+    $Form = new Form($this->System->FormManager);
+    $Form->SetClass('ImportBankFile');
+    $Form->LoadValuesFromForm();
+    $File = $Form->Values['File'];
+    $Output = $File->Name.'<br/>';
+    $Output .= $File->GetFullName().'<br/>';
+
+    $DbResult = $this->Database->select('FinanceBankAccount', '*', 'Id='.$Form->Values['BankAccount']);
+    $BankAccount = $DbResult->fetch_assoc();
     
-    $Finance = $this->System->Modules['Finance'];
-    $Output = $FormImport->Values['File'];
-    return($Output);
+    $DbResult = $this->Database->select('FinanceBank', '*', 'Id='.$BankAccount['Bank']);
+    $Bank = $DbResult->fetch_assoc();
+    $Output .= 'Účet: '.$BankAccount['Number'].'/'.$Bank['Code'].' ('.$Bank['Name'].')';
     
-    $Data =  $FormImport->Values['File'];
-    foreach($Data as $Key => $Value)
-    {
-      $Value = str_replace('\"', '"', $Value);
-      $Data[$Key] = str_getcsv($Value, ',', '"', "\\");
-      //print_r($Data[$Key]);
-      foreach($Data[$Key] as $Key2 => $Value2)
-      {
-        if(substr($Data[$Key][$Key2], 0, 2) == '\"')
-          $Data[$Key][$Key2] = substr($Data[$Key][$Key2], 2, -2); 
-      }
-    }
-    $Header = array(
-      0 => 'datum zaúčtování',         
-      1 => 'částka',
-      2 => 'měna',
-      3 => 'zůstatek',
-      4 => 'konstantní symbol',
-      5 => 'variabilní symbol',
-      6 => 'specifický symbol',
-      7 => 'označení operace',
-      8 => 'název protiúčtu',
-      9 => 'protiúčet',
-      10 => 'poznámka',
-      11 => '',
-    );
-    //print_r($Header);
-    //print_r($Data[0]);
-    //print_r($_POST['Source']);
-    //print_r($Data);
-  
-    if($Header != $Data[0]) $Output = 'Nekompatibilní struktura CSV';
-    else 
-    {
-      array_shift($Data);
-      $Automatic = '';
-      $Manual = '';
-      $Output = '<form action="?Operation=insert" method="post">';
-      $I = 0;
-      foreach($Data as $Key => $Value)
-      {
-        if(count($Value) <= 1) continue;
-        if($Value[9] == '') $Value[5] = 128; // Žádný účet => Poštovní spořitelna
-        $Time = explode('.', $Value[0]);
-        $Time = $Time[2].'-'.$Time[1].'-'.$Time[0];
-        $Money = $Value[1];
-        if(is_numeric($Value[5]))
-        {
-          $Subject = $Value[5] * 1;
-          $DbResult = $this->Database->query('SELECT Id FROM Subject WHERE Id='.$this->Database->real_escape_string($Subject));
-          if($DbResult->num_rows == 0) $Subject = '? ('.($Value[5] * 1).')';
-        } else
-        {
-          $Subject = '? ('.$Value[5].')';
-        }
-        if(!is_numeric($Subject)) 
-        {
-          $Mode = 'Ručně';
-          $Style = 'style="background-color: LightPink;" ';
-        } else 
-        {
-          $Mode = 'Automaticky';
-          $Style = '';
-        }
-    
-        if($Money < 0) $Text = 'Platba převodem';
-          else $Text = 'Přijatá platba';
-        $Automatic .= '<tr>'.
-            //'<td>'.$Mode.'</td>'.
-            '<td><input type="text" name="Date'.$I.'" value="'.$Time.'"/></td>'.
-            '<td><input type="text" '.$Style.'name="Subject'.$I.'" value="'.$Subject.'"/></td>'.
-            '<td>'.$Value[8].'</td>'.
-            '<td><input type="text" name="Money'.$I.'" value="'.$Money.'"/></td>'.
-            '<td><input type="text" name="Text'.$I.'" value="'.$Text.'"/></td>'.
-            '<td><input type="text" name="Taxable'.$I.'" value="1"/></td>'.
-            '<td><input type="text" name="Network'.$I.'" value="1"/></td>'.
-            '</tr><tr><td colspan="7">'.implode(', ', $Value).'</td></tr>'; 
-        $I++;
-      }
-      $Output .= '<table class="WideTable">'.
-        '<tr>'.
-        //'<th>Zpracování</th>'.
-        '<th>Datum</th><th>Var. symbol</th><th>Protiúčet</th><th>Částka [Kč]</th><th>Text</th><th>Zdanitelné</th><th>Síť</th></tr>';
-      $Output .= $Automatic.'</table>';
-      $Output .= '<input type="hidden" name="ItemCount" value="'.$I.'"/>'; 
-      $Output .= '<input type="submit" value="Zpracovat"/></form>';      
-    }
+    if($Bank['Code'] == '2010') $Import = new ImportFio($this->Database);
+      else if($Bank['Code'] == '0300') $Import = new ImportPS($this->Database);
+      else $Output = $this->SystemMessage('Nepodporované API', 'Pro zvolenou banku není import podporován');
+    $Import->BankAccountId = $BankAccount['Id'];
+    $Output .= $Import->ImportFile($File->GetContent(), $File->GetExt());
+   
     return($Output);
   }

trunk/Modules/FinanceBankAPI/FinanceBankAPI.php

@@ -2 +2 @@
 
 include_once(dirname(__FILE__).'/FileImport.php');
+include_once(dirname(__FILE__).'/ImportPS.php');
+include_once(dirname(__FILE__).'/ImportFio.php');
 
 class ModuleFinanceBankAPI extends AppModule
@@ -27 +29 @@
   {
     parent::Start();
-    $this->System->RegisterPage('finance', array('import' => 'PageFileImport'));
+    $FormClass = array(
+      'Title' => 'Import souborů s platbami',
+      'Table' => 'FinanceBank',
+      'SubmitText' => 'Načíst',
+      'Items' => array(
+        'BankAccount' => array('Type' => 'TBankAccount', 'Caption' => 'Bankovní účet', 'Default' => ''),
+        'File' => array('Type' => 'File', 'Caption' => 'Soubor', 'Default' => ''),
+      ),
+    );
+    $this->System->FormManager->RegisterClass('ImportBankFile', $FormClass);
+    $this->System->RegisterPage('finance', array('import-api' => 'PageImportAPI',
+      'import-soubor' => 'PageImportFile'));
   }  
   

trunk/Modules/IS/IS.php

@@ -167 +167 @@
    
     foreach($FormClass['Items'] as $ItemIndex => $FormItem)
-    if(!array_key_exists($FormItem['Type'], $this->System->FormManager->Type) or 
+    if(!array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) or 
       (array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) and 
       ($this->System->FormManager->FormTypes[$FormItem['Type']]['Type'] != 'ManyToOne')))
+    {
       $TableColumns[] = array('Name' => $ItemIndex, 'Title' => $FormItem['Caption']);
+    }    
     $TableColumns[] = array('Name' => '', 'Title' => 'Akce');
     if(!array_key_exists('DefaultSortColumn', $FormClass))

trunk/admin/Updates.php

@@ -142 +142 @@
 }
 
+function UpdateTo502($Manager)
+{
+  $Manager->Execute("ALTER TABLE `FinanceBankAccount` ADD `LoginName` VARCHAR( 255 ) NOT NULL ");
+  $Manager->Execute("ALTER TABLE `FinanceBankAccount` ADD `LoginPassword` VARCHAR( 255 ) NOT NULL");
+  $Manager->Execute("ALTER TABLE `FinanceBankAccount` ADD `Currency` INT NOT NULL AFTER `Use` ,".
+    "ADD INDEX ( `Currency` ) ");
+  $Manager->Execute("INSERT INTO `ISMenuItem` (`Id` ,`Name` ,`Parent` ,`Table` ,`IconName`) ".
+    "VALUES (NULL , 'Banka', '2', '', '');");
+  $Manager->Execute("UPDATE `ISMenuItem` SET `Parent` = '51' WHERE `ISMenuItem`.`Id` =10; ".
+    "UPDATE `ISMenuItem` SET `Parent` = '51' WHERE `ISMenuItem`.`Id` =48;".
+    "UPDATE `ISMenuItem` SET `Parent` = '51' WHERE `ISMenuItem`.`Id` =50;");
+}
+
 $Updates = array(
         491 => array('Revision' => 493, 'Function' => 'UpdateTo493'),
@@ -150 +163 @@
   498 => array('Revision' => 499, 'Function' => 'UpdateTo499'),
   499 => array('Revision' => 500, 'Function' => 'UpdateTo500'),
+  500 => array('Revision' => 502, 'Function' => 'UpdateTo502'),
 );
 

trunk/form_classes.php

@@ -19 +19 @@
 {
   $FormManager->Classes = array(
-  'ImportBankFile' => array(
-    'Title' => 'Import souborů s platbami',
-    'Table' => 'FinanceBank',
-    'SubmitText' => 'Načíst',
-    'Items' => array(
-      'BankAccount' => array('Type' => 'TBankAccount', 'Caption' => 'Bankovní účet', 'Default' => ''),
-      'File' => array('Type' => 'File', 'Caption' => 'Soubor', 'Default' => ''),
-    )
-   ),        
   'FinanceBank' => array(
     'Title' => 'Banky',
@@ -493 +484 @@
       'TimeCreate' => array('Type' => 'Date', 'Caption' => 'Čas vytvoření', 'Default' => ''),
       'TimeEnd' => array('Type' => 'Date', 'Caption' => 'Čas zrušení', 'Default' => ''),
+      'Currency' => array('Type' => 'TCurrency', 'Caption' => 'Měna', 'Default' => ''),
+      'LoginName' => array('Type' => 'String', 'Caption' => 'Přihlašovací jméno / token', 'Default' => ''),
+      'LoginPassword' => array('Type' => 'String', 'Caption' => 'Přihlašovací heslo', 'Default' => ''),
       'Operations' => array('Type' => 'TFinanceOperationListAccount', 'Caption' => 'Operace', 'Default' => ''),
+    ),
+    'ItemActions' => array(
+      array('Caption' => 'Import plateb z banky', 'URL' => '/finance/import-api/?'),
+      array('Caption' => 'Import plateb ze souboru', 'URL' => '/finance/import-soubor/?'),
     ),
   ),
@@ -931 +929 @@
     'Table' => 'FinanceBankAccount',
     'Id' => 'Id',
-    'Name' => 'CONCAT(Comment, " (", Number, ")")',
+    'Name' => 'CONCAT(`Comment`, " (", `Number`, "/", '. 
+      '(SELECT `FinanceBank`.`Code` FROM `FinanceBank` WHERE `FinanceBank`.`Id`=`FinanceBankAccount`.`Bank`), ")")',
     'Filter' => '1',
   ),