kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Finalise account tests

Browse Source
This commit is contained in:
James Cole
2019-06-23 05:53:01 +02:00
parent 311659ba0d
commit 9f50c5db3d
25 changed files with 470 additions and 841 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -230,6 +230,7 @@ class AccountRepository implements AccountRepositoryInterface
if (count($accountIds) > 0) {
$query->whereIn('accounts.id', $accountIds);
}
$query->orderBy('accounts.active', 'DESC');
$query->orderBy('accounts.name', 'ASC');
$result = $query->get(['accounts.*']);
@@ -249,6 +250,7 @@ class AccountRepository implements AccountRepositoryInterface
if (count($types) > 0) {
$query->accountTypeIn($types);
}
$query->orderBy('accounts.active', 'DESC');
$query->orderBy('accounts.name', 'ASC');
$result = $query->get(['accounts.*']);

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

@@ -688,18 +688,14 @@ class JournalRepository implements JournalRepositoryInterface
/**
* @param int $transactionId
*
* @return bool
*/
public function reconcileById(int $transactionId): bool
public function reconcileById(int $journalId): void
{
/** @var Transaction $transaction */
$transaction = $this->user->transactions()->find($transactionId);
if (null !== $transaction) {
return $this->reconcile($transaction);
/** @var TransactionJournal $journal */
$journal = $this->user->transactionJournals()->find($journalId);
if (null !== $journal) {
$journal->transactions()->update(['reconciled' => true]);
}
return false;
}
/**

6
app/Repositories/Journal/JournalRepositoryInterface.php
View File

@@ -309,11 +309,9 @@ interface JournalRepositoryInterface
public function reconcile(Transaction $transaction): bool;
/**
* @param int $transactionId
*
* @return bool
* @param int $journalId
*/
public function reconcileById(int $transactionId): bool;
public function reconcileById(int $journalId): void;
/**
* @param TransactionJournal $journal