IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/expand-transaction-view' into develop

Browse Source
This commit is contained in:
Sander Dorigo 2014-10-11 09:54:33 +02:00
commit d40645be68
2 changed files with 53 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/lib/Firefly/Helper/Controllers/Json.php
View File

@ -173,6 +173,7 @@ class Json implements JsonInterface
$to = $entry->transactions[1]->account; $to = $entry->transactions[1]->account;
$budget = $entry->budgets()->first(); $budget = $entry->budgets()->first();
$category = $entry->categories()->first(); $category = $entry->categories()->first();
$recurring = $entry->recurringTransaction()->first();
$arr = [ $arr = [
'date' => $entry->date->format('j F Y'), 'date' => $entry->date->format('j F Y'),
'description' => [ 'description' => [
@ -195,15 +196,20 @@ class Json implements JsonInterface
'delete' => route('transactions.delete', $entry->id) 'delete' => route('transactions.delete', $entry->id)
] ]
]; ];
if($budget) { if ($budget) {
$arr['components']['budget_id'] = $budget->id; $arr['components']['budget_id'] = $budget->id;
$arr['components']['budget_name'] = $budget->name; $arr['components']['budget_name'] = $budget->name;
$arr['components']['budget_url'] = route('budgets.show',$budget->id); $arr['components']['budget_url'] = route('budgets.show', $budget->id);
} }
if($category) { if ($category) {
$arr['components']['category_id'] = $category->id; $arr['components']['category_id'] = $category->id;
$arr['components']['category_name'] = $category->name; $arr['components']['category_name'] = $category->name;
$arr['components']['category_url'] = route('categories.show',$category->id); $arr['components']['category_url'] = route('categories.show', $category->id);
}
if ($recurring) {
$arr['components']['recurring_id'] = $recurring->id;
$arr['components']['recurring_name'] = e($recurring->name);
$arr['components']['recurring_url'] = route('recurring.show', $recurring->id);
} }
$data['data'][] = $arr; $data['data'][] = $arr;
@ -351,8 +357,8 @@ class Json implements JsonInterface
foreach ($set as $entry) { foreach ($set as $entry) {
$data['data'][] = [ $data['data'][] = [
'name' => ['name' => $entry->name,'url' => route('recurring.show',$entry->id)], 'name' => ['name' => $entry->name, 'url' => route('recurring.show', $entry->id)],
'match' => explode(' ',$entry->match), 'match' => explode(' ', $entry->match),
'amount_max' => floatval($entry->amount_max), 'amount_max' => floatval($entry->amount_max),
'amount_min' => floatval($entry->amount_min), 'amount_min' => floatval($entry->amount_min),
'date' => $entry->date->format('j F Y'), 'date' => $entry->date->format('j F Y'),

3
public/assets/javascript/firefly/transactions.js
View File

@ -95,6 +95,9 @@ $(document).ready(function () {
if (data.category_id > 0) { if (data.category_id > 0) {
html += '<a href="' + data.category_url + '" title="' + data.category_name + '"><i class="fa fa-bar-chart fa-fw"></i></a> '; html += '<a href="' + data.category_url + '" title="' + data.category_name + '"><i class="fa fa-bar-chart fa-fw"></i></a> ';
} }
if(data.recurring_id > 0) {
html += '<a href="' + data.recurring_url + '" title="' + data.recurring_name + '"><i class="fa fa-rotate-right fa-fw"></i></a> ';
}
return html; return html;
} }
}, },