add User, Mail verify, rights, Change Mail, fewo invoice PDF

This commit is contained in:
Kevin Adametz 2019-04-16 19:47:33 +02:00
parent 26ecb09cdc
commit 7abfe3f700
44 changed files with 3041 additions and 1125 deletions

View file

@ -1,4 +1,4 @@
@extends('layouts.layout-2-2')
@extends('layouts.layout-2')
@section('content')
<div class="card mb-4">
@ -13,7 +13,7 @@
</div>
</div>
{!! Form::open(['url' => route('admin_lead_change_mail', [$user->id]) ]) !!}
{!! Form::open(['url' => route('admin_user_change_mail', [$user->id]) ]) !!}
<div class="form-group row">
<label class="col-form-label col-sm-2 text-sm-right">{{__('New E-Mail Address')}}*</label>
@ -42,7 +42,7 @@
<div class="form-group row">
<div class="col-sm-10 ml-sm-auto">
<button type="submit" class="btn btn-primary">{{__('save')}}</button>
<a href="{{ route('admin_lead_edit', [$user->id]) }}" class="btn btn-default">{{ __('back') }}</a>
<a href="{{ route('admin_user_edit', [$user->id]) }}" class="btn btn-default">{{ __('back') }}</a>
</div>
</div>

View file

@ -1,4 +1,4 @@
@extends('layouts.layout-2-2')
@extends('layouts.layout-2')
@section('content')
<div class="row">

View file

@ -17,19 +17,15 @@
@endif
<h4 class="font-weight-bold py-3 mb-4">
{{ __('Create/Edit Contact') }}
User bearbeiten/anlegen
</h4>
{!! Form::open(['url' => route('admin_user_store'), 'class' => 'form-horizontal', 'id'=>'lead-form-validation']) !!}
<input type="hidden" name="user_id" id="user_id" value="@if($user->id>0){{$user->id}}@else new @endif">
{{-- @include('user.form') --}}
{!! Form::open(['url' => route('admin_user_store'), 'class' => 'form-horizontal']) !!}
<input type="hidden" name="user_id" id="user_id" value="@if($user->id>0){{$user->id}}@else new @endif">
@include('admin.user_form')
<div class="text-left mt-3">
<button type="submit" class="btn btn-submit">{{ __('save') }}</button>&nbsp;
<a href="{{ route('admin_users') }}" class="btn btn-default">{{ __('abort') }}</a>
</div>

View file

@ -0,0 +1,47 @@
<div class="card mb-4">
<h5 class="card-header">
{{ __('Daten') }}
</h5>
<div class="card-body">
<div class="form-group">
<label class="form-label" for="position_text">{{ __('Name') }}</label>
{{ Form::text('name', $user->name, array('placeholder'=>__('Name'), 'class'=>'form-control', 'id'=>'name', 'required')) }}
</div>
<hr>
@if($user->email)
<div class="form-row">
<div class="form-group col-md-6">
<label class="form-label" for="email">{{ __('E-Mail Address') }}*</label>
{{ Form::text('email', $user->email, array('placeholder'=>'E-Mail', 'class'=>'form-control', 'id'=>'email', 'readonly'=>true)) }}
</div>
<div class="form-group col-md-6">
<label class="form-label" for="email-confirm">{{ __('Confirm E-Mail') }}</label>
{{ Form::text('email-confirm', $user->email, array('placeholder'=>__('Confirm E-Mail'), 'class'=>'form-control', 'id'=>'email-confirm', 'readonly'=>true)) }}
</div>
</div>
@if(isset($isFromAdmin))
@if(count($user->user_update_email) > 0)
<p class="badge badge-primary" style=" color:#fff;">{{ $user->user_update_email->first()->email }} {{__('waiting for activation since')}} | {{ $user->user_update_email->first()->created_at->format('d.m.Y H:i') }}</p><br>
@endif
<a href="{{ route('admin_user_change_mail', [$user->id]) }}" class="btn btn-default btn-sm"> {{ __('Contact') }} {{__('Change E-Mail')}}</a>
@else
<a href="{{ route('user_update_email', [$user->id]) }}" class="btn btn-default btn-sm">{{__('Change E-Mail')}}</a>
@endif
@else
<div class="form-row">
<div class="form-group col-md-6">
<label class="form-label" for="email">{{ __('E-Mail Address') }}*</label>
{{ Form::text('email', $user->email, array('placeholder'=>'E-Mail', 'class'=>'form-control', 'id'=>'email')) }}
</div>
<div class="form-group col-md-6">
<label class="form-label" for="email-confirm">{{ __('Confirm E-Mail') }}</label>
{{ Form::text('email-confirm', $user->email, array('placeholder'=>__('Confirm E-Mail'), 'class'=>'form-control', 'id'=>'email-confirm')) }}
</div>
</div>
@endif
</div>
</div>

View file

@ -9,9 +9,11 @@
<div class="card">
<div class="card-datatable table-responsive">
<div class="card-datatable table-responsive py-2">
<div class="mr-4 mb-2 text-right">
<a href="{{ route('admin_user_edit', ['new']) }}" class="btn btn-sm btn-primary">Neuen User anlegen</a>
</div>
<table class="datatables-users table table-striped table-bordered">
<thead>
<tr>
<th>{{__('edit')}}</th>
@ -21,10 +23,12 @@
<th>{{__('verified')}}</th>
<th>{{__('active')}}</th>
<th>{{__('delete')}}</th>
</tr>
</thead>
</table>
<div class="mr-4 mt-2 text-right">
<a href="{{ route('admin_user_edit', ['new']) }}" class="btn btn-sm btn-primary">Neuen User anlegen</a>
</div>
</div>
</div>