kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-16 09:22:33 +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

17
app/Http/Controllers/TransactionController.php
View File

@@ -22,6 +22,7 @@ use FireflyIII\Http\Requests\MassDeleteJournalRequest;
use FireflyIII\Http\Requests\MassEditJournalRequest;
use FireflyIII\Models\PiggyBank;
use FireflyIII\Models\PiggyBankEvent;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
@@ -408,7 +409,7 @@ class TransactionController extends Controller
*
* @return \Illuminate\View\View
*/
public function show(TransactionJournal $journal)
public function show(TransactionJournal $journal, JournalRepositoryInterface $repository)
{
/** @var Collection $set */
@@ -420,11 +421,21 @@ class TransactionController extends Controller
);
// TODO different for each transaction type!
/** @var Collection $transactions */
$transactions = $journal->transactions()->groupBy('transactions.account_id')->orderBy('amount', 'ASC')->get(
['transactions.*', DB::raw('SUM(`transactions`.`amount`) as `sum`')]
);
$what = strtolower($journal->transaction_type_type ?? $journal->transactionType->type);
$subTitle = trans('firefly.' . $what) . ' "' . e($journal->description) . '"';
// foreach do balance thing
$transactions->each(
function (Transaction $t) use ($repository) {
$t->before = $repository->balanceBeforeTransaction($t);
}
);
$what = strtolower($journal->transaction_type_type ?? $journal->transactionType->type);
$subTitle = trans('firefly.' . $what) . ' "' . e($journal->description) . '"';
return view('transactions.show', compact('journal', 'events', 'subTitle', 'what', 'transactions'));
}