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

Small check in tags.

Browse Source
This commit is contained in:
James Cole
2015-04-28 14:08:58 +02:00
parent 3f62b647fc
commit 0683c87e52
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,7 @@ class JournalRepository implements JournalRepositoryInterface
* *
* @param TransactionJournal $journal * @param TransactionJournal $journal
* *
* @return mixed * @return int
*/ */
public function getAssetAccount(TransactionJournal $journal) public function getAssetAccount(TransactionJournal $journal)
{ {
@@ -135,7 +135,19 @@ class JournalRepository implements JournalRepositoryInterface
// only if this is a deposit. // only if this is a deposit.
if ($journal->transaction_type_id == $deposit->id) { if ($journal->transaction_type_id == $deposit->id) {
$journal->tags()->save($tag);
// if this is a deposit, account must match the current only journal
// (if already present):
$currentWithdrawal = $tag->transactionjournals()->where('transaction_type_id', $withdrawal->id)->first();
if ($currentWithdrawal && $this->getAssetAccount($currentWithdrawal) == $this->getAssetAccount($journal)) {
$journal->tags()->save($tag);
} else {
if (is_null($currentWithdrawal)) {
$journal->tags()->save($tag);
}
}
} }
} }
@@ -165,10 +177,6 @@ class JournalRepository implements JournalRepositoryInterface
); );
$journal->save(); $journal->save();
if (isset($data['tags']) && is_array($data['tags'])) {
$this->saveTags($journal, $data['tags']);
}
// store or get category // store or get category
if (strlen($data['category']) > 0) { if (strlen($data['category']) > 0) {
@@ -203,6 +211,11 @@ class JournalRepository implements JournalRepositoryInterface
$journal->completed = 1; $journal->completed = 1;
$journal->save(); $journal->save();
// store tags
if (isset($data['tags']) && is_array($data['tags'])) {
$this->saveTags($journal, $data['tags']);
}
return $journal; return $journal;