diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php new file mode 100644 index 0000000..2df985b --- /dev/null +++ b/resources/views/auth/login.blade.php @@ -0,0 +1,44 @@ +@extends('layout.master') + +@section('content') +

Login

+
+ @csrf + +
+ + +
+ + + @if ($errors->has('email')) + + {{ $errors->first('email') }} + + @endif +
+
+ +
+ + +
+ + + @if ($errors->has('password')) + + {{ $errors->first('password') }} + + @endif +
+
+ +
+
+ +
+
+
+@endsection diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php new file mode 100644 index 0000000..12e8083 --- /dev/null +++ b/resources/views/auth/passwords/email.blade.php @@ -0,0 +1,47 @@ +@extends('layouts.app') + +@section('content') +
+
+
+
+
{{ __('Reset Password') }}
+ +
+ @if (session('status')) + + @endif + +
+ @csrf + +
+ + +
+ + + @if ($errors->has('email')) + + {{ $errors->first('email') }} + + @endif +
+
+ +
+
+ +
+
+
+
+
+
+
+
+@endsection diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php new file mode 100644 index 0000000..3557662 --- /dev/null +++ b/resources/views/auth/passwords/reset.blade.php @@ -0,0 +1,65 @@ +@extends('layouts.app') + +@section('content') +
+
+
+
+
{{ __('Reset Password') }}
+ +
+
+ @csrf + + + +
+ + +
+ + + @if ($errors->has('email')) + + {{ $errors->first('email') }} + + @endif +
+
+ +
+ + +
+ + + @if ($errors->has('password')) + + {{ $errors->first('password') }} + + @endif +
+
+ +
+ + +
+ +
+
+ +
+
+ +
+
+
+
+
+
+
+
+@endsection diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php new file mode 100644 index 0000000..f9dd662 --- /dev/null +++ b/resources/views/auth/register.blade.php @@ -0,0 +1,77 @@ +@extends('layouts.app') + +@section('content') +
+
+
+
+
{{ __('Register') }}
+ +
+
+ @csrf + +
+ + +
+ + + @if ($errors->has('name')) + + {{ $errors->first('name') }} + + @endif +
+
+ +
+ + +
+ + + @if ($errors->has('email')) + + {{ $errors->first('email') }} + + @endif +
+
+ +
+ + +
+ + + @if ($errors->has('password')) + + {{ $errors->first('password') }} + + @endif +
+
+ +
+ + +
+ +
+
+ +
+
+ +
+
+
+
+
+
+
+
+@endsection diff --git a/resources/views/bookings/index.blade.php b/resources/views/bookings/index.blade.php index e0e5035..2a142ba 100644 --- a/resources/views/bookings/index.blade.php +++ b/resources/views/bookings/index.blade.php @@ -81,7 +81,7 @@ - + diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php new file mode 100644 index 0000000..bef49a7 --- /dev/null +++ b/resources/views/home.blade.php @@ -0,0 +1,23 @@ +@extends('layout.master') + +@section('content') +
+
+
+
+
Dashboard
+ +
+ @if (session('status')) + + @endif + + You are logged in! +
+
+
+
+
+@endsection diff --git a/resources/views/layout/footer.blade.php b/resources/views/layout/footer.blade.php index c82da6d..3cd1d44 100644 --- a/resources/views/layout/footer.blade.php +++ b/resources/views/layout/footer.blade.php @@ -1 +1,14 @@ -

This page took {{ number_format(microtime(true) - LARAVEL_START, 3) }} seconds to render.

+ diff --git a/resources/views/layout/forms/bookings/create.blade.php b/resources/views/layout/forms/bookings/create.blade.php index eb2dcf4..4b71a8a 100644 --- a/resources/views/layout/forms/bookings/create.blade.php +++ b/resources/views/layout/forms/bookings/create.blade.php @@ -8,61 +8,110 @@

@yield('title')

