kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-16 14:48:11 +00:00
Code Issues Projects Releases Wiki Activity

Some new code, transaction groups among them.

Browse Source
This commit is contained in:
James Cole
2014-11-30 14:52:17 +01:00
parent 3e5f615ffc
commit 0a2cbaa047
13 changed files with 287 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/controllers/TransactionController.php
View File

@@ -2,6 +2,7 @@
use FireflyIII\Exception\FireflyException;
use Illuminate\Support\Collection;
use Illuminate\Support\MessageBag;
/**
@@ -286,10 +287,27 @@ class TransactionController extends BaseController
break;
}
return View::make('transactions.index', compact('subTitle', 'subTitleIcon', 'journals'))->with('what', $what);
return View::make('transactions.index', compact('subTitle', 'what', 'subTitleIcon', 'journals'));
}
public function relate(TransactionJournal $journal)
{
$groups = $journal->transactiongroups()->get();
$members = new Collection;
/** @var TransactionGroup $group */
foreach ($groups as $group) {
/** @var TransactionJournal $jrnl */
foreach ($group->transactionjournals()->get() as $jrnl) {
if ($jrnl->id != $journal->id) {
$members->push($jrnl);
}
}
}
return View::make('transactions.relate', compact('journal', 'members'));
}
/**
* @param TransactionJournal $journal
*
@@ -309,9 +327,18 @@ class TransactionController extends BaseController
$t->after = $t->before + $t->amount;
}
);
$members = new Collection;
/** @var TransactionGroup $group */
foreach($journal->transactiongroups()->get() as $group) {
/** @var TransactionJournal $jrnl */
foreach($group->transactionjournals()->get() as $jrnl) {
if($jrnl->id != $journal->id) {
$members->push($jrnl);
}
}
}
return View::make('transactions.show')->with('journal', $journal)->with(
return View::make('transactions.show', compact('journal', 'members'))->with(
'subTitle', $journal->transactionType->type . ' "' . $journal->description . '"'
);
}