kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-08 18:58:07 +00:00
Code Issues Projects Releases Wiki Activity

Experimental code for #628

Browse Source
This commit is contained in:
James Cole
2017-04-08 09:00:37 +02:00
parent 01ae278f09
commit 4fd33f19c6
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,7 @@
* See the LICENSE file for details. * See the LICENSE file for details.
*/ */
declare(strict_types = 1); declare(strict_types=1);
namespace FireflyIII\Http\Controllers; namespace FireflyIII\Http\Controllers;
@@ -493,6 +493,7 @@ class CategoryController extends Controller
'name' => $dateName, 'name' => $dateName,
'spent' => $spent, 'spent' => $spent,
'earned' => $earned, 'earned' => $earned,
'sum' => bcadd($earned, $spent),
'transferred' => $transferred, 'transferred' => $transferred,
'date' => clone $end, 'date' => clone $end,
] ]

6
resources/views/categories/show.twig
View File

@@ -109,6 +109,12 @@
<td style="width:33%;">{{ 'earned'|_ }}</td> <td style="width:33%;">{{ 'earned'|_ }}</td>
<td style="text-align: right;">{{ period.earned|formatAmount }}</td> <td style="text-align: right;">{{ period.earned|formatAmount }}</td>
</tr> </tr>
{% if period.earned != 0 and period.spent != 0 %}
<tr>
<td style="width:33%;">{{ 'sum'|_ }}</td>
<td style="text-align: right;">{{ period.sum|formatAmount }}</td>
</tr>
{% endif %}
<tr> <tr>
<td style="width:33%;">{{ 'transferred'|_ }}</td> <td style="width:33%;">{{ 'transferred'|_ }}</td>
<td style="text-align: right;" class="text-info">{{ period.transferred|formatAmountPlain }}</td> <td style="text-align: right;" class="text-info">{{ period.transferred|formatAmountPlain }}</td>