Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

OFX fixes

Browse Source
This commit is contained in:
Hillel Coren 2017-07-10 21:03:35 +03:00
parent d02e99fac9
commit 00618e6c4d
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Libraries/OFX.php
View File

@ -35,7 +35,7 @@ class OFX
$this->response = curl_exec($c); $this->response = curl_exec($c);
if (Utils::isNinjaDev()) { if (Utils::isNinjaDev()) {
Log::info(print_r($this->response, true)); //Log::info(print_r($this->response, true));
} }
curl_close($c); curl_close($c);

11
app/Services/BankAccountService.php
View File

@ -117,6 +117,9 @@ class BankAccountService extends BaseService
foreach ($finance->banks as $bank) { foreach ($finance->banks as $bank) {
foreach ($bank->logins as $login) { foreach ($bank->logins as $login) {
$login->setup(); $login->setup();
if (! is_array($login->accounts)) {
return false;
}
foreach ($login->accounts as $account) { foreach ($login->accounts as $account) {
$account->setup($includeTransactions); $account->setup($includeTransactions);
if ($account = $this->parseBankAccount($account, $bankAccounts, $expenses, $includeTransactions, $vendorMap)) { if ($account = $this->parseBankAccount($account, $bankAccounts, $expenses, $includeTransactions, $vendorMap)) {
@ -128,6 +131,7 @@ class BankAccountService extends BaseService
return $data; return $data;
} catch (\Exception $e) { } catch (\Exception $e) {
Utils::logError($e);
return false; return false;
} }
} }
@ -183,11 +187,12 @@ class BankAccountService extends BaseService
$ofxParser = new \OfxParser\Parser(); $ofxParser = new \OfxParser\Parser();
$ofx = $ofxParser->loadFromString($data); $ofx = $ofxParser->loadFromString($data);
$account->start_date = $ofx->BankAccount->Statement->startDate; $bankAccount = reset($ofx->bankAccounts);
$account->end_date = $ofx->BankAccount->Statement->endDate; $account->start_date = $bankAccount->statement->startDate;
$account->end_date = $bankAccount->statement->endDate;
$account->transactions = []; $account->transactions = [];
foreach ($ofx->BankAccount->Statement->transactions as $transaction) { foreach ($bankAccount->statement->transactions as $transaction) {
// ensure transactions aren't imported as expenses twice // ensure transactions aren't imported as expenses twice
if (isset($expenses[$transaction->uniqueId])) { if (isset($expenses[$transaction->uniqueId])) {
continue; continue;

6
resources/views/accounts/bank_account.blade.php
View File

@ -7,7 +7,7 @@
<style type="text/css"> <style type="text/css">
table.accounts-table > thead > tr > th.header { table.accounts-table > thead > tr > th.header {
background-color: #e37329 !important; background-color: #777 !important;
color:#fff !important; color:#fff !important;
padding-top:8px; padding-top:8px;
} }
@ -80,8 +80,8 @@
<div class="col-lg-12 col-sm-12" data-bind="visible: page() == 'import'" style="display:none"> <div class="col-lg-12 col-sm-12" data-bind="visible: page() == 'import'" style="display:none">
<div class="row panel"> <div class="row panel" style="padding-top:10px;padding-bottom:12px;">
<div class="col-md-8" style="height:60px;padding-top:10px;"> <div class="col-md-8" style="padding-top:10px;">
<span data-bind="text: statusLabel"></span> <span data-bind="text: statusLabel"></span>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">