Changeset 755 for trunk/Modules/FinanceBankAPI

Timestamp:

Oct 25, 2015, 9:51:51 PM (9 years ago)

Author:

chronos

Message:

• Modified: Now IS Dashboard is not dependent on other modules. They need to register their view to IS dashboard.
• Fixed: Wrong sign of created finance operations from bank import.
• Added: Storno invoices now have special groups in FinanceInvoiceGroup table.

Both Storno and previous storned documents should be linked together using new table FinanceInvoiceStorno.
Also they should be marked as not visible to user.

Location:

trunk/Modules/FinanceBankAPI

Files:

• FileImport.php (modified) (1 diff)
• FinanceBankAPI.php (modified) (1 diff)

trunk/Modules/FinanceBankAPI/FileImport.php

@@ -42 +42 @@
           $BillCode = $this->System->Modules['Finance']->GetNextDocumentLineNumberId($FinanceGroup['DocumentLine'], $Year);
           $DbResult3 = $this->Database->insert('FinanceOperation', array('Subject' => $DbRow2['Id'], 'Cash' => 0,
-            'Value' => Abs($DbRow['Value']), 'Taxable' => 1, 'BankAccount' => $DbRow['BankAccount'], 'Network' => 1,
+            'ValueUser' => Abs($DbRow['Value']), 'Taxable' => 1, 'BankAccount' => $DbRow['BankAccount'], 'Network' => 1,
             'Time' => $DbRow['Time'], 'Text' => $DbRow['Description'], 'BillCode' => $BillCode, 'Group' => $FinanceGroup['Id']));
-          $this->Database->update('FinanceBankImport', 'Id='.$DbRow['Id'], array('FinanceOperation' => $this->Database->insert_id));
+          $Id = $this->Database->insert_id;
+          $this->Database->update('FinanceBankImport', 'Id='.$DbRow['Id'], array('FinanceOperation' => $Id));
+
+          // Execute after insert event
+          $Form = new Form($this->System->FormManager);
+          $Form->SetClass('FinanceOperation');
+          $Form->LoadValuesFromDatabase($Id);
+          if(array_key_exists('AfterInsert', $Form->Definition))
+          {
+            $Class = $Form->Definition['AfterInsert'][0];
+            $Method = $Form->Definition['AfterInsert'][1];
+            $Form->Values = $Class->$Method($Form, $Id);
+          }
         }
       }

trunk/Modules/FinanceBankAPI/FinanceBankAPI.php

@@ -60 +60 @@
     $this->System->RegisterPage(array('finance', 'import-api'), 'PageImportAPI');
     $this->System->RegisterPage(array('finance', 'import-soubor'), 'PageImportFile');
+
+    $this->System->ModuleManager->Modules['IS']->RegisterDashboardItem('FinanceBankAPI',
+      array('ModuleFinanceBankAPI', 'ShowDashboardItem'));
   }
 
   function DoStop()
   {
+  }
+
+  function ShowDashboardItem()
+  {
+    $DbResult = $this->Database->select('FinanceBankImport', 'COUNT(*)', '`FinanceOperation` IS NULL');
+    $DbRow = $DbResult->fetch_row();
+    $Output = 'Nezpárovaných plateb: '.$DbRow['0'].'<br/>';
+    return($Output);
   }