kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-19 02:45:58 +00:00
Code Issues Projects Releases Wiki Activity

Fix #672

Browse Source
This commit is contained in:
James Cole
2017-06-12 17:21:31 +02:00
parent 902ae3f0cf
commit 8beab5f5bc
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/Transaction/SingleController.php
View File

@@ -93,7 +93,9 @@ class SingleController extends Controller
$category = $journal->categories()->first(); $category = $journal->categories()->first();
$categoryName = is_null($category) ? '' : $category->name; $categoryName = is_null($category) ? '' : $category->name;
$tags = join(',', $journal->tags()->get()->pluck('tag')->toArray()); $tags = join(',', $journal->tags()->get()->pluck('tag')->toArray());
$transaction = $journal->transactions()->first();
$amount = Steam::positive($transaction->amount);
$foreignAmount = is_null($transaction->foreign_amount) ? null : Steam::positive($transaction->foreign_amount);
$preFilled = [ $preFilled = [
'description' => $journal->description, 'description' => $journal->description,
@@ -101,7 +103,10 @@ class SingleController extends Controller
'source_account_name' => $source->name, 'source_account_name' => $source->name,
'destination_account_id' => $destination->id, 'destination_account_id' => $destination->id,
'destination_account_name' => $destination->name, 'destination_account_name' => $destination->name,
'amount' => $journal->amountPositive(), 'amount' => $amount,
'source_amount' => $amount,
'destination_amount' => $foreignAmount,
'foreign_amount' => $foreignAmount,
'date' => $journal->date->format('Y-m-d'), 'date' => $journal->date->format('Y-m-d'),
'budget_id' => $budgetId, 'budget_id' => $budgetId,
'category' => $categoryName, 'category' => $categoryName,