{{ csrf_field() }} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{ Form::label('date', 'Datum') }}{{ Form::date('date') }}
{{ Form::label('reference', 'Buchungstext') }}{{ Form::text('reference') }}
{{ Form::label('person_or_company', 'Person / Firma') }}{{ Form::text('person_or_company') }}
{{ Form::label('amount', 'Betrag') }}{{ Form::text('amount') }}
{{ Form::label('account_type_id', 'Konto') }}{{ Form::select('account_type_id', $accountTypeArray, 'placeholder', - ['placeholder' => 'Hier auswählen ...']) }}
{{ Form::label('person_target_id', 'Personenkonto') }}{{ Form::select('person_target_id', $openTargetsArray, 'placeholder', - ['placeholder' => 'Hier auswählen ...']) }}
oder:
{{ Form::label('personTarget[person_id]', 'neue Soll-Buchung') }} - {{ - Form::select( - 'personTarget[person_id]', - $personsArray, - 'placeholder', - ['placeholder' => 'Hier auswählen ...'] - ) - }} - {{ Form::date('personTarget[date]') }} -
{{ Form::label('project_id', 'Projekt') }}{{ Form::select('project_id', $projectsArray, 'placeholder', - ['placeholder' => 'Hier auswählen ...']) }}
{{ Form::label('note', 'Anmerkung') }}{{ Form::textarea('note') }}
+
+ {{ Form::label('date', 'Datum', ['class' => 'col-sm-2 col-form-label']) }} +
+ {{ Form::date('date', null, ['class' => 'form-control']) }} +
+
+
+ {{ Form::label('reference', 'Buchungstext', ['class' => 'col-sm-2 col-form-label']) }} +
+ {{ Form::text('reference', null, ['class' => 'form-control']) }} +
+
+
+ {{ Form::label('person_or_company', 'Person / Firma', ['class' => 'col-sm-2 col-form-label']) }} +
+ {{ Form::text('person_or_company', null, ['class' => 'form-control']) }} +
+
+
+ {{ Form::label('amount', 'Betrag', ['class' => 'col-sm-2 col-form-label']) }} +
+ {{ Form::text('amount', null, ['class' => 'form-control']) }} +
+
+
+ {{ Form::label('account_type_id', 'Konto', ['class' => 'col-sm-2 col-form-label']) }} +
+ {{ + Form::select( + 'account_type_id', + $accountTypeArray, + 'placeholder', + [ + 'placeholder' => 'Hier auswählen ...', + 'class' => 'form-control' + ] + ) + }} +
+
+
+ {{ Form::label('person_target_id', 'Personenkonto', ['class' => 'col-sm-2 col-form-label']) }} +
+ {{ + Form::select( + 'person_target_id', + $openTargetsArray, + 'placeholder', + [ + 'placeholder' => 'Hier auswählen ...', + 'class' => 'form-control' + ] + ) + }} +
+
+ oder: +
+ {{ + Form::label( + 'personTarget[person_id]', + 'neue Soll-Buchung', + ['class' => 'col-sm-2 col-form-label'] + ) + }} +
+ {{ + Form::select( + 'personTarget[person_id]', + $personsArray, + 'placeholder', + [ + 'placeholder' => 'Hier auswählen ...', + 'class' => 'form-control' + ] + ) + }} +
+
+ {{ Form::date('personTarget[date]', null, ['class' => 'form-control']) }} +
+
+
+ {{ Form::label('project_id', 'Projekt', ['class' => 'col-sm-2 col-form-label']) }} +
+ {{ + Form::select( + 'project_id', + $projectsArray, + 'placeholder', + [ + 'placeholder' => 'Hier auswählen ...', + 'class' => 'form-control' + ] + ) + }} +
+
+
+ {{ Form::label('note', 'Anmerkung', ['class' => 'col-sm-2 col-form-label']) }} +
+ {{ Form::textarea('note', null, ['class' => 'form-control']) }} +
+
- +
+
+ +
+
@endsection diff --git a/resources/views/layout/forms/personTarget.blade.php b/resources/views/layout/forms/personTarget.blade.php index 49e4e42..ab9887c 100644 --- a/resources/views/layout/forms/personTarget.blade.php +++ b/resources/views/layout/forms/personTarget.blade.php @@ -50,17 +50,25 @@
{{ Form::label('person_id', 'Person / Firma', ['class' => 'col-sm-2 col-form-label']) }}
- {{ - Form::select( - 'person_id', - $peopleArray, - $personTarget->person_id, - [ - 'placeholder' => 'Hier auswählen ...', - 'class' => 'form-control' - ] - ) - }} + @if (is_null($personTarget->id)) + + @else + {{ + Form::select( + 'person_id', + $peopleArray, + $personTarget->person_id, + [ + 'placeholder' => 'Hier auswählen ...', + 'class' => 'form-control' + ] + ) + }} + @endif
diff --git a/resources/views/layout/master.blade.php b/resources/views/layout/master.blade.php index df3128e..4c8e51b 100644 --- a/resources/views/layout/master.blade.php +++ b/resources/views/layout/master.blade.php @@ -43,8 +43,13 @@ + diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php new file mode 100644 index 0000000..6dba26c --- /dev/null +++ b/resources/views/layouts/app.blade.php @@ -0,0 +1,79 @@ + + + + + + + + + + + {{ config('app.name', 'Laravel') }} + + + + + + + + + + + + +
+ + +
+ @yield('content') +
+
+ + diff --git a/resources/views/people/show.blade.php b/resources/views/people/show.blade.php index b098b48..210f1df 100644 --- a/resources/views/people/show.blade.php +++ b/resources/views/people/show.blade.php @@ -110,7 +110,7 @@ {!! formatAmount($target->difference()) !!}
- + @@ -127,6 +127,7 @@ {!! formatAmount($actual->signedAmount()) !!} + @endforeach @endforeach diff --git a/resources/views/personTargets/index.blade.php b/resources/views/personTargets/index.blade.php index 7e868ea..9ca7dab 100644 --- a/resources/views/personTargets/index.blade.php +++ b/resources/views/personTargets/index.blade.php @@ -19,6 +19,15 @@ Differenz Aktion + + + SUMME + + + + {!! formatAmount($sums['debts']) !!} + + @foreach ($personTargets['debts'] as $personTarget) {{ formatDate($personTarget->date) }} @@ -47,6 +56,15 @@ Differenz Aktion + + + SUMME + + + + {!! formatAmount($sums['receivables']) !!} + + @foreach ($personTargets['receivables'] as $personTarget) {{ formatDate($personTarget->date) }} @@ -57,7 +75,6 @@ {!! formatAmount($personTarget->difference()) !!}
-