kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues 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:14:15 +02:00
parent 0224d1d59b
commit 37f40d8637
5 changed files with 42 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
resources/views/reports/budget.blade.php
View File

@@ -75,7 +75,7 @@
@foreach($budgets as $id => $budget)
<tr>
<td>{{{$budget['name']}}}</td>
<td>{!! Amount::format($budget['amount']) !!}</td>
<td>{!! Amount::format($budget['queryAmount']) !!}</td>
<?php $spent = 0;?>
@foreach($accounts as $account)
@if($account->hide === false)
@@ -83,23 +83,23 @@
<td>
@if($id == 0)
<a href="{{route('reports.no-budget',[$account, $year, $month])}}" class="openModal">
{!! Amount::format($account->budgetInformation[$id]['amount']) !!}
{!! Amount::format($account->budgetInformation[$id]['queryAmount']) !!}
</a>
@else
{!! Amount::format($account->budgetInformation[$id]['amount']) !!}
{!! Amount::format($account->budgetInformation[$id]['queryAmount']) !!}
@endif
</td>
<?php
$spent += floatval($account->budgetInformation[$id]['amount']);
$accountSums[$account->id] += floatval($account->budgetInformation[$id]['amount']);
$spent += floatval($account->budgetInformation[$id]['queryAmount']);
$accountSums[$account->id] += floatval($account->budgetInformation[$id]['queryAmount']);
?>
@else
<td>{!! Amount::format(0) !!}</td>
@endif
@endif
@endforeach
<td>{!! Amount::format($budget['amount'] + $budget['spent']) !!}</td>
<td>{!! Amount::format($budget['amount'] + $spent) !!}</td>
<td>{!! Amount::format($budget['queryAmount'] + $budget['spent']) !!}</td>
<td>{!! Amount::format($budget['queryAmount'] + $spent) !!}</td>
</tr>
@endforeach
<tr>
@@ -122,10 +122,10 @@
@if($account->hide === false)
@if(isset($account->budgetInformation[0]))
<td>
@if($account->budgetInformation[0]['amount'] + $account->balancedAmount != 0.0)
<a href="{{route('reports.left-unbalanced',[$account, $year, $month])}}" class="openModal">{!! Amount::format($account->budgetInformation[0]['amount'] + $account->balancedAmount) !!}</a>
@if($account->budgetInformation[0]['queryAmount'] + $account->balancedAmount != 0.0)
<a href="{{route('reports.left-unbalanced',[$account, $year, $month])}}" class="openModal">{!! Amount::format($account->budgetInformation[0]['queryAmount'] + $account->balancedAmount) !!}</a>
@else
{!! Amount::format($account->budgetInformation[0]['amount'] + $account->balancedAmount) !!}
{!! Amount::format($account->budgetInformation[0]['queryAmount'] + $account->balancedAmount) !!}
@endif
</td>
@else