kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-14 16:13:54 +00:00
Code Issues Projects Releases Wiki Activity

Fix some minor scrutinizer issues.

Browse Source
This commit is contained in:
James Cole
2016-11-28 20:38:03 +01:00
parent a6a2c0c182
commit b33aa733c7
12 changed files with 23 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Models/Account.php
View File

@@ -199,8 +199,7 @@ class Account extends Model
*/
public function getOpeningBalanceAmount(): string
{
$journal = TransactionJournal
::sortCorrectly()
$journal = TransactionJournal::sortCorrectly()
->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->where('transactions.account_id', $this->id)
->transactionTypes([TransactionType::OPENING_BALANCE])
@@ -230,8 +229,7 @@ class Account extends Model
public function getOpeningBalanceDate(): Carbon
{
$date = new Carbon('1900-01-01');
$journal = TransactionJournal
::sortCorrectly()
$journal = TransactionJournal::sortCorrectly()
->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->where('transactions.account_id', $this->id)
->transactionTypes([TransactionType::OPENING_BALANCE])

3
app/Models/TransactionJournal.php
View File

@@ -64,8 +64,7 @@ class TransactionJournal extends TransactionJournalSupport
public static function routeBinder($value)
{
if (auth()->check()) {
$object = TransactionJournal
::where('transaction_journals.id', $value)
$object = TransactionJournal::where('transaction_journals.id', $value)
->with('transactionType')
->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
->where('user_id', auth()->user()->id)->first(['transaction_journals.*']);