IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Code formatting.

Browse Source
This commit is contained in:
Sander Dorigo 2014-10-27 21:28:15 +01:00
parent b212753633
commit d54832f61f
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/lib/Firefly/Helper/Controllers/Account.php
View File

@ -12,14 +12,17 @@ class Account implements AccountInterface
/** /**
* @param \Account $account * @param \Account $account
*
* @return \TransactionJournal|null * @return \TransactionJournal|null
*/ */
public function openingBalanceTransaction(\Account $account) public function openingBalanceTransaction(\Account $account)
{ {
return \TransactionJournal::withRelevantData() return \TransactionJournal::withRelevantData()
->accountIs($account) ->accountIs($account)
->leftJoin('transaction_types', 'transaction_types.id', '=', ->leftJoin(
'transaction_journals.transaction_type_id') 'transaction_types', 'transaction_types.id', '=',
'transaction_journals.transaction_type_id'
)
->where('transaction_types.type', 'Opening balance') ->where('transaction_types.type', 'Opening balance')
->first(['transaction_journals.*']); ->first(['transaction_journals.*']);
} }
@ -110,17 +113,25 @@ class Account implements AccountInterface
// statistics (transactions) // statistics (transactions)
$trIn = floatval(\Transaction::before($end)->after($start)->accountIs($account)->moreThan(0) $trIn = floatval(
->transactionTypes(['Deposit', 'Withdrawal'])->sum('transactions.amount')); \Transaction::before($end)->after($start)->accountIs($account)->moreThan(0)
$trOut = floatval(\Transaction::before($end)->after($start)->accountIs($account)->lessThan(0) ->transactionTypes(['Deposit', 'Withdrawal'])->sum('transactions.amount')
->transactionTypes(['Deposit', 'Withdrawal'])->sum('transactions.amount')); );
$trOut = floatval(
\Transaction::before($end)->after($start)->accountIs($account)->lessThan(0)
->transactionTypes(['Deposit', 'Withdrawal'])->sum('transactions.amount')
);
$trDiff = $trIn + $trOut; $trDiff = $trIn + $trOut;
// statistics (transfers) // statistics (transfers)
$trfIn = floatval(\Transaction::before($end)->after($start)->accountIs($account)->moreThan(0) $trfIn = floatval(
->transactionTypes(['Transfer'])->sum('transactions.amount')); \Transaction::before($end)->after($start)->accountIs($account)->moreThan(0)
$trfOut = floatval(\Transaction::before($end)->after($start)->accountIs($account)->lessThan(0) ->transactionTypes(['Transfer'])->sum('transactions.amount')
->transactionTypes(['Transfer'])->sum('transactions.amount')); );
$trfOut = floatval(
\Transaction::before($end)->after($start)->accountIs($account)->lessThan(0)
->transactionTypes(['Transfer'])->sum('transactions.amount')
);
$trfDiff = $trfIn + $trfOut; $trfDiff = $trfIn + $trfOut;
$stats['period'] = [ $stats['period'] = [