kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-16 17:33:45 +00:00
Code Issues Projects Releases Wiki Activity

Fix #4169

Browse Source
This commit is contained in:
James Cole
2020-12-21 06:18:59 +01:00
parent 9971d95605
commit fe66bb1984
11 changed files with 40 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Report/BudgetController.php
View File

@@ -73,6 +73,7 @@ class BudgetController extends Controller
/** /**
* Partial used in the budget report. * Partial used in the budget report.
*
* @param Collection $accounts * @param Collection $accounts
* @param Collection $budgets * @param Collection $budgets
* @param Carbon $start * @param Carbon $start
@@ -93,6 +94,7 @@ class BudgetController extends Controller
$generator->accountPerBudget(); $generator->accountPerBudget();
$report = $generator->getReport(); $report = $generator->getReport();
return view('reports.budget.partials.account-per-budget', compact('report', 'budgets')); return view('reports.budget.partials.account-per-budget', compact('report', 'budgets'));
} }
@@ -268,6 +270,7 @@ class BudgetController extends Controller
$report[$budgetId]['currencies'][$currencyId]['sum_pct'] = $pct; $report[$budgetId]['currencies'][$currencyId]['sum_pct'] = $pct;
} }
} }
return view('reports.budget.partials.budgets', compact('sums', 'report')); return view('reports.budget.partials.budgets', compact('sums', 'report'));
} }
@@ -383,6 +386,7 @@ class BudgetController extends Controller
'amount_float' => (float)$journal['amount'], 'amount_float' => (float)$journal['amount'],
'amount' => $journal['amount'], 'amount' => $journal['amount'],
'date' => $journal['date']->formatLocalized($this->monthAndDayFormat), 'date' => $journal['date']->formatLocalized($this->monthAndDayFormat),
'date_sort' => $journal['date']->format('Y-m-d'),
'destination_account_name' => $journal['destination_account_name'], 'destination_account_name' => $journal['destination_account_name'],
'destination_account_id' => $journal['destination_account_id'], 'destination_account_id' => $journal['destination_account_id'],
'currency_id' => $currency['currency_id'], 'currency_id' => $currency['currency_id'],

3
app/Http/Controllers/Report/CategoryController.php
View File

@@ -59,6 +59,7 @@ class CategoryController extends Controller
function ($request, $next) { function ($request, $next) {
$this->opsRepository = app(OperationsRepositoryInterface::class); $this->opsRepository = app(OperationsRepositoryInterface::class);
$this->noCatRepository = app(NoCategoryRepositoryInterface::class); $this->noCatRepository = app(NoCategoryRepositoryInterface::class);
return $next($request); return $next($request);
} }
); );
@@ -706,6 +707,7 @@ class CategoryController extends Controller
'amount_float' => (float)$journal['amount'], 'amount_float' => (float)$journal['amount'],
'amount' => $journal['amount'], 'amount' => $journal['amount'],
'date' => $journal['date']->formatLocalized($this->monthAndDayFormat), 'date' => $journal['date']->formatLocalized($this->monthAndDayFormat),
'date_sort' => $journal['date']->format('Y-m-d'),
'destination_account_name' => $journal['destination_account_name'], 'destination_account_name' => $journal['destination_account_name'],
'destination_account_id' => $journal['destination_account_id'], 'destination_account_id' => $journal['destination_account_id'],
'currency_id' => $currency['currency_id'], 'currency_id' => $currency['currency_id'],
@@ -755,6 +757,7 @@ class CategoryController extends Controller
'amount_float' => (float)$journal['amount'], 'amount_float' => (float)$journal['amount'],
'amount' => $journal['amount'], 'amount' => $journal['amount'],
'date' => $journal['date']->formatLocalized($this->monthAndDayFormat), 'date' => $journal['date']->formatLocalized($this->monthAndDayFormat),
'date_sort' => $journal['date']->format('Y-m-d'),
'source_account_name' => $journal['source_account_name'], 'source_account_name' => $journal['source_account_name'],
'source_account_id' => $journal['source_account_id'], 'source_account_id' => $journal['source_account_id'],
'currency_id' => $currency['currency_id'], 'currency_id' => $currency['currency_id'],

2
app/Http/Controllers/Report/DoubleController.php
View File

@@ -413,6 +413,7 @@ class DoubleController extends Controller
'amount_float' => (float)$journal['amount'], 'amount_float' => (float)$journal['amount'],
'amount' => $journal['amount'], 'amount' => $journal['amount'],
'date' => $journal['date']->formatLocalized($this->monthAndDayFormat), 'date' => $journal['date']->formatLocalized($this->monthAndDayFormat),
'date_sort' => $journal['date']->format('Y-m-d'),
'destination_account_name' => $journal['destination_account_name'], 'destination_account_name' => $journal['destination_account_name'],
'destination_account_id' => $journal['destination_account_id'], 'destination_account_id' => $journal['destination_account_id'],
'currency_id' => $currency['currency_id'], 'currency_id' => $currency['currency_id'],
@@ -462,6 +463,7 @@ class DoubleController extends Controller
'amount_float' => (float)$journal['amount'], 'amount_float' => (float)$journal['amount'],
'amount' => $journal['amount'], 'amount' => $journal['amount'],
'date' => $journal['date']->formatLocalized($this->monthAndDayFormat), 'date' => $journal['date']->formatLocalized($this->monthAndDayFormat),
'date_sort' => $journal['date']->format('Y-m-d'),
'destination_account_name' => $journal['destination_account_name'], 'destination_account_name' => $journal['destination_account_name'],
'destination_account_id' => $journal['destination_account_id'], 'destination_account_id' => $journal['destination_account_id'],
'currency_id' => $currency['currency_id'], 'currency_id' => $currency['currency_id'],

2
app/Http/Controllers/Report/TagController.php
View File

@@ -499,6 +499,7 @@ class TagController extends Controller
'amount_float' => (float)$journal['amount'], 'amount_float' => (float)$journal['amount'],
'amount' => $journal['amount'], 'amount' => $journal['amount'],
'date' => $journal['date']->formatLocalized($this->monthAndDayFormat), 'date' => $journal['date']->formatLocalized($this->monthAndDayFormat),
'date_sort' => $journal['date']->format('Y-m-d'),
'destination_account_name' => $journal['destination_account_name'], 'destination_account_name' => $journal['destination_account_name'],
'destination_account_id' => $journal['destination_account_id'], 'destination_account_id' => $journal['destination_account_id'],
'currency_id' => $currency['currency_id'], 'currency_id' => $currency['currency_id'],
@@ -548,6 +549,7 @@ class TagController extends Controller
'amount_float' => (float)$journal['amount'], 'amount_float' => (float)$journal['amount'],
'amount' => $journal['amount'], 'amount' => $journal['amount'],
'date' => $journal['date']->formatLocalized($this->monthAndDayFormat), 'date' => $journal['date']->formatLocalized($this->monthAndDayFormat),
'date_sort' => $journal['date']->format('Y-m-d'),
'source_account_name' => $journal['source_account_name'], 'source_account_name' => $journal['source_account_name'],
'source_account_id' => $journal['source_account_id'], 'source_account_id' => $journal['source_account_id'],
'currency_id' => $currency['currency_id'], 'currency_id' => $currency['currency_id'],

2
resources/views/v1/reports/budget/partials/top-expenses.twig
View File

@@ -20,7 +20,7 @@
{{ row.description }} {{ row.description }}
</a> </a>
</td> </td>
<td data-sortable="false"> <td data-value="{{ row.date_sort }}">
{{ row.date }} {{ row.date }}
</td> </td>

2
resources/views/v1/reports/category/partials/top-expenses.twig
View File

@@ -20,7 +20,7 @@
{{ row.description }} {{ row.description }}
</a> </a>
</td> </td>
<td data-sortable="false"> <td data-value="{{ row.date_sort }}">
{{ row.date }} {{ row.date }}
</td> </td>

2
resources/views/v1/reports/category/partials/top-income.twig
View File

@@ -20,7 +20,7 @@
{{ row.description }} {{ row.description }}
</a> </a>
</td> </td>
<td data-sortable="false"> <td data-value="{{ row.date_sort }}">
{{ row.date }} {{ row.date }}
</td> </td>

2
resources/views/v1/reports/double/partials/top-expenses.twig
View File

@@ -20,7 +20,7 @@
{{ row.description }} {{ row.description }}
</a> </a>
</td> </td>
<td data-sortable="false"> <td data-value="{{ row.date_sort }}">
{{ row.date }} {{ row.date }}
</td> </td>

2
resources/views/v1/reports/double/partials/top-income.twig
View File

@@ -20,7 +20,7 @@
{{ row.description }} {{ row.description }}
</a> </a>
</td> </td>
<td data-sortable="false"> <td data-value="{{ row.date_sort }}">
{{ row.date }} {{ row.date }}
</td> </td>

2
resources/views/v1/reports/tag/partials/top-expenses.twig
View File

@@ -20,7 +20,7 @@
{{ row.description }} {{ row.description }}
</a> </a>
</td> </td>
<td data-sortable="false"> <td data-value="{{ row.date_sort }}">
{{ row.date }} {{ row.date }}
</td> </td>

2
resources/views/v1/reports/tag/partials/top-income.twig
View File

@@ -20,7 +20,7 @@
{{ row.description }} {{ row.description }}
</a> </a>
</td> </td>
<td data-sortable="false"> <td data-value="{{ row.date_sort }}">
{{ row.date }} {{ row.date }}
</td> </td>