diff --git a/resources/views/bookings/delete.blade.php b/resources/views/bookings/delete.blade.php index 73e50b3..0f7cad1 100644 --- a/resources/views/bookings/delete.blade.php +++ b/resources/views/bookings/delete.blade.php @@ -3,41 +3,53 @@ @section('title', 'Buchung löschen') @section('subnav') - Zurück + Zurück @endsection - @section('content')

@yield('title')

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

Soll folgende Buchung und alle ihre Teilbuchungen wirklich gelöscht - werden?

+
+

+ Soll folgende Buchung und alle ihre Teilbuchungen wirklich + gelöscht werden? +

- - - - - - - - - - - - - - @foreach($booking->subBookings as $subBooking) +
DatumPositionenPerson / FirmaBetrag
{{ $booking->date }}{{ $booking->reference }}{{ $booking->person_or_company }}{{ formatAmount($booking->signedAmount(), true, true) }}
- - - - + + + + - @endforeach -
{{ $subBooking->reference }}{{ formatAmount($subBooking->signedAmount(), true, true) }}DatumPositionenPerson / FirmaBetrag
+ + {{ formatDate($booking->date) }} + {{ $booking->reference }} + {{ $booking->person_or_company }} + + {{ + formatAmount($booking->signedAmount(), true, true) + }} + + + @foreach($booking->subBookings as $subBooking) + + + {{ $subBooking->reference }} + + + {{ + formatAmount($subBooking->signedAmount(), true, true) + }} + + + @endforeach + - + + Nein +
@endsection diff --git a/resources/views/bookings/index.blade.php b/resources/views/bookings/index.blade.php index 27952c0..1c5975f 100644 --- a/resources/views/bookings/index.blade.php +++ b/resources/views/bookings/index.blade.php @@ -21,8 +21,8 @@ {{ $year + 1 }} - - +
+ @@ -30,7 +30,7 @@ - + @for ($month = 1; $month <= 12; $month++) @if (( @@ -42,15 +42,15 @@ or $firstDate['Y'] == $year and $firstDate['m'] <= $month )) - - - - - - - - - + + + + + + + + + @endif @if (isset($bookings[$month])) @@ -81,10 +81,18 @@ @if (!$booking->isSimple()) @foreach ($booking->subBookings as $subBooking) - + @@ -129,29 +137,29 @@ or $firstDate['Y'] == $year and $firstDate['m'] <= $month )) - - + - - - - - - + + + + + + + + - - + - - - - - - + + + + + + + + @for ($i = 0; $i < 8; $i++) diff --git a/resources/views/layout/forms/person.blade.php b/resources/views/layout/forms/person.blade.php index f4ad3f0..ee6ee9e 100644 --- a/resources/views/layout/forms/person.blade.php +++ b/resources/views/layout/forms/person.blade.php @@ -2,7 +2,7 @@ @section('subnav') @endsection @@ -129,8 +129,24 @@ {{-- Create empty input field for a new member state record. --}} @if (!$person->isMember()) - - + + @endif
Datum Positionen Person / FirmaEingang (H) Konto ProjektAktionen
{{ startOfMonth($year, $month) }}Saldo{!! formatAmount($sums[$month - 1]['balance']) !!}
{{ startOfMonth($year, $month) }}Saldo{!! formatAmount($sums[$month - 1]['balance']) !!}
@@ -92,7 +100,7 @@
{{ $subBooking->reference }}
+
{{ endOfMonth($year, $month) }} - - Monatsabschluss{!! formatAmount($sums[$month]['expeditures']) !!}{!! formatAmount($sums[$month]['incomes']) !!}Monatsabschluss{!! formatAmount($sums[$month]['expeditures']) !!}{!! formatAmount($sums[$month]['incomes']) !!}
+
{{ endOfMonth($year, $month) }} - - Saldo{!! formatAmount($sums[$month]['balance']) !!}Saldo{!! formatAmount($sums[$month]['balance']) !!}
{{ Form::date('memberState[0][joining_date]') }}{{ Form::date('memberState[0][leaving_date]') }} + {{ + Form::date( + 'memberState[0][joining_date]', + null, + ['class' => 'form-control'] + ) + }} + + {{ + Form::date( + 'memberState[0][leaving_date]', + null, + ['class' => 'form-control'] + ) + }} +
diff --git a/resources/views/layout/forms/projects.blade.php b/resources/views/layout/forms/projects.blade.php index 154853d..e009b9c 100644 --- a/resources/views/layout/forms/projects.blade.php +++ b/resources/views/layout/forms/projects.blade.php @@ -1,7 +1,7 @@ @extends('layout.master') @section('subnav') - Zurück + Zurück @endsection @section('content') diff --git a/resources/views/people/delete.blade.php b/resources/views/people/delete.blade.php index 1ab59b2..1f181e1 100644 --- a/resources/views/people/delete.blade.php +++ b/resources/views/people/delete.blade.php @@ -4,7 +4,7 @@ @section('subnav') @endsection @@ -15,7 +15,8 @@ @if ($person->isEven())

Soll {{ $person->fullName() }} wirklich gelöscht werden?

- + + Nein
@else
diff --git a/resources/views/personTargets/delete.blade.php b/resources/views/personTargets/delete.blade.php index 90065fe..0baa633 100644 --- a/resources/views/personTargets/delete.blade.php +++ b/resources/views/personTargets/delete.blade.php @@ -3,32 +3,35 @@ @section('title', 'Zahlungsverflichtung löschen') @section('subnav') - Zurück + Zurück @endsection @section('content')

@yield('title')

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

Soll folgende Zahlungsverpflichtung wirklich gelöscht werden?

+
+

Soll folgende Zahlungsverpflichtung wirklich gelöscht werden?

- - - - - - - - - - - - - -
DatumPositionPerson / FirmaBetrag
{{ formatDate($personTarget->date) }}{{ $personTarget->reference }}{{ $personTarget->person->fullName() }}{{ $personTarget->signedAmount() }}
+ + + + + + + + + + + + + +
DatumPositionPerson / FirmaBetrag
{{ formatDate($personTarget->date) }}{{ $personTarget->reference }}{{ $personTarget->person->fullName() }}{{ $personTarget->signedAmount() }}
- + + Nein +
@endsection diff --git a/resources/views/personTargets/index.blade.php b/resources/views/personTargets/index.blade.php index 9ca7dab..1a5a25f 100644 --- a/resources/views/personTargets/index.blade.php +++ b/resources/views/personTargets/index.blade.php @@ -17,7 +17,7 @@ Soll Ist Differenz - Aktion + Aktionen @@ -38,8 +38,20 @@ {!! formatAmount($personTarget->difference()) !!}
- - + + + + + +
@@ -75,8 +87,20 @@ {!! formatAmount($personTarget->difference()) !!}
- - + + + + + +
diff --git a/resources/views/projects/delete.blade.php b/resources/views/projects/delete.blade.php index d87786f..d25d66c 100644 --- a/resources/views/projects/delete.blade.php +++ b/resources/views/projects/delete.blade.php @@ -3,16 +3,21 @@ @section('title', 'Projekt löschen') @section('subnav') - Zurück + Zurück @endsection @section('content') -
+ {{ method_field('delete') }} {{ csrf_field() }} -

Soll das Projekt "{{ $project->name }}" wirklich gelöscht - werden?

- +
+

+ Soll das Projekt {{ $project->name }} wirklich + gelöscht werden? +

+ + Nein +
@endsection