Some ui fixes.
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
@extends('layout.master')
|
@extends('layout.master')
|
||||||
|
|
||||||
@section('subnav')
|
@section('subnav')
|
||||||
<a href='{{ url()->previous() }}'>Zurück</a>
|
<a href='{{ url()->previous() }}' class='btn btn-outline-secondary'>Zurück</a>
|
||||||
@endsection
|
@endsection
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
@@ -10,24 +10,78 @@
|
|||||||
{{ method_field('patch') }}
|
{{ method_field('patch') }}
|
||||||
{{ csrf_field() }}
|
{{ csrf_field() }}
|
||||||
<h2>Allgemeine Buchungsinformationen</h2>
|
<h2>Allgemeine Buchungsinformationen</h2>
|
||||||
<table>
|
<div class="form-group row">
|
||||||
<tr>
|
{{
|
||||||
<td>{{ Form::label('booking[date]', 'Datum') }}</td>
|
Form::label(
|
||||||
<td>{{ Form::date('booking[date]', $booking->date) }}</td>
|
'booking[date]',
|
||||||
</tr>
|
'Datum',
|
||||||
<tr>
|
['class' => 'col-sm-2 col-form-label']
|
||||||
<td>{{ Form::label('booking[reference]', 'Buchungstext') }}</td>
|
)
|
||||||
<td>{{ Form::text('booking[reference]', $booking->reference) }}</td>
|
}}
|
||||||
</tr>
|
<div class='col-sm-10'>
|
||||||
<tr>
|
{{
|
||||||
<td>{{ Form::label('booking[person_or_company]', 'Person / Firma') }}</td>
|
Form::date(
|
||||||
<td>{{ Form::text('booking[person_or_company]', $booking->person_or_company) }}</td>
|
'booking[date]',
|
||||||
</tr>
|
$booking->date,
|
||||||
<tr>
|
['class' => 'form-control']
|
||||||
<td>{{ Form::label('booking[note]', 'Anmerkung') }}</td>
|
)
|
||||||
<td>{{ Form::textarea('booking[note]', $booking->note) }}</td>
|
}}
|
||||||
</tr>
|
</div>
|
||||||
</table>
|
</div>
|
||||||
|
<div class='form-group row'>
|
||||||
|
{{
|
||||||
|
Form::label(
|
||||||
|
'booking[reference]',
|
||||||
|
'Buchungstext',
|
||||||
|
['class' => 'col-sm-2 col-form-label']
|
||||||
|
)
|
||||||
|
}}
|
||||||
|
<div class='col-sm-10'>
|
||||||
|
{{
|
||||||
|
Form::text(
|
||||||
|
'booking[reference]',
|
||||||
|
$booking->reference,
|
||||||
|
['class' => 'form-control']
|
||||||
|
)
|
||||||
|
}}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class='form-group row'>
|
||||||
|
{{
|
||||||
|
Form::label(
|
||||||
|
'booking[person_or_company]',
|
||||||
|
'Person / Firma',
|
||||||
|
['class' => 'col-sm-2 col-form-label']
|
||||||
|
)
|
||||||
|
}}
|
||||||
|
<div class='col-sm-10'>
|
||||||
|
{{
|
||||||
|
Form::text(
|
||||||
|
'booking[person_or_company]',
|
||||||
|
$booking->person_or_company,
|
||||||
|
['class' => 'form-control']
|
||||||
|
)
|
||||||
|
}}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class='form-group row'>
|
||||||
|
{{
|
||||||
|
Form::label(
|
||||||
|
'booking[note]',
|
||||||
|
'Anmerkung',
|
||||||
|
['class' => 'col-sm-2 col-form-label']
|
||||||
|
)
|
||||||
|
}}
|
||||||
|
<div class='form-group row'>
|
||||||
|
{{
|
||||||
|
Form::textarea(
|
||||||
|
'booking[note]',
|
||||||
|
$booking->note,
|
||||||
|
['class' => 'form-control']
|
||||||
|
)
|
||||||
|
}}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<h2>Teilbuchungen</h2>
|
<h2>Teilbuchungen</h2>
|
||||||
<table>
|
<table>
|
||||||
<tr>
|
<tr>
|
||||||
@@ -129,6 +183,6 @@
|
|||||||
@endforeach
|
@endforeach
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<button type="submit" id="submit">Speichern</button>
|
<button type="submit" id="submit" class='btn btn-primary'>Speichern</button>
|
||||||
</form>
|
</form>
|
||||||
@endsection
|
@endsection
|
||||||
|
|||||||
@@ -64,7 +64,7 @@
|
|||||||
@if ($person->title != 'Firma')
|
@if ($person->title != 'Firma')
|
||||||
<h2>Mitgliederdaten</h2>
|
<h2>Mitgliederdaten</h2>
|
||||||
@if ($person->wasMember())
|
@if ($person->wasMember())
|
||||||
<table border='1'>
|
<table class='table table-bordered table-striped'>
|
||||||
<tr>
|
<tr>
|
||||||
<th>Eintrittsdatum</th>
|
<th>Eintrittsdatum</th>
|
||||||
<th>Austrittsdatum</th>
|
<th>Austrittsdatum</th>
|
||||||
|
|||||||
@@ -3,13 +3,13 @@
|
|||||||
@section('title', 'Forderungen und Verbindlichkeiten')
|
@section('title', 'Forderungen und Verbindlichkeiten')
|
||||||
|
|
||||||
@section('subnav')
|
@section('subnav')
|
||||||
<a href='/targets/create'>Neue Forderung / Verbindlichkeit</a>
|
<a href='/targets/create' class='btn btn-outline-success'>Neue Forderung / Verbindlichkeit</a>
|
||||||
@endsection
|
@endsection
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
<h2>@yield('title')</h2>
|
<h2>@yield('title')</h2>
|
||||||
<h3>Offene Verbindlichkeiten</h3>
|
<h3>Offene Verbindlichkeiten</h3>
|
||||||
<table border='1'>
|
<table class='table table-bordered table-striped'>
|
||||||
<tr>
|
<tr>
|
||||||
<th>Datum</th>
|
<th>Datum</th>
|
||||||
<th>Position</th>
|
<th>Position</th>
|
||||||
@@ -28,20 +28,24 @@
|
|||||||
<td>{!! formatAmount($personTarget->actualsSum()) !!}</td>
|
<td>{!! formatAmount($personTarget->actualsSum()) !!}</td>
|
||||||
<td>{!! formatAmount($personTarget->difference()) !!}</td>
|
<td>{!! formatAmount($personTarget->difference()) !!}</td>
|
||||||
<td>
|
<td>
|
||||||
<a href='/targets/{{ $personTarget->id }}'>Anzeigen</a><br />
|
<div class="btn-group" role="group" aria-label="Basic example">
|
||||||
<a href='/targets/{{ $personTarget->id }}/edit'>Bearbeiten</a><br />
|
<a href='/targets/{{ $personTarget->id }}' class="btn btn-primary"><i class="fas fa-eye"></i></a>
|
||||||
<a href='/targets/{{ $personTarget->id }}/delete'>Löschen</a>
|
<a href='/targets/{{ $personTarget->id }}/edit' class="btn btn-success"><i class="fas fa-edit"></i></a>
|
||||||
|
<a href='/targets/{{ $personTarget->id }}/delete' class="btn btn-danger"><i class="fas fa-trash"></i></a>
|
||||||
|
</div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
@endforeach
|
@endforeach
|
||||||
</table>
|
</table>
|
||||||
<h3>Offene Forderungen</h3>
|
<h3>Offene Forderungen</h3>
|
||||||
<table border='1'>
|
<table class='table table-bordered table-striped'>
|
||||||
<tr>
|
<tr>
|
||||||
<th>Datum</th>
|
<th>Datum</th>
|
||||||
<th>Position</th>
|
<th>Position</th>
|
||||||
<th>Person / Firma</th>
|
<th>Person / Firma</th>
|
||||||
<th>Betrag</th>
|
<th>Soll</th>
|
||||||
|
<th>Ist</th>
|
||||||
|
<th>Differenz</th>
|
||||||
<th>Aktion</th>
|
<th>Aktion</th>
|
||||||
</tr>
|
</tr>
|
||||||
@foreach ($personTargets['receivables'] as $personTarget)
|
@foreach ($personTargets['receivables'] as $personTarget)
|
||||||
@@ -53,9 +57,11 @@
|
|||||||
<td>{!! formatAmount($personTarget->actualsSum()) !!}</td>
|
<td>{!! formatAmount($personTarget->actualsSum()) !!}</td>
|
||||||
<td>{!! formatAmount($personTarget->difference()) !!}</td>
|
<td>{!! formatAmount($personTarget->difference()) !!}</td>
|
||||||
<td>
|
<td>
|
||||||
<a href='/targets/{{ $personTarget->id }}'>Anzeigen</a><br />
|
<div class="btn-group" role="group" aria-label="Basic example">
|
||||||
<a href='/targets/{{ $personTarget->id }}/edit'>Bearbeiten</a><br />
|
<a href='/targets/{{ $personTarget->id }}' class="btn btn-primary"><i class="fas fa-eye"></i></a>
|
||||||
<a href='/targets/{{ $personTarget->id }}/delete'>Löschen</a>
|
<a href='/targets/{{ $personTarget->id }}/edit' class="btn btn-success"><i class="fas fa-edit"></i></a>
|
||||||
|
<a href='/targets/{{ $personTarget->id }}/delete' class="btn btn-danger"><i class="fas fa-trash"></i></a>
|
||||||
|
</div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
@endforeach
|
@endforeach
|
||||||
|
|||||||
Reference in New Issue
Block a user