kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-07 14:41:20 +00:00
Code Issues Projects Releases Wiki Activity

Fixed transactions and attachments.

Browse Source
This commit is contained in:
James Cole
2016-05-13 09:55:06 +02:00
parent 2d8449ed68
commit aa59227786
8 changed files with 130 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/Repositories/Journal/JournalRepository.php
View File

@@ -41,6 +41,44 @@ class JournalRepository implements JournalRepositoryInterface
$this->user = $user;
}
/**
* Returns the amount in the account before the specified transaction took place.
*
* @param Transaction $transaction
*
* @return string
*/
public function balanceBeforeTransaction(Transaction $transaction): string
{
// some dates from journal
$journal = $transaction->transactionJournal;
$query = Transaction::
leftJoin('transaction_journals', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->where('transactions.account_id', $transaction->account_id)
->where('transaction_journals.user_id', $this->user->id)
->where(
function (Builder $q) use ($journal) {
$q->where('transaction_journals.date', '<', $journal->date->format('Y-m-d'));
$q->orWhere(
function (Builder $qq) use ($journal) {
$qq->where('transaction_journals.date', '=', $journal->date->format('Y-m-d'));
$qq->where('transaction_journals.order', '>', $journal->order);
}
);
}
)
->where('transactions.id', '!=', $transaction->id)
->whereNull('transactions.deleted_at')
->whereNull('transaction_journals.deleted_at')
->orderBy('transaction_journals.date', 'DESC')
->orderBy('transaction_journals.order', 'ASC')
->orderBy('transaction_journals.id', 'DESC');
$sum = $query->sum('transactions.amount');
return strval($sum);
}
/**
* @param TransactionJournal $journal
*