gitmedia/mivita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Registierung Korrekturen

Browse source
This commit is contained in:
Kevin Adametz 2020-04-29 20:06:51 +02:00
parent 8e4bb0c2f6
commit d8b5206031
70 changed files with 1192 additions and 569 deletions
Download patch file Download diff file Expand all files Collapse all files

14
resources/views/admin/lead/edit.blade.php
View file

@ -31,16 +31,8 @@
<a href="{{ route('admin_leads') }}" class="btn btn-default">{{ __('back') }}</a>
</div>
@if($m_data_load)
@include('admin.lead.m_data_form_edit')
@endif
@include('admin.lead.m_register_data')
@if(!$m_data_load)
@include('admin.lead.m_data_form')
@endif
@if(!$user->id || $user->id === 'new')
@include('user.user_new_form')
@include('user.data_verify')
@ -62,20 +54,20 @@
<form class="modal-content" action="{{route('admin_lead_edit', [$user->id])}}?show={{$show}}" method="post">
@csrf
<div class="modal-header">
<h5 class="modal-title"> {{__('Inhalte mivita')}} <span class="font-weight-light">{{__('create/edit')}}</span></h5>
<h5 class="modal-title"> {{__('Daten mivita')}} <span class="font-weight-light">{{__('edit')}}</span></h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</div>
<div class="modal-body">
<div class="form-row">
<div class="form-group col">
<label for="name" class="form-label">{{__('Passwort')}}</label>
<label for="name" class="form-label">{{__('Passwort eingeben')}}</label>
<input type="text" class="form-control" name="edit_m_data_key" placeholder="mivita">
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{__('close')}}</button>
<button type="submit" class="btn btn-primary">{{__('save')}}</button>
<button type="submit" class="btn btn-primary">{{__('öffnen')}}</button>
</div>
</form>
</div>

20
resources/views/admin/lead/m_data_form.blade.php
View file

@ -9,22 +9,12 @@
</div>
</div>
@endif
<div class="card mb-4">
<h5 class="card-header">
<a href="#" class="@if($show !== 'check_lead') collapsed @endif" data-toggle="collapse" data-target="#collapseMDataForm" aria-expanded="@if($show !== 'check_lead') false @else true @endif" aria-controls="collapseMDataForm">
<i class="fa fa-caret-expand"></i> {{ __('mivita interne Daten') }}
</a>
<div class="card-body">
<div class="float-right">
<button type="button" class="btn icon-btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-edit-m-data">
<span class="far fa-edit"></span>
<button type="button" class="btn btn-sm btn-secondary" data-toggle="modal" data-target="#modals-edit-m-data">
<span class="far fa-edit"></span> Berater Daten bearbeiten
</button>
</div>
</h5>
<div class="collapse @if($show === 'check_lead') show @endif" id="collapseMDataForm">
<div class="card-body mb-4 pb-1">
<div class="table-responsive">
<table class="table card-table m-0">
<tbody>
@ -54,6 +44,6 @@
</table>
</div>
</div>
</div>
</div>

14
resources/views/admin/lead/m_data_form_edit.blade.php
View file

@ -1,14 +1,11 @@
<div class="card mb-4">
<h5 class="card-header">
{{ __('mivita interne Daten') }}
</h5>
<input type="hidden" name="m_data_edit" value="TSOK">
<input type="hidden" name="m_data_edit" value="TSOK">
<div class="card-body">
<div class="form-row">
<div class="form-group col-md-4">
<label for="m_account" class="form-label">{{ __('Account ID') }}</label>
{{ Form::text('m_account', $user->account->m_account, array('placeholder'=>__(' Account ID'), 'class'=>'form-control', 'id'=>'m_account')) }}
<label for="m_account" class="form-label">{{ __('Account ID') }} (unique)</label>
<span class="badge badge-secondary float-right">Nächste freie ID: {{$next_account_id}}</span>
{{ Form::text('m_account', $user->account->m_account, array('placeholder'=>__('Account ID'), 'class'=>'form-control', 'id'=>'m_account')) }}
</div>
<div class="form-group col-md-4">
<label class="form-label">{{ __('Karriere-Level') }}</label>
@ -47,7 +44,6 @@
<div class="text-left mt-3">
<button type="submit" class="btn btn-submit btn-primary">{{ __('save') }}</button>&nbsp;
</div>
<hr>
</div>
</div>

