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

Fix display of amount. See issue #129

Browse Source
This commit is contained in:
James Cole 2015-12-11 18:15:37 +01:00
parent 4a2823bcba
commit 28c3cfe084
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Helpers/Collection/Category.php
View File

@ -37,6 +37,7 @@ class Category
// spent is minus zero for an expense report: // spent is minus zero for an expense report:
if ($category->spent < 0) { if ($category->spent < 0) {
$this->categories->push($category); $this->categories->push($category);
$this->addTotal($category->spent);
} }
} }

3
app/Helpers/Report/ReportHelper.php
View File

@ -343,10 +343,9 @@ class ReportHelper implements ReportHelperInterface
$repository = app('FireflyIII\Repositories\Category\CategoryRepositoryInterface'); $repository = app('FireflyIII\Repositories\Category\CategoryRepositoryInterface');
$set = $repository->getCategories(); $set = $repository->getCategories();
foreach ($set as $category) { foreach ($set as $category) {
$spent = $repository->balanceInPeriodForList($category, $start, $end, $accounts); $spent = $repository->balanceInPeriodForList($category, $start, $end, $accounts);
$category->spent = $spent; $category->spent = $spent;
$object->addCategory($category); $object->addCategory($category);
$object->addTotal($spent);
} }
return $object; return $object;

4
resources/twig/partials/reports/categories.twig
View File

@ -16,14 +16,14 @@
<td> <td>
<a href="{{ route('categories.show',cat.id) }}">{{ cat.name }}</a> <a href="{{ route('categories.show',cat.id) }}">{{ cat.name }}</a>
</td> </td>
<td><span class="text-danger">{{ (cat.spent * -1)|formatAmountPlain }}</span></td> <td>{{ cat.spent|formatAmount }}</td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
<tfoot> <tfoot>
<tr> <tr>
<td><em>{{ 'sum'|_ }}</em></td> <td><em>{{ 'sum'|_ }}</em></td>
<td class="text-danger">{{ (categories.getTotal * -1)|formatAmountPlain }}</td> <td>{{ categories.getTotal|formatAmount }}</td>
</tr> </tr>
</tfoot> </tfoot>
</table> </table>