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

Renamed various fields from 'amount' to 'queryAmount' to prevent interfering with the getAmountAttribute property.

Browse Source
This commit is contained in:
James Cole 2015-04-09 21:16:35 +02:00
parent 37f40d8637
commit 1d67d2250a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
resources/views/reports/month.blade.php
View File

@ -64,7 +64,7 @@
<?php $sum = 0;?> <?php $sum = 0;?>
@foreach($expenses as $id => $expense) @foreach($expenses as $id => $expense)
<?php <?php
$sum += floatval($expense['amount']); $sum += floatval($expense['queryAmount']);
?> ?>
<tr> <tr>
@if($id > 0) @if($id > 0)
@ -72,7 +72,7 @@
@else @else
<td><em>{{{$expense['name']}}}</em></td> <td><em>{{{$expense['name']}}}</em></td>
@endif @endif
<td>{!! Amount::format($expense['amount']) !!}</td> <td>{!! Amount::format($expense['queryAmount']) !!}</td>
</tr> </tr>
@endforeach @endforeach
<tr> <tr>
@ -133,11 +133,11 @@
@foreach($budgets as $id => $budget) @foreach($budgets as $id => $budget)
<?php <?php
$sumSpent += $budget['spent']; $sumSpent += $budget['spent'];
$sumEnvelope += $budget['amount']; $sumEnvelope += $budget['queryAmount'];
$sumLeft += $budget['amount'] + $budget['spent']; $sumLeft += $budget['queryAmount'] + $budget['spent'];
?> ?>
<!-- only display when relevant: --> <!-- only display when relevant: -->
@if($budget['amount'] != 0 || $budget['spent'] != 0) @if($budget['queryAmount'] != 0 || $budget['spent'] != 0)
<tr> <tr>
<td> <td>
@if($id > 0) @if($id > 0)
@ -174,7 +174,7 @@
</tr> </tr>
<?php $sum = 0;?> <?php $sum = 0;?>
@foreach($categories as $id => $category) @foreach($categories as $id => $category)
<?php $sum += floatval($category['amount']);?> <?php $sum += floatval($category['queryAmount']);?>
<tr> <tr>
<td> <td>
@if($id > 0) @if($id > 0)
@ -183,7 +183,7 @@
<em>{{{$category['name']}}}</em> <em>{{{$category['name']}}}</em>
@endif @endif
</td> </td>
<td>{!! Amount::format($category['amount'],false) !!}</td> <td>{!! Amount::format($category['queryAmount'],false) !!}</td>
</tr> </tr>
@endforeach @endforeach
<tr> <tr>