Changeset 551 for trunk/Modules/FinanceBankAPI

Timestamp:

Jul 7, 2013, 9:26:44 PM (11 years ago)

Author:

chronos

Message:

• Přidáno: Automatické generování kódu dokladu při vytváření nové položky v IS a při importu z Fio banky.
• Odstraněno: Staré akce na stránce "Správa financí".

Location:

trunk/Modules/FinanceBankAPI

Files:

• FileImport.php (modified) (5 diffs)
• ImportFio.php (modified) (1 diff)

trunk/Modules/FinanceBankAPI/FileImport.php

@@ -5 +5 @@
 class BankImport
 {
+  var $System;
   var $Database;
   var $BankAccount;
   
-  function __construct($Database)
+  function __construct($System)
   {
-    $this->Database = &$Database;
+    $this->Database = &$System->Database;
+    $this->System = &$System;
   }
      
@@ -26 +28 @@
     while($DbRow = $DbResult->fetch_assoc())
     {
+      echo($DbRow['Id'].',');
       if(is_numeric($DbRow['VariableSymbol']))
       {
@@ -32 +35 @@
         { 
           $DbRow2 = $DbResult2->fetch_assoc();
+          if($DbRow['Value'] >= 0) $DocumentLine = 3; // Receive money
+            else $DocumentLine = 4; // Send money
+          $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumber($DocumentLine);
           $DbResult3 = $this->Database->insert('FinanceOperation', array('Subject' => $DbRow2['Id'], 'Cash' => 0, 
             'Value' => $DbRow['Value'], 'Taxable' => 1, 'BankAccount' => $DbRow['BankAccount'], 'Network' => 1,
-            'Time' => $DbRow['Time'], 'Text' => $DbRow['Description']));
+            'Time' => $DbRow['Time'], 'Text' => $DbRow['Description'], 'BillCode' => $BillCode));
           $this->Database->update('FinanceBankImport', 'Id='.$DbRow['Id'], array('FinanceOperation' => $this->Database->insert_id));
         }
@@ -60 +66 @@
     $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);
+    if($Bank['Code'] == '2010') $Import = new ImportFio($this->System);
+      else if($Bank['Code'] == '0300') $Import = new ImportPS($this->System);
       else $Output = $this->SystemMessage('Nepodporované API', 'Pro zvolenou banku není import podporován');
     if(isset($Import))
@@ -118 +124 @@
     $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);
+    if($Bank['Code'] == '2010') $Import = new ImportFio($this->System);
+      else if($Bank['Code'] == '0300') $Import = new ImportPS($this->System);
       else $Output = $this->SystemMessage('Nepodporované API', 'Pro zvolenou banku není import podporován');
     $Import->BankAccount = $BankAccount;

trunk/Modules/FinanceBankAPI/ImportFio.php

@@ -43 +43 @@
     }
     $Output .= '</table>';   
-    $this->Database->Update('FinanceBankAccount', 'Id='.$this->BankAccount['Id'], array('LastImportDate' => TimeToMysqlDate($PeriodEnd)));
+    $this->Database->update('FinanceBankAccount', 'Id='.$this->BankAccount['Id'], array('LastImportDate' => TimeToMysqlDate($PeriodEnd)));
     return($Output);
   }