kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-05 04:03:26 +00:00
Code Issues Projects Releases Wiki Activity

Bug fix and limit expansions [skip ci]

Browse Source
This commit is contained in:
James Cole
2014-07-31 07:29:55 +02:00
parent 78d575fbb1
commit a41fb81446
3 changed files with 43 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/routes.php
View File

@@ -37,7 +37,7 @@ Route::bind('limit', function($value, $route)
where('limits.id', $value)-> where('limits.id', $value)->
leftJoin('components','components.id','=','limits.component_id')-> leftJoin('components','components.id','=','limits.component_id')->
where('components.class','Budget')-> where('components.class','Budget')->
where('components.user_id',Auth::user()->id)->first(); where('components.user_id',Auth::user()->id)->first(['limits.*']);
} }
return null; return null;
}); });

35
app/views/limits/delete.blade.php
View File

@@ -6,13 +6,7 @@
<small>Delete envelope</small> <small>Delete envelope</small>
</h1> </h1>
<p class="lead">Remember that deleting something is permanent.</p> <p class="lead">Remember that deleting something is permanent.</p>
<p class="text-info">
This form allows you to delete the envelope for budget {{{$limit->budget->name}}}, with a content of
{{mf($limit->amount,false)}}
@if($limit->repeats == 0)
in {{$limit->limitrepetitions[0]->startdate->format('M Y')}} ({{$limit->repeat_freq}}).
@endif
</p>
</div> </div>
</div> </div>
@@ -20,7 +14,15 @@
{{Form::open(['class' => 'form-horizontal','url' => route('budgets.limits.destroy',$limit->id)])}} {{Form::open(['class' => 'form-horizontal','url' => route('budgets.limits.destroy',$limit->id)])}}
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-6">
<h4>&nbsp;</h4>
<p class="text-info">
This form allows you to delete the envelope for budget {{{$limit->budget->name}}}, with a content of
{{mf($limit->amount,false)}}
@if($limit->repeats == 0)
in {{$limit->limitrepetitions[0]->startdate->format('M Y')}} ({{$limit->repeat_freq}}).
@endif
</p>
<p class="text-info"> <p class="text-info">
Destroying an envelope does not remove any transactions from the budget. Destroying an envelope does not remove any transactions from the budget.
</p> </p>
@@ -38,8 +40,23 @@
@endif @endif
</div> </div>
</div> </div>
</div> </div>
@if($limit->repeats == 1)
<div class="col-lg-6 col-md-6 col-sm-12">
<h4>Auto repeating</h4>
<p class="text-info">
This envelope is set to repeat itself; creating a new period whenever the previous period
has passed. If you change this envelope, you'll also change the following (automatically created)
envelopes.
{{$limit->limitrepetitions()->count() }}
</p>
<ul>
@foreach($limit->limitrepetitions()->orderBy('startdate','DESC')->get() as $rep)
<li>Evenlope for {{$rep->periodShow()}}, {{mf($rep->amount,false)}}</li>
@endforeach
</ul>
</div>
@endif
</div> </div>

16
app/views/limits/edit.blade.php
View File

@@ -94,6 +94,22 @@
</div> </div>
</div> </div>
@if($limit->repeats == 1)
<div class="col-lg-6 col-md-6 col-sm-12">
<h4>Auto repeating</h4>
<p class="text-info">
This envelope is set to repeat itself; creating a new period whenever the previous period
has passed. If you change this envelope, you'll also change the following (automatically created)
envelopes.
{{$limit->limitrepetitions()->count() }}
</p>
<ul>
@foreach($limit->limitrepetitions()->orderBy('startdate','DESC')->get() as $rep)
<li>Evenlope for {{$rep->periodShow()}}, {{mf($rep->amount,false)}}</li>
@endforeach
</ul>
</div>
@endif
</div> </div>
{{Form::close()}} {{Form::close()}}