From de5f19c73a88436baf6f25138ee3b9707658560e Mon Sep 17 00:00:00 2001 From: Lukas Halbritter Date: Fri, 12 Oct 2018 12:10:25 +0200 Subject: [PATCH] Implemented some person target functionality. --- .../Controllers/PersonTargetsController.php | 110 ++++++++++++++++++ resources/views/layout/nav.blade.php | 1 + .../views/personTargets/delete.blade.php | 34 ++++++ resources/views/personTargets/index.blade.php | 63 ++++++++++ routes/web.php | 13 +++ 5 files changed, 221 insertions(+) create mode 100644 app/Http/Controllers/PersonTargetsController.php create mode 100644 resources/views/personTargets/delete.blade.php create mode 100644 resources/views/personTargets/index.blade.php diff --git a/app/Http/Controllers/PersonTargetsController.php b/app/Http/Controllers/PersonTargetsController.php new file mode 100644 index 0000000..f73f8b8 --- /dev/null +++ b/app/Http/Controllers/PersonTargetsController.php @@ -0,0 +1,110 @@ +load('person:id,name_or_company,surname', + 'ioType:id,factor', + 'actuals:id,person_target_id,account_type_id,amount', + 'actuals.accountType:id,account_class_id', + 'actuals.accountType.accountClass:id,io_type_id', + 'actuals.accountType.accountClass.ioType:id,factor'); + } + + return view('personTargets.index', compact('personTargets')); + } + + /** + * Show the form for creating a new resource. + * + * @return \Illuminate\Http\Response + */ + public function create() + { + // + } + + /** + * Store a newly created resource in storage. + * + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Http\Response + */ + public function store(Request $request) + { + // + } + + /** + * Display the specified resource. + * + * @param \App\PersonTarget $personTarget + * @return \Illuminate\Http\Response + */ + public function show(PersonTarget $personTarget) + { + // + } + + /** + * Show the form for editing the specified resource. + * + * @param \App\PersonTarget $personTarget + * @return \Illuminate\Http\Response + */ + public function edit(PersonTarget $personTarget) + { + // + } + + /** + * Update the specified resource in storage. + * + * @param \Illuminate\Http\Request $request + * @param \App\PersonTarget $personTarget + * @return \Illuminate\Http\Response + */ + public function update(Request $request, PersonTarget $personTarget) + { + // + } + + /** + * Show the dialog for deleting the specified resource. + * + * @param \App\PersonTarget $personTarget + * @return \Illuminate\Http\Response + */ + public function delete(PersonTarget $personTarget) + { + return view('personTargets.delete', compact('personTarget')); + } + + /** + * Remove the specified resource from storage. + * + * @param \App\PersonTarget $personTarget + * @return \Illuminate\Http\Response + */ + public function destroy(PersonTarget $personTarget) + { + $personTarget->delete(); + + return redirect('/targets'); + } +} diff --git a/resources/views/layout/nav.blade.php b/resources/views/layout/nav.blade.php index 95e1a5f..293ff73 100644 --- a/resources/views/layout/nav.blade.php +++ b/resources/views/layout/nav.blade.php @@ -2,4 +2,5 @@
  • Kassenbuch
  • Personen
  • Projekte
    • +
  • F / V
    • diff --git a/resources/views/personTargets/delete.blade.php b/resources/views/personTargets/delete.blade.php new file mode 100644 index 0000000..90065fe --- /dev/null +++ b/resources/views/personTargets/delete.blade.php @@ -0,0 +1,34 @@ +@extends('layout.master') + +@section('title', 'Zahlungsverflichtung löschen') + +@section('subnav') + Zurück +@endsection + +@section('content') +

    @yield('title')

    +
    + {{ method_field('delete') }} + {{ csrf_field() }} +

    Soll folgende Zahlungsverpflichtung wirklich gelöscht werden?

    + + + + + + + + + + + + + + +
    DatumPositionPerson / FirmaBetrag
    {{ formatDate($personTarget->date) }}{{ $personTarget->reference }}{{ $personTarget->person->fullName() }}{{ $personTarget->signedAmount() }}
    + + +
    +@endsection + diff --git a/resources/views/personTargets/index.blade.php b/resources/views/personTargets/index.blade.php new file mode 100644 index 0000000..10e30e3 --- /dev/null +++ b/resources/views/personTargets/index.blade.php @@ -0,0 +1,63 @@ +@extends('layout.master') + +@section('title', 'Forderungen und Verbindlichkeiten') + +@section('subnav') + Neue Forderung / Verbindlichkeit +@endsection + +@section('content') +

    @yield('title')

    +

    Offene Verbindlichkeiten

    + + + + + + + + + + + @foreach ($personTargets['debts'] as $personTarget) + + + + + + + + + + @endforeach +
    DatumPositionPerson / FirmaSollIstDifferenzAktion
    {{ formatDate($personTarget->date) }}{{ $personTarget->reference }}{{ $personTarget->person->fullName() }}{!! formatAmount($personTarget->signedAmount()) !!}{!! formatAmount($personTarget->actualsSum()) !!}{!! formatAmount($personTarget->difference()) !!} + Anzeigen
    + Bearbeiten
    + Löschen +
    +

    Offene Forderungen

    + + + + + + + + + @foreach ($personTargets['receivables'] as $personTarget) + + + + + + + + + + @endforeach +
    DatumPositionPerson / FirmaBetragAktion
    {{ formatDate($personTarget->date) }}{{ $personTarget->reference }}{{ $personTarget->person->fullName() }}{!! formatAmount($personTarget->signedAmount()) !!}{!! formatAmount($personTarget->actualsSum()) !!}{!! formatAmount($personTarget->difference()) !!} + Anzeigen
    + Bearbeiten
    + Löschen +
    +@endsection diff --git a/routes/web.php b/routes/web.php index 90a7912..77d94d1 100644 --- a/routes/web.php +++ b/routes/web.php @@ -50,3 +50,16 @@ Route::delete('/projects/{project}', 'ProjectsController@destroy'); Route::get('/projects/{project}/edit', 'ProjectsController@edit'); Route::get('/projects/{project}/delete', 'ProjectsController@delete'); + +/****************************************************************************** + * PERSON TARGETS * + ******************************************************************************/ +Route::get('/targets', 'PersonTargetsController@index'); +Route::post('/targets', 'PersonTargetsController@store'); + +Route::get('/targets/create', 'PersonTargetsController@create'); +Route::patch('/targets/{personTarget}', 'PersonTargetsController@update'); +Route::delete('/targets/{personTarget}', 'PersonTargetsController@destroy'); + +Route::get('/targets/{personTarget}/edit', 'PersonTargetsController@edit'); +Route::get('/targets/{personTarget}/delete', 'PersonTargetsController@delete');