Changeset 764

Timestamp:

Nov 5, 2015, 11:19:31 PM (9 years ago)

Author:

chronos

Message:

• Fixed: Import from bank account API.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Modules/FinanceBankAPI/FileImport.php (modified) (2 diffs)
• Modules/FinanceBankAPI/FinanceBankAPI.php (modified) (1 diff)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 763; // Subversion revision
+$Revision = 764; // Subversion revision
 $DatabaseRevision = 763; // SQL structure revision
 $ReleaseTime = strtotime('2015-11-05');

trunk/Modules/FinanceBankAPI/FileImport.php

@@ -69 +69 @@
   var $ParentClass = 'PageFinance';
 
-  function Show()
+  function Import($Id)
   {
     $Output = '';
-    if(!$this->System->User->CheckPermission('Finance', 'SubjectList')) return('Nemáte oprávnění');
 
-    $DbResult = $this->Database->select('FinanceBankAccount', '*', 'Id='.$_GET['i']);
+    $DbResult = $this->Database->select('FinanceBankAccount', '*', 'Id='.$Id);
     $BankAccount = $DbResult->fetch_assoc();
 
@@ -90 +89 @@
       $Import->PairOperations();
     }
+    return($Output);
+  }
+
+  function Show()
+  {
+    if(!$this->System->User->CheckPermission('Finance', 'SubjectList'))
+      return('Nemáte oprávnění');
+
+    $Output = $this->Import($_GET['i']);
     return($Output);
   }

trunk/Modules/FinanceBankAPI/FinanceBankAPI.php

@@ -101 +101 @@
   {
     $Output = '';
-    $DbResult = $this->Database->select('FinanceBankAccount', 'Id, Comment',
-      '(`AutoImport`=1) AND ((`TimeEnd` IS NULL) OR (`TimeEnd` > NOW()))');
+    $DbResult = $this->Database->select('FinanceBankAccount', '`Id`, `Comment`',
+      '(`AutoImport`=1) AND (`TimeCreate` < NOW()) AND '.
+      '((`TimeEnd` IS NULL) OR (`TimeEnd` > NOW()))');
     while($DbRow = $DbResult->fetch_assoc())
     {
       echo($DbRow['Comment']."\n");
       $Page = new PageImportAPI($this->System);
-      $Output .= $Page->Show();
+      $Output .= $Page->Import($DbRow['Id']);
     }
     return($Output);