IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-28 09:51:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some views.

Browse Source
This commit is contained in:
James Cole 2015-03-04 21:11:47 +01:00
parent 284732c7a6
commit 1139f950ed
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,7 +113,8 @@ class CategoryController extends Controller
->after($start) ->after($start)
->orderBy('transaction_journals.date') ->orderBy('transaction_journals.date')
->get(['transaction_journals.*']); ->get(['transaction_journals.*']);
$subTitle = 'Transactions without a category in ' . $start->format('F Y');
$subTitle = 'Transactions without a category between ' . $start->format('jS F Y').' and '.$end->format('jS F Y');
return view('categories.noCategory', compact('list', 'subTitle')); return view('categories.noCategory', compact('list', 'subTitle'));
} }

4
resources/views/list/journals-full.blade.php
View File

@ -71,14 +71,14 @@
{{$journal->date->format('j F Y')}} {{$journal->date->format('j F Y')}}
</td> </td>
<td> <td>
@if($journal->transactions[0]->account->accounttype->description == 'Cash account') @if($journal->transactions[0]->account->accounttype->type == 'Cash account')
<span class="text-success">(cash)</span> <span class="text-success">(cash)</span>
@else @else
<a href="{{route('accounts.show',$journal->transactions[0]->account_id)}}">{{{$journal->transactions[0]->account->name}}}</a> <a href="{{route('accounts.show',$journal->transactions[0]->account_id)}}">{{{$journal->transactions[0]->account->name}}}</a>
@endif @endif
</td> </td>
<td> <td>
@if($journal->transactions[1]->account->accounttype->description == 'Cash account') @if($journal->transactions[1]->account->accounttype->type == 'Cash account')
<span class="text-success">(cash)</span> <span class="text-success">(cash)</span>
@else @else
<a href="{{route('accounts.show',$journal->transactions[1]->account_id)}}">{{{$journal->transactions[1]->account->name}}}</a> <a href="{{route('accounts.show',$journal->transactions[1]->account_id)}}">{{{$journal->transactions[1]->account->name}}}</a>