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

Fix bill overview.

Browse Source
This commit is contained in:
James Cole 2016-03-02 12:47:15 +01:00
parent 1ac64fd0b3
commit 6b277c5e67
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Models/TransactionJournal.php
View File

@ -92,6 +92,8 @@ class TransactionJournal extends Model
'date' => 'required|date', 'date' => 'required|date',
'encrypted' => 'required|boolean', 'encrypted' => 'required|boolean',
]; ];
/** @var bool */
private $joinedTypes = false;
/** /**
* @param $value * @param $value
@ -311,6 +313,7 @@ class TransactionJournal extends Model
{ {
// left join transaction type: // left join transaction type:
$query->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id'); $query->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id');
$this->joinedTypes = true;
// left join transaction currency: // left join transaction currency:
$query->leftJoin('transaction_currencies', 'transaction_currencies.id', '=', 'transaction_journals.transaction_currency_id'); $query->leftJoin('transaction_currencies', 'transaction_currencies.id', '=', 'transaction_journals.transaction_currency_id');
@ -352,6 +355,11 @@ class TransactionJournal extends Model
*/ */
public function scopeTransactionTypes(EloquentBuilder $query, array $types) public function scopeTransactionTypes(EloquentBuilder $query, array $types)
{ {
if (!$this->joinedTypes) {
$query->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id');
$this->joinedTypes = true;
}
$query->whereIn('transaction_types.type', $types); $query->whereIn('transaction_types.type', $types);
} }

1
app/Repositories/Account/AccountRepository.php
View File

@ -345,6 +345,7 @@ class AccountRepository implements AccountRepositoryInterface
::orderBy('transaction_journals.date', 'ASC') ::orderBy('transaction_journals.date', 'ASC')
->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->where('transactions.account_id', $account->id) ->where('transactions.account_id', $account->id)
->transactionTypes([TransactionType::OPENING_BALANCE]) ->transactionTypes([TransactionType::OPENING_BALANCE])
->orderBy('created_at', 'ASC') ->orderBy('created_at', 'ASC')
->first(['transaction_journals.*']); ->first(['transaction_journals.*']);

18
app/Repositories/Bill/BillRepository.php
View File

@ -280,16 +280,11 @@ class BillRepository implements BillRepositoryInterface
public function getJournals(Bill $bill): Collection public function getJournals(Bill $bill): Collection
{ {
$set = $bill->transactionjournals() $set = $bill->transactionjournals()
->leftJoin( ->expanded()
'transactions', function (JoinClause $join) {
$join->on('transactions.transaction_journal_id', '=', 'transaction_journals.id')
->where('amount', '<', 0);
}
)
->orderBy('transaction_journals.date', 'DESC') ->orderBy('transaction_journals.date', 'DESC')
->orderBy('transaction_journals.order', 'ASC') ->orderBy('transaction_journals.order', 'ASC')
->orderBy('transaction_journals.id', 'DESC') ->orderBy('transaction_journals.id', 'DESC')
->get(['transaction_journals.*', 'transactions.amount as journalAmount']); ->get(TransactionJournal::QUERYFIELDS);
return $set; return $set;
} }
@ -448,6 +443,11 @@ class BillRepository implements BillRepositoryInterface
*/ */
public function scan(Bill $bill, TransactionJournal $journal): bool public function scan(Bill $bill, TransactionJournal $journal): bool
{ {
// grab the expanded info for this journal.
// looks weird, but is useful:
/** @var TransactionJournal $journal */
$journal = TransactionJournal::expanded()->where('transaction_journals.id', $journal->id)->get(TransactionJournal::QUERYFIELDS)->first();
/* /*
* Can only support withdrawals. * Can only support withdrawals.
@ -457,9 +457,9 @@ class BillRepository implements BillRepositoryInterface
} }
$matches = explode(',', $bill->match); $matches = explode(',', $bill->match);
$description = strtolower($journal->description) . ' ' . strtolower($journal->destination_account->name); $description = strtolower($journal->description) . ' ' . strtolower($journal->destination_account_name);
$wordMatch = $this->doWordMatch($matches, $description); $wordMatch = $this->doWordMatch($matches, $description);
$amountMatch = $this->doAmountMatch($journal->amount_positive, $bill->amount_min, $bill->amount_max); $amountMatch = $this->doAmountMatch($journal->destination_amount, $bill->amount_min, $bill->amount_max);
Log::debug('Journal #' . $journal->id . ' has description "' . $description . '"'); Log::debug('Journal #' . $journal->id . ' has description "' . $description . '"');