diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php index 1c167e7dd4..4ec8165e8c 100644 --- a/app/Http/breadcrumbs.php +++ b/app/Http/breadcrumbs.php @@ -256,40 +256,6 @@ Breadcrumbs::register( } ); -// repeated expenses -Breadcrumbs::register( - 'repeated.index', function (Generator $breadcrumbs) { - $breadcrumbs->parent('home'); - $breadcrumbs->push('Repeated expenses', route('repeated.index')); -} -); -Breadcrumbs::register( - 'repeated.create', function (Generator $breadcrumbs) { - $breadcrumbs->parent('repeated.index'); - $breadcrumbs->push('Create new repeated expense', route('repeated.create')); -} -); - -Breadcrumbs::register( - 'repeated.edit', function (Generator $breadcrumbs, PiggyBank $piggyBank) { - $breadcrumbs->parent('repeated.show', $piggyBank); - $breadcrumbs->push('Edit ' . e($piggyBank->name), route('repeated.edit', $piggyBank->id)); -} -); -Breadcrumbs::register( - 'repeated.delete', function (Generator $breadcrumbs, PiggyBank $piggyBank) { - $breadcrumbs->parent('repeated.show', $piggyBank); - $breadcrumbs->push('Delete ' . e($piggyBank->name), route('repeated.delete', $piggyBank->id)); -} -); - -Breadcrumbs::register( - 'repeated.show', function (Generator $breadcrumbs, PiggyBank $piggyBank) { - $breadcrumbs->parent('repeated.index'); - $breadcrumbs->push(e($piggyBank->name), route('repeated.show', $piggyBank->id)); - -} -); // reports Breadcrumbs::register( diff --git a/resources/views/partials/menu.blade.php b/resources/views/partials/menu.blade.php index 81ad661a8c..f96d7b8bf8 100644 --- a/resources/views/partials/menu.blade.php +++ b/resources/views/partials/menu.blade.php @@ -161,9 +161,6 @@
  • Bills
    • -
  • - Repeated expenses -
    • diff --git a/resources/views/repeatedExpense/create.blade.php b/resources/views/repeatedExpense/create.blade.php deleted file mode 100644 index 9e1dcfe5e7..0000000000 --- a/resources/views/repeatedExpense/create.blade.php +++ /dev/null @@ -1,58 +0,0 @@ -@extends('layouts.default') -@section('content') -{!! Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName()) !!} -{!! Form::open(['class' => 'form-horizontal','id' => 'store','url' => route('repeated.store')]) !!} - - - -
    -
    -
    -
    - Mandatory fields -
    -
    - - {!! ExpandedForm::text('name') !!} - {!! ExpandedForm::select('account_id',$accounts,null,['label' => 'Save on account']) !!} - {!! ExpandedForm::amount('targetamount') !!} - {!! ExpandedForm::date('targetdate',null,['label' => 'First target date']) !!} - {!! ExpandedForm::select('rep_length',$periods,'month',['label' => 'Repeats every']) !!} - {!! ExpandedForm::integer('rep_every',0,['label' => 'Skip period']) !!} - {!! ExpandedForm::integer('rep_times',0,['label' => 'Repeat times']) !!} -
    -
    -

    - -

    -
    -
    - -
    -
    - Optional fields -
    -
    - - {!! ExpandedForm::checkbox('remind_me','1',false,['label' => 'Remind me']) !!} - {!! ExpandedForm::select('reminder',$periods,'month',['label' => 'Remind every']) !!} -
    -
    - - -
    -
    - Options -
    -
    - {!! ExpandedForm::optionsList('create','repeated expense') !!} -
    -
    - -
    -
    - -{!! Form::close() !!} -@stop diff --git a/resources/views/repeatedExpense/delete.blade.php b/resources/views/repeatedExpense/delete.blade.php deleted file mode 100644 index 6a51c73c98..0000000000 --- a/resources/views/repeatedExpense/delete.blade.php +++ /dev/null @@ -1,37 +0,0 @@ -@extends('layouts.default') -@section('content') -{!! Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName(), $repeatedExpense) !!} -{!! Form::open(['class' => 'form-horizontal','id' => 'destroy','url' => route('repeated.destroy',$repeatedExpense->id)]) !!} -
    -
    -
    -
    - Delete repeated expense "{{{$repeatedExpense->name}}}" -
    -
    -

    - Are you sure? -

    - -

    - - Cancel -

    -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - - -{!! Form::close() !!} -@stop diff --git a/resources/views/repeatedExpense/edit.blade.php b/resources/views/repeatedExpense/edit.blade.php deleted file mode 100644 index bdec62776c..0000000000 --- a/resources/views/repeatedExpense/edit.blade.php +++ /dev/null @@ -1,58 +0,0 @@ -@extends('layouts.default') -@section('content') -{!! Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName(), $repeatedExpense) !!} -{!! Form::model($repeatedExpense, ['class' => 'form-horizontal','id' => 'update','url' => route('repeated.update',$repeatedExpense->id)]) !!} - - - - -
    -
    -
    -
    - Mandatory fields -
    -
    - {!! ExpandedForm::text('name') !!} - {!! ExpandedForm::select('account_id',$accounts,null,['label' => 'Save on account']) !!} - {!! ExpandedForm::amount('targetamount') !!} - {!! ExpandedForm::date('targetdate',null,['label' => 'First target date']) !!} - {!! ExpandedForm::select('rep_length',$periods,null,['label' => 'Repeats every']) !!} - {!! ExpandedForm::integer('rep_every',null,['label' => 'Skip period']) !!} - {!! ExpandedForm::integer('rep_times',null,['label' => 'Repeat times']) !!} - -
    -
    -

    - -

    -
    -
    - -
    -
    - Optional fields -
    -
    - {!! ExpandedForm::checkbox('remind_me','1',$preFilled['remind_me'],['label' => 'Remind me']) !!} - {!! ExpandedForm::select('reminder',$periods,$preFilled['reminder'],['label' => 'Remind every']) !!} -
    -
    - - -
    -
    - Options -
    -
    - {!! ExpandedForm::optionsList('update','piggy bank') !!} -
    -
    - -
    -
    - -{!! Form::close() !!} -@stop diff --git a/resources/views/repeatedExpense/index.blade.php b/resources/views/repeatedExpense/index.blade.php deleted file mode 100644 index 3daed772a8..0000000000 --- a/resources/views/repeatedExpense/index.blade.php +++ /dev/null @@ -1,69 +0,0 @@ -@extends('layouts.default') -@section('content') -{!! Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName()) !!} -
    -
    -

    - Create new repeated expense -

    - -
    -
    - -@foreach($expenses as $entry) -
    -
    -
    -
    - {{{$entry->name}}} - ({!! Amount::format($entry->targetamount) !!}) - - -
    -
    - - -
    -
    -
    -
    -
    -
    - @if(Steam::percentage($entry,$entry->currentRep) > 30) - {{Amount::format($entry->currentRep->currentamount,false)}} - @endif -
    - @if(Steam::percentage($entry,$entry->currentRep) <= 30) -  {{Amount::format($entry->currentRep->currentamount,false)}} - @endif -
    -
    -
    - {{$entry->currentRep->startdate->format('j F Y')}} to {{$entry->currentRep->targetdate->format('j F Y')}} -
    -
    -
    -
    - @endforeach - -
    -
    -

    - Create new repeated expense -

    - -
    -
    - - - - -@stop -@section('scripts') -@stop diff --git a/resources/views/repeatedExpense/show.blade.php b/resources/views/repeatedExpense/show.blade.php deleted file mode 100644 index 6baec34d1a..0000000000 --- a/resources/views/repeatedExpense/show.blade.php +++ /dev/null @@ -1,61 +0,0 @@ -@extends('layouts.default') -@section('content') -{!! Breadcrumbs::renderIfExists(Route::getCurrentRoute()->getName(), $repeatedExpense) !!} -
    -
    - @foreach($repetitions as $rep) - bars->count()) == 0 ? 1 : floor(12 / $rep->bars->count()); - ?> - - -
    -
    - Repetition from {{$rep->startdate->format('j F Y')}} to {{$rep->targetdate->format('j F Y')}} -
    -
    -

    - Target amount: {!! Amount::format($repeatedExpense->targetamount) !!}. Currently saved: {!! Amount::format($rep->currentamount) !!}. -

    -
    - @foreach($rep->bars as $bar) -
    -
    - -
    - @if($bar->percentage() > 50 && $bar->percentage() == 100) - @if($bar->hasReminder() && $bar->getReminder()->active == 1) - - @endif - @if($bar->hasReminder() && $bar->getReminder()->active == 0 && $bar->getReminder()->notnow == 0) - - @endif - @if($bar->hasReminder() && $bar->getReminder()->active == 0 && $bar->getReminder()->notnow == 1) - - @endif - @endif - @if($bar->percentage() > 50 && $bar->percentage() < 100) - {{Amount::format($rep->currentamount,false)}} - @endif -
    -
    -
    -

    - {{$bar->getStartDate()->format('j F Y')}} — {{$bar->getTargetDate()->format('j F Y')}} -

    - -
    - @endforeach -
    -
    -
    - @endforeach -
    -
    -@stop