Some view fixes.

This commit is contained in:
James Cole 2014-11-14 14:33:41 +01:00
parent 54685c1f5f
commit 9e720c3a38
3 changed files with 18 additions and 10 deletions

View File

@ -110,7 +110,9 @@ class RecurringController extends BaseController
}
/**
* @param RecurringTransaction $recurringTransaction
*
* @return mixed
*/
public function show(RecurringTransaction $recurringTransaction)
{

View File

@ -339,9 +339,8 @@ class Recurring implements CUD, CommonDatabaseCalls, RecurringInterface
/** @var \FireflyIII\Database\TransactionJournal $journalRepository */
$journalRepository = \App::make('FireflyIII\Database\TransactionJournal');
$set = \DB::table('transactions')->where('amount', '>', 0)->where('amount', '>=', $recurring->amount_min)->where(
'amount', '<=', $recurring->amount_max
)->get(['transaction_journal_id']);
$set = \DB::table('transactions')->where('amount', '>', 0)->where('amount', '>=', $recurring->amount_min)->where('amount', '<=', $recurring->amount_max)
->get(['transaction_journal_id']);
$ids = [];
/** @var \Transaction $entry */

View File

@ -3,7 +3,7 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12">
<h3>Metadata</h3>
<table class="table">
<table class="table table-striped table-bordered">
<tr>
<td>Date</td>
<td>{{{$journal->date->format('jS F Y')}}}</td>
@ -26,12 +26,19 @@
@endif
</td>
</tr>
@foreach($journal->components as $component)
<tr>
<td>{{$component->class}}</td>
<td>{{{$component->name}}}</td>
</tr>
@foreach($journal->budgets()->get() as $budget)
<tr>
<td>{{$budget->class}}</td>
<td><a href="{{route('budgets.show',$budget->id)}}">{{{$budget->name}}}</a></td>
</tr>
@endforeach
@foreach($journal->categories()->get() as $category)
<tr>
<td>{{$category->class}}</td>
<td><a href="{{route('categories.show',$category->id)}}">{{{$category->name}}}</a></td>
</tr>
@endforeach
</table>
</div>
@ -39,7 +46,7 @@
<h3>Transactions</h3>
@foreach($journal->transactions as $t)
<h4><a href="{{route('accounts.show',$t->account->id)}}">{{{$t->account->name}}}</a><br /><small>{{{$t->account->accounttype->description}}}</small></h4>
<table class="table">
<table class="table table-striped table-bordered">
<tr>
<td>Amount</td>
<td>{{mf($t->amount)}}</td>