48
resources/views/admin/lead/m_register_data.blade.php
View file

@ -1,13 +1,20 @@
<div class="card mb-4">
<div class="card mb-4">
<h5 class="card-header">
<a href="#" class="@if($show !== 'check_lead') collapsed @endif" data-toggle="collapse" data-target="#collapseMRegister" aria-expanded="@if($show !== 'check_lead') false @else true @endif" aria-controls="collapseMRegister">
<i class="fa fa-caret-expand"></i> {{__('Activities') }}
<a href="#" class="@if($show !== 'check_lead' || !$m_data_load) collapsed @endif" data-toggle="collapse" data-target="#collapseMRegister" aria-expanded="@if($show !== 'check_lead' || !$m_data_load) false @else true @endif" aria-controls="collapseMRegister">
<i class="fa fa-caret-expand"></i> {{__('Berater Status') }}
</a>
</h5>
<div class="collapse @if($show === 'check_lead') show @endif" id="collapseMRegister">
<div class="collapse @if($show === 'check_lead' || $m_data_load) show @endif" id="collapseMRegister">
@if($m_data_load)
@include('admin.lead.m_data_form_edit')
@endif
@if(!$m_data_load)
@include('admin.lead.m_data_form')
@endif
<div class="card-body mb-2 pb-1">
<div class="card-body mb-2 pb-1">
<div class="row">
<div class="col-sm-6">
@if($user->payment_shop)
@ -69,11 +76,10 @@
<hr>
@if($user->release_account)
<strong>Registrierung abgeschlossen {{ $user->getReleaseAccountFormat() }}</strong><br>
<a href="{{route('admin_lead_released', ['completed', $user->id])}}" class="btn btn-info" onclick="return confirm('Alle Daten vollständig und Berater freischalten?');">Daten vollständigt => Berater freischalten</a>
<a href="{{route('admin_lead_released', ['completed', $user->id])}}" class="btn btn-success" onclick="return confirm('Alle Daten vollständig und Berater freischalten?');">Die Daten sind vollständigt => Berater freischalten</a>
<button type="button" class="btn btn-sm btn-danger float-right" data-toggle="modal" data-target="#modals-register-m-data">
nicht vollständigt => E-Mail senden
Berater eine E-Mail senden => Daten nicht vollständigt
</button>
@else
<strong><span class="text-danger">Berater muss Registrierung noch abschließen</span></strong>
@endif
@ -81,9 +87,6 @@
</div>
</div>
<hr>
</div>
@if($user->files->count())
<div class="card-body mb-4 pb-1">
@ -119,6 +122,29 @@
</table>
</div>
<hr>
@if($user->account_id)
@if($user->account->getNotice('business_license') === 'later')
<div class="row">
<div class="col-12">
<div class="bg-warning rounded py-2 px-3">
{{__('register.business_license_later')}}
</div>
</div>
</div>
@endif
@if($user->account->getNotice('business_license') === 'non')
<div class="row">
<div class="col-12">
<div class="bg-warning rounded py-2 px-3">
<div class="font-weight-semibold mb-1">{{__('register.business_license_non')}}</div>
<em>{{$user->account->getNotice('business_license_reason')}}</em>
</div>
</div>
</div>
@endif
@endif
<div class="table-responsive">
<table class="table card-table m-0">
<tbody>

38
resources/views/admin/product/index.blade.php
View file

