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

Fix tests and fix coverage.

Browse Source
This commit is contained in:
James Cole
2015-06-06 15:36:12 +02:00
parent 681167bc1b
commit db020db34b
19 changed files with 381 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -265,7 +265,7 @@ class BillRepository implements BillRepositoryInterface
$amountMatch = false;
$wordMatch = false;
$matches = explode(',', $bill->match);
$description = strtolower($journal->description) . ' ' . strtolower($journal->expense_account->name);
$description = strtolower($journal->description) . ' ' . strtolower($journal->destination_account->name);
$count = 0;
foreach ($matches as $word) {
if (!(strpos($description, strtolower($word)) === false)) {

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

@@ -48,11 +48,6 @@ class JournalRepository implements JournalRepositoryInterface
*/
public function delete(TransactionJournal $journal)
{
// delete transactions first:
/** @var Transaction $transaction */
foreach ($journal->transactions()->get() as $transaction) {
$transaction->delete();
}
$journal->delete();
return true;

2
app/Repositories/Tag/TagRepository.php
View File

@@ -318,7 +318,7 @@ class TagRepository implements TagRepositoryInterface
$match = true;
/** @var TransactionJournal $check */
foreach ($tag->transactionjournals as $check) {
if ($check->asset_account->id != $journal->asset_account->id) {
if ($check->source_account->id != $journal->source_account->id) {
$match = false;
}
}