@ -2,22 +2,30 @@
@section('content')
<div class="card">
<h6 class="card-header">
{{__('Produkte')}}
<label class="custom-control custom-checkbox float-right mb-0">
<input type="checkbox" class="custom-control-input show-active-products" name="show_active_products" @if(Auth::user()->getSetting('show_active_products') === "true") checked @endif>
<span class="custom-control-label font-style-normal font-weight-normal">nur aktive anzeigen</span>
</label>
</h6>
<div class="card-datatable table-responsive">
<table class="datatables-style table table-striped table-bordered">
<table class="datatables-product table table-striped table-bordered">
<thead>
<tr>
<th style="max-width: 60px;">&nbsp;</th>
<th>{{__('Pos')}}</th>
<th>{{__('Bild')}}</th>
<th>{{__('Name')}}</th>
<th>{{__('Artikelnummer')}}</th>
<th>{{__('Kategorie')}}</th>
<th>{{__('Points')}}</th>
<th>{{__('Preis')}}</th>
<th>{{__('Inhalt')}}</th>
<th>{{__('Einheit')}}</th>
<th>{{__('Grundpreis')}}</th>
<th>{{__('Gewicht')}}</th>
<th>{{__('Status')}}</th>
<th></th>
</tr>
@ -36,16 +44,19 @@
<img class="img-fluid" alt="" style="max-height: 80px" src="{{ route('product_image', [$value->images->first()->slug]) }}">
@endif
</td>
<td>{{ $value->name }}</td>
<td>{{ $value->name }}</td>
<td>{{ $value->number }}</td>
<td>
@foreach($value->categories as $category)
{{ $category->category->name }}
<div style="white-space: nowrap">{{ $category->category->name }}</div>
@endforeach
</td>
<td>{{ $value->points }}</td>
<td>{{ $value->getFormattedPrice() }}</td>
<td>{{ $value->contents_total }}</td>
<td>{{ $value->getUnitType() }}</td>
<td>{{ $value->getBasePriceFormatted() }}</td>
<td>{{ $value->weight }}</td>
<td data-sort="{{ $value->active }}">@if($value->active) <span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>@else<span class="badge badge-pill badge-danger"><i class="fa fa-times"></i></span>@endif</td>
<td><a class="text-info" href="{{ route('admin_product_copy', [$value->id]) }}" onclick="return confirm('{{__('Eintrag kopieren?')}}');"><i class="far fa-copy"></i></a> &nbsp;
<a class="text-danger" href="{{ route('admin_product_delete', [$value->id]) }}" onclick="return confirm('{{__('Really delete entry?')}}');"><i class="far fa-trash-alt"></i></a></td>
@ -63,23 +74,22 @@
<script>
$( document ).ready(function() {
$('.datatables-style').dataTable({
$('.datatables-product').dataTable({
"bLengthChange": false,
"iDisplayLength": 50,
"aoColumns": [
{ "sWidth": "6%" },
{ "sWidth": "8%" },
{ "sWidth": "19%" },
{ "sWidth": "19%" },
{ "sWidth": "30%" },
{ "sWidth": "10%" },
{ "sWidth": "10%" },
],
"language": {
"url": "/js/German.json"
}
});
$('.show-active-products').on('change', function () {
console.log($(this));
console.log($(this).prop('checked'));
document.location.search = $(this).attr('name')+"="+$(this).prop('checked');
// window.location.reload(true);
})
});
</script>
@endsection

15
resources/views/admin/sales/customer_detail.blade.php Normal file
View file

@ -0,0 +1,15 @@
@extends('layouts.layout-2')
@section('content')
<h4 class="font-weight-bold py-2 mb-2">
{{ __('Bestellung Kunde') }}
</h4>
<div class="card">
<p>Ansicht Bestellung</p>
</div>
@endsection

2
resources/views/admin/sales/customers.blade.php
View file

@ -4,7 +4,7 @@
<h4 class="font-weight-bold py-2 mb-2">
{{ __('Bestellungen Berater') }}
{{ __('Bestellungen Kunden') }}
</h4>

14
resources/views/admin/sales/user_detail.blade.php Normal file
View file

@ -0,0 +1,14 @@
@extends('layouts.layout-2')
@section('content')
<h4 class="font-weight-bold py-2 mb-2">
{{ __('Bestellung Berater') }}
</h4>
<div class="card">
<p>Ansicht Bestellung</p>
</div>
@endsection