gitmedia/gruene-seele
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

User Order all Margins / Checkout

Browse source
This commit is contained in:
Kevin Adametz 2021-01-22 15:54:51 +01:00
parent a96d7d5c77
commit 224bf9e951
92 changed files with 3551 additions and 561 deletions
Download patch file Download diff file Expand all files Collapse all files

6
resources/views/admin/customer/_detail.blade.php
View file

@ -70,14 +70,14 @@
</div>
</div>
@endif
<div class="text-muted small">Zugewiesener Berater</div>
<div class="text-muted small">Zugewiesener Vertriebspartner</div>
@if($shopping_user->is_like)
<button type="button" class="btn btn-xs btn-outline-info" data-toggle="modal" data-target="#modals-load-content"
data-id="{{$shopping_user->id}}"
data-action="shopping-user-is-like-member"
data-back="{{route('admin_customer_detail', [$shopping_user->id])}}"
data-modal="modal-xl"
data-route="{{route('modal_load')}}"><span class="fa fa-edit"></span> Berater zuordnen</button>
data-route="{{route('modal_load')}}"><span class="fa fa-edit"></span> Vertriebspartner zuordnen</button>
@else
@if($shopping_user->member)
<a class="btn btn-xs btn-outline-primary" href="{{route('admin_lead_edit', [$shopping_user->member->id])}}"><i class="ion ion-ios-contacts"></i></a>
@ -101,7 +101,7 @@
@endif
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">ist Berater</div>
<div class="text-muted small">ist Vertriebspartner</div>
@if($shopping_user->auth_user)
<span class="badge badge-pill badge-success"><i class="fa fa-check"></i></span>
<a class="btn btn-xs btn-outline-primary" href="{{route('admin_lead_edit', [$shopping_user->auth_user->id])}}"><i class="ion ion-ios-contacts"></i></a>

14
resources/views/admin/customer/index.blade.php
View file

@ -11,16 +11,16 @@
<div class="card-header">
<div class="form-row align-items-center">
{{-- <div class="col-sm-5 mb-2">
<label class="form-label" for="filter_user_shop_id">Filter Kunden/Berater</label>
<label class="form-label" for="filter_user_shop_id">Filter Kunden/Vertriebspartner</label>
<select class="custom-select" name="filter_customer_member" id="filter_customer_member">
<option value="">Filter aus</option>
<option value="customers" @if(get_user_attr('filter_customer_member') === 'customers') selected @endif>Kunden</option>
<option value="members" @if(get_user_attr('filter_customer_member') === 'members') selected @endif>Berater</option>
<option value="members" @if(get_user_attr('filter_customer_member') === 'members') selected @endif>Vertriebspartner</option>
</select>
</div>--}}
<div class="col-sm-10 mb-2">
<label class="form-label" for="filter_user_shop_id">Filter zugewiesener Berater</label>
<label class="form-label" for="filter_user_shop_id">Filter zugewiesener Vertriebspartner</label>
<select class="custom-select" name="filter_member_id" id="filter_member_id">
<option value="">Filter aus</option>
@foreach($filter_members as $member)
@ -38,7 +38,7 @@
</div>
<div class="card-datatable table-responsive">
<div class="ml-4">
<!--<a href="{{ route('admin_lead_edit', ['new']) }}" class="btn btn-sm btn-primary">{{__('Neuen Berater erstellen')}}</a> -->
<!--<a href="{{ route('admin_lead_edit', ['new']) }}" class="btn btn-sm btn-primary">{{__('Neuen Vertriebspartner erstellen')}}</a> -->
</div>
<table class="datatables-customers table table-striped table-bordered" id="datatables-customers">
<thead>
@ -46,7 +46,7 @@
<th>#</th>
<th>{{__('Nummer')}}</th>
<th>{{__('E-Mail')}}</th>
<th>{{__('ist Berater')}}</th>
<th>{{__('ist Vertriebspartner')}}</th>
<th>{{__('Anrede')}}</th>
<th>{{__('Firma')}}</th>
<th>{{__('Vorname')}}</th>
@ -56,7 +56,7 @@
<th>{{__('Land')}}</th>
<th>{{__('Käufe')}}</th>
<th>{{__('Newsletter')}}</th>
<th>{{__('zugewiesener Berater')}}</th>
<th>{{__('zugewiesener Vertriebspartner')}}</th>
<th>{{__('Datum')}}</th>
</tr>
</thead>
@ -66,7 +66,7 @@
</table>
<div class="mt-4 ml-4">
<!-- <a href="{{ route('admin_lead_edit', ['new']) }}" class="btn btn-sm btn-primary">{{__('Neuen Berater erstellen')}}</a> -->
<!-- <a href="{{ route('admin_lead_edit', ['new']) }}" class="btn btn-sm btn-primary">{{__('Neuen Vertriebspartner erstellen')}}</a> -->
</div>
</div>
</div>

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

@ -18,9 +18,9 @@
<h4 class="font-weight-bold py-2 mb-2">
@if(!$user->id || $user->id === 'new')
{{ __('Neuen Berater erstellen') }}
{{ __('Neuen Vertriebspartner erstellen') }}
@else
{{ __('Berater bearbeiten') }}
{{ __('Vertriebspartner bearbeiten') }}
@endif
</h4>
@ -79,12 +79,12 @@
<form class="modal-content" action="{{route('admin_lead_released', ['incomplete', $user->id])}}?show={{$show}}" method="post">
@csrf
<div class="modal-header">
<h5 class="modal-title"> {{__('Berater Daten nicht vollständig')}}</h5>
<h5 class="modal-title"> {{__('Vertriebspartner Daten nicht vollständig')}}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</div>
<div class="modal-body">
<p>Berater eine E-Mail senden, dass die Daten nicht vollständig sind?<br>
Vervollständige die Nachricht welche Daten fehlerhaft sind, die Nachricht wird an den Berater gesendet. Anrede, Links, Absender wird automatisch in die E-Mail eingefügt. </p>
<p>Vertriebspartner eine E-Mail senden, dass die Daten nicht vollständig sind?<br>
Vervollständige die Nachricht welche Daten fehlerhaft sind, die Nachricht wird an den Vertriebspartner gesendet. Anrede, Links, Absender wird automatisch in die E-Mail eingefügt. </p>
<div class="form-row">
<div class="form-group col">

6
resources/views/admin/lead/index.blade.php
View file

@ -4,13 +4,13 @@
<h4 class="font-weight-bold py-2 mb-2">
{{ __('Berater') }}
{{ __('Vertriebspartner') }}
</h4>
<div class="card">
<div class="card-datatable table-responsive">
{{-- <div class="ml-4">
<a href="{{ route('admin_lead_edit', ['new']) }}" class="btn btn-sm btn-primary">{{__('Neuen Berater erstellen')}}</a>
<a href="{{ route('admin_lead_edit', ['new']) }}" class="btn btn-sm btn-primary">{{__('Neuen Vertriebspartner erstellen')}}</a>
</div>--}}
<table class="datatables-leads table table-striped table-bordered">
@ -36,7 +36,7 @@
</table>
{{-- <div class="mt-4 ml-4">
<a href="{{ route('admin_lead_edit', ['new']) }}" class="btn btn-sm btn-primary">{{__('Neuen Berater erstellen')}}</a>
<a href="{{ route('admin_lead_edit', ['new']) }}" class="btn btn-sm btn-primary">{{__('Neuen Vertriebspartner erstellen')}}</a>
</div> --}}
</div>
</div>

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

@ -12,7 +12,7 @@
<div class="card-body">
<div class="float-right">
<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
<span class="far fa-edit"></span> Vertriebspartner Daten bearbeiten
</button>
</div>
<div class="table-responsive">

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

@ -2,7 +2,7 @@
<div class="card mb-4">
<h5 class="card-header">
<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') }}
<i class="fa fa-caret-expand"></i> {{__('Vertriebspartner Status') }}
</a>
</h5>
<div class="collapse @if($show === 'check_lead' || $m_data_load) show @endif" id="collapseMRegister">
@ -20,10 +20,10 @@
@if($user->payment_account )
<p><span class="ion ion-md-checkmark-circle-outline text-primary"></span>
<strong>{{__('Berater-Account aktiv')}}</strong> {{__('bis zum:')}} {{ $user->getPaymentAccountDateFormat() }}</p>
<strong>{{__('Vertriebspartner-Account aktiv')}}</strong> {{__('bis zum:')}} {{ $user->getPaymentAccountDateFormat() }}</p>
@else
<p><span class="ion ion-md-close-circle-outline text-danger"></span>
<strong>{{__('Berater-Account inaktiv')}}</strong></p>
<strong>{{__('Vertriebspartner-Account inaktiv')}}</strong></p>
@endif
@if($user->active == 1)
@ -31,7 +31,7 @@
<strong>{{__('Daten vollständig, freigeschaltet')}}</strong>: {{ $user->getActiveDateFormat() }}</p>
@if($user->files->count())
@foreach($user->files()->whereIdentifier('contract')->get() as $file)
<a class="btn btn-secondary" href="{{ route('storage_file', [$file->id, 'user']) }}" target="_blank">Beratervertrag.pdf</a>
<a class="btn btn-secondary" href="{{ route('storage_file', [$file->id, 'user']) }}" target="_blank">Vertriebspartnervertrag.pdf</a>
@endforeach
@endif
@else
@ -69,12 +69,12 @@
<hr>
@if($user->release_account)
<strong>Registrierung abgeschlossen {{ $user->getReleaseAccountFormat() }}</strong><br>
<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>
<a href="{{route('admin_lead_released', ['completed', $user->id])}}" class="btn btn-success" onclick="return confirm('Alle Daten vollständig und Vertriebspartner freischalten?');">Die Daten sind vollständigt => Vertriebspartner freischalten</a>
<button type="button" class="btn btn-sm btn-danger float-right" data-toggle="modal" data-target="#modals-register-m-data">
Berater eine E-Mail senden => Daten nicht vollständigt
Vertriebspartner eine E-Mail senden => Daten nicht vollständigt
</button>
@else
<strong><span class="text-danger">Berater muss Registrierung noch abschließen</span></strong>
<strong><span class="text-danger">Vertriebspartner muss Registrierung noch abschließen</span></strong>
@endif
@endif
</div>

207
resources/views/admin/level/edit.blade.php Executable file
View file

@ -0,0 +1,207 @@
@extends('layouts.layout-2')
@section('content')
@if ($errors->any())
<div class="row">
<div class="col-sm-12">
<div class="alert alert-danger">
<ul>
@foreach ($errors->all() as $error)
<li>{{ $error }}</li>
@endforeach
</ul>
</div>
</div>
</div>
@endif
<h4 class="font-weight-bold py-2 mb-2">
{{ __('Create/Edit Rolle') }}
</h4>
<div class="text-left mt-0 mb-2">
<a href="{{ route('admin_levels') }}" class="btn btn-default">{{ __('back') }}</a>
</div>
<div class="card mb-2">
{!! Form::open(['url' => route('admin_level_store',), 'class' => 'form-horizontal', 'id'=>'']) !!}
<input type="hidden" name="id" value="@if($value->id>0){{$value->id}}@else new @endif">
<h5 class="card-header">
{{ __('Rolle') }}
</h5>
<div class="card-body">
<div class="form-row">
<div class="form-group col">
<label for="name" class="form-label">{{__('Name')}}*</label>
{{ Form::text('name', $value->name, array('placeholder'=>__('Bezeichnung'), 'class'=>'form-control', 'required')) }}
</div>
</div>
<div class="form-row">
<div class="form-group col">
<label for="content" class="form-label">{{__('Beschreibung')}}</label>
{{ Form::textarea('content', $value->content, array('placeholder'=>__('Beschreibung'), 'class'=>'form-control summernote-small')) }}
<p> <i>Platzhalter ##mehr lesen## </i></p>
</div>
</div>
<div class="form-row">
<div class="form-group col-12">
<label class="custom-control custom-checkbox m-2">
{!! Form::checkbox('partner_provision', 1, $value->partner_provision, ['class'=>'custom-control-input']) !!}
<span class="custom-control-label">Vertriebspartner Provision berechnen</span>
</label>
</div>
</div>
<div class="form-row">
<div class="form-group col-6">
<label class="custom-control custom-checkbox m-2">
{!! Form::checkbox('active', 1, $value->active, ['class'=>'custom-control-input']) !!}
<span class="custom-control-label">{{__('active')}}</span>
</label>
</div>
<div class="form-group col-6">
{{ Form::text('pos', $value->pos, array('placeholder'=>__('Number to move the position if necessary'), 'class'=>'form-control')) }}
</div>
</div>
@if(isset($trans))
<hr>
@foreach($trans as $tran)
@if($tran != 'de')
<div class="form-row">
<div class="form-group col">
<label for="name" class="form-label">{{__('Translate')}} <strong style="text-transform: uppercase">{{$tran}}</strong></label>
<input type="text" class="form-control" name="trans[{{$tran}}]" id="trans_{{$tran}}" placeholder="">
</div>
</div>
@endif
@endforeach
@endif
<div class="text-left mt-0 mb-2">
<button type="submit" class="btn btn-secondary" name="action" value="user_level">{{ __('save') }}</button>&nbsp;
</div>
</div>
{!! Form::close() !!}
</div>
@if($value->id>0)
<div class="card mb-2">
<h6 class="card-header">
{{__('Staffelpreise')}}
</h6>
<div class="card-datatable table-responsive">
<table class="datatables-style table table-striped table-bordered">
<thead>
<tr>
<th style="max-width: 60px;">&nbsp;</th>
<th>{{__('Preis ab')}} &euro;</th>
<th>{{__('Handelsspanne')}} %</th>
<th>{{__('Provision')}} %</th>
<th></th>
</tr>
</thead>
<tbody>
@foreach($value->user_level_margins as $user_level_margin)
<tr>
<td>
<button type="button" class="btn icon-btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-user-level-margin"
data-id="{{ $user_level_margin->id }}"
data-price_from="{{ $user_level_margin->getFormattedPriceFrom() }}"
data-trading_margin="{{ $user_level_margin->getFormattedTradingMargin() }}"
data-commission="{{ $user_level_margin->getFormattedCommission() }}">
<span class="far fa-edit"></span>
</button>
</td>
<td>{{ $user_level_margin->getFormattedPriceFrom() }}</td>
<td>{{ $user_level_margin->getFormattedTradingMargin() }}</td>
<td>{{ $user_level_margin->getFormattedCommission() }}</td>
<td><a class="text-danger" href="{{ route('admin_level_delete', ['user_level_margin', $user_level_margin->id]) }}" onclick="return confirm('{{__('Really delete entry?')}}');"><i class="far fa-trash-alt"></i></a></td>
</tr>
@endforeach
</tbody>
</table>
<div class="mt-4 ml-4">
<button type="button" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-user-level-margin"
data-id="new"
data-price_from=""
data-trading_margin=""
data-commission=""
>{{__('Neuen Staffelpreis erstellen')}}</button>
</div>
</div>
</div>
<!-- Modal template price -->
<div class="modal fade" id="modals-user-level-margin">
<div class="modal-dialog">
<form class="modal-content" action="{{ route('admin_level_store') }}" method="post">
@csrf
<input type="hidden" name="id">
<input type="hidden" name="user_level_id" value="@if($value->id>0){{$value->id}}@else new @endif">
<div class="modal-header">
<h5 class="modal-title"> {{__('Staffelpreis')}} <span class="font-weight-light">{{__('create/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-6">
<label for="price_from" class="form-label">{{__('ab Preis')}}*</label>
<input type="text" class="form-control" name="price_from" placeholder="{{__('Preis in Euro')}}" required>
</div>
</div>
<div class="form-row">
<div class="form-group col-6">
<label for="trading_margin" class="form-label">{{__('Handelspanne')}}</label>
<input type="text" class="form-control" name="trading_margin" placeholder="{{__('in %')}}">
</div>
<div class="form-group col-6">
<label for="commission" class="form-label">{{__('Provision')}}</label>
<input type="text" class="form-control" name="commission" placeholder="{{__('in %')}}">
</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" name="action" value="user_level_margin">{{__('save')}}</button>
</div>
</form>
</div>
</div>
<script>
$( document ).ready(function() {
$('#modals-user-level-margin').on('show.bs.modal', function (event) {
var button = $(event.relatedTarget);
$(this).find(".modal-content input[name='id']").val(button.data('id'));
$(this).find(".modal-body input[name='price_from']").val(button.data('price_from'));
$(this).find(".modal-body input[name='trading_margin']").val(button.data('trading_margin'));
$(this).find(".modal-body input[name='commission']").val(button.data('commission'));
});
});
</script>
@endif
<div class="text-left mt-2 mb-2">
<a href="{{ route('admin_levels') }}" class="btn btn-default">{{ __('back') }}</a>
</div>
@endsection

39
resources/views/admin/level/index.blade.php
View file

@ -20,7 +20,10 @@
@foreach($values as $value)
<tr>
<td>
<button type="button" class="btn icon-btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-default"
<a href="{{route('admin_level_edit', [$value->id])}}" class="btn icon-btn btn-sm btn-primary">
<span class="far fa-edit"></span>
</a>
{{--<button type="button" class="btn icon-btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-default"
data-id="{{ $value->id }}"
data-pos="{{ $value->pos }}"
data-name="{{ $value->name }}"
@ -28,11 +31,10 @@
data-trans_name="{{ json_encode($value->trans_name) }}"
data-active="{{ $value->active }}">
<span class="far fa-edit"></span>
</button>
</button>--}}
</td>
<td>{{ $value->pos }}</td>
<td>{{ $value->name }}</td>
<td>{{ $value->getFormattedMargin() }}</td>
<td>{{ $value->getTranNames() }}</td>
<td data-sort="{{ $value->active }}">{!! get_active_badge($value->active) !!}</td>
</tr>
@ -40,22 +42,47 @@
</tbody>
</table>
<div class="mt-4 ml-4">
<button type="button" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-default"
<a href="{{route('admin_level_edit', ['new'])}}" class="btn btn-sm btn-primary">
{{__('Neue Rolle erstellen')}}
</a>
{{-- <button type="button" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#modals-default"
data-id="new"
data-pos=""
data-name=""
data-content=""
data-active="1"
>{{__('Neue Rolle erstellen')}}</button>
--}}
</div>
</div>
</div>
<script>
$( document ).ready(function() {
$('.datatables-style').dataTable({
"bLengthChange": false,
"iDisplayLength": 50,
"aoColumns": [
{ "sWidth": "8%" },
{ "sWidth": "8%" },
{ "sWidth": "19%" },
{ "sWidth": "19%" },
{ "sWidth": "30%" },
{ "sWidth": "10%" },
{ "sWidth": "8%" },
],
"language": {
"url": "/js/German.json"
}
});
});
</script>
<!-- Modal template -->
<div class="modal fade" id="modals-default">
{{-- <div class="modal fade" id="modals-default">
<div class="modal-dialog">
<form class="modal-content" action="{{ route('admin_level_store') }}" method="post">
@csrf
@ -148,5 +175,5 @@
}
});
});
</script>
</script> --}}
@endsection

16
resources/views/admin/modal/is_like_member.blade.php
View file

@ -7,7 +7,7 @@
<div class="modal-header">
<h5 class="modal-title">
Der Kunde hat ggf. unter einer anderen Email-Adresse bestellt als sonst.
<span class="font-weight-light"> Bitte vor der Bearbeitung prüfen und dem richtigen Berater zuordnen.</span>
<span class="font-weight-light"> Bitte vor der Bearbeitung prüfen und dem richtigen Vertriebspartner zuordnen.</span>
</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</div>
@ -71,7 +71,7 @@
<input type="hidden" name="change_shopping_user" value="true">
<hr>
<p class="font-weight-bold">Zugeordneter Berater:</p>
<p class="font-weight-bold">Zugeordneter Vertriebspartner:</p>
<p>
<span class="text-muted">#{{$current->member->number}}</span><br>
{{$current->member->getFullName()}}<br>
@ -87,7 +87,7 @@
@endif
<label class="custom-control custom-radio mt-3">
<input type="radio" class="custom-control-input" name="is_like_shopping_user_id" value="{{$current->id}}">
<span class="custom-control-label">Nein, das ist ein neuer Kunde, Berater <span class="text-muted">#{{$current->member->number}}</span> zuordnen</span>
<span class="custom-control-label">Nein, das ist ein neuer Kunde, Vertriebspartner <span class="text-muted">#{{$current->member->number}}</span> zuordnen</span>
</label>
</p>
@endif
@ -109,7 +109,7 @@
@if(!$current->member_id)
<label class="custom-control custom-radio mt-3">
<input type="radio" class="custom-control-input" name="is_like_shopping_user_id" value="{{$current->id}}">
<span class="custom-control-label">Nein, das ist ein neuer Kunde, Berater <span class="text-muted">#{{$current->shopping_order->user_shop->user->number}}</span> zuordnen</span>
<span class="custom-control-label">Nein, das ist ein neuer Kunde, Vertriebspartner <span class="text-muted">#{{$current->shopping_order->user_shop->user->number}}</span> zuordnen</span>
</label>
@endif
@else
@ -180,7 +180,7 @@
</div>
<div class="col-sm-12">
<hr>
<p class="font-weight-bold">Zugeordneter Berater:</p>
<p class="font-weight-bold">Zugeordneter Vertriebspartner:</p>
<p>
@if($possible->member_id)
<span class="text-muted">#{{$possible->member->number}}</span><br>
@ -198,10 +198,10 @@
<label class="custom-control custom-radio mt-3">
<input type="radio" class="custom-control-input" name="is_like_shopping_user_id" value="{{$possible->id}}">
<span class="custom-control-label">Stimmt, das ist der gleiche Kunde, Berater <span class="text-muted">#{{$possible->member->number}}</span> zuordnen</span>
<span class="custom-control-label">Stimmt, das ist der gleiche Kunde, Vertriebspartner <span class="text-muted">#{{$possible->member->number}}</span> zuordnen</span>
</label>
@else
Keinem Berater zugeordnet
Keinem Vertriebspartner zugeordnet
@endif
</p>
</div>
@ -222,7 +222,7 @@
<div class="form-group col">
<label class="custom-control custom-checkbox mt-3">
<input type="checkbox" class="custom-control-input" name="send_member_mail" value="send" checked>
<span class="custom-control-label">zugeordneten Berater die Bestellung als E-Mail zusenden</span>
<span class="custom-control-label">zugeordneten Vertriebspartner die Bestellung als E-Mail zusenden</span>
</label>
</div>
</div>

14
resources/views/admin/modal/member.blade.php
View file

@ -1,7 +1,7 @@
{!! Form::open(['url' => $route, 'class' => 'modal-content', 'enctype' => 'multipart/form-data']) !!}
<div class="modal-header">
<h5 class="modal-title">
{{ __('Berater') }}
{{ __('Vertriebspartner') }}
<span class="font-weight-light">zuweisen/ändern</span>
</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
@ -19,11 +19,11 @@
</div>
<div class="form-row">
<div class="form-group col">
<label for="change_member_id" class="form-label">{{ __('Berater zuweisen') }}*</label>
<label for="change_member_id" class="form-label">{{ __('Vertriebspartner zuweisen') }}*</label>
<select class="selectpicker" name="change_member_id" id="change_member_id" data-style="btn-light" data-live-search="true" required>
{!! HTMLHelper::getMembersOptions($value->member_id, true) !!}
</select>
<p class="text-muted">Es werden nur aktive Berater mit aktiven Accounts angezeigt.</p>
<p class="text-muted">Es werden nur aktive Vertriebspartner mit aktiven Accounts angezeigt.</p>
</div>
</div>
<input type="hidden" name="customer_set_member_for" value="0">
@ -32,11 +32,11 @@
<div class="custom-controls-stacked">
<label class="custom-control custom-radio">
<input name="customer_set_member_for" value="0" type="radio" class="custom-control-input" checked="">
<span class="custom-control-label">Nur dieser Bestellung einen neuen Berater zuweisen</span>
<span class="custom-control-label">Nur dieser Bestellung einen neuen Vertriebspartner zuweisen</span>
</label>
<label class="custom-control custom-radio">
<input name="customer_set_member_for" value="1" type="radio" class="custom-control-input">
<span class="custom-control-label">Jeder Bestellung vom Kunden #{{$value->shopping_user->number}} einen neuen Berater zuweisen</span>
<span class="custom-control-label">Jeder Bestellung vom Kunden #{{$value->shopping_user->number}} einen neuen Vertriebspartner zuweisen</span>
</label>
</div>
@endif
@ -46,11 +46,11 @@
<div class="custom-controls-stacked">
<label class="custom-control custom-radio">
<input name="customer_set_member_for" value="0" type="radio" class="custom-control-input" checked="">
<span class="custom-control-label">Nur diesen Kunden Bestellung einen neuen Berater zuweisen</span>
<span class="custom-control-label">Nur diesen Kunden Bestellung einen neuen Vertriebspartner zuweisen</span>
</label>
<label class="custom-control custom-radio">
<input name="customer_set_member_for" value="1" type="radio" class="custom-control-input">
<span class="custom-control-label">Jeder Bestellung diesen Kunden #{{$value->number}} einen neuen Berater zuweisen</span>
<span class="custom-control-label">Jeder Bestellung diesen Kunden #{{$value->number}} einen neuen Vertriebspartner zuweisen</span>
</label>
</div>
@endif

46
resources/views/admin/modal/user_level_margin.blade.php Normal file
View file

@ -0,0 +1,46 @@
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">
{{ __('Staffelprovision') }} <strong>{{$user->user_level->name}}
</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
</div>
<div class="modal-body">
<input type="hidden" name="action" value="{{$data['action']}}">
<input type="hidden" name="id" value="{{$data['id']}}">
<input type="hidden" name="view" value="{{$data['view']}}">
@if(isset($user) && $user->user_level && $user->user_level->user_level_margins)
<table class="table table-striped" style="border-top: 0">
<thead>
<tr>
<th>Umsatz netto</th>
<th>Handelspanne</th>
<th>Provision Vertriebspartner</th>
</tr>
</thead>
<tbody>
@foreach($user->user_level->user_level_margins as $user_level_margin)
<tr>
<th scope="row">ab {{$user_level_margin->getFormattedPriceFrom()}}</th>
<td>{{$user_level_margin->getFormattedTradingMargin()}} %</td>
<td>{{$user_level_margin->getFormattedCommission()}} %</td>
</tr>
@endforeach
</tbody>
</table>
@endif
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">schließen</button>
</div>
</div>
<script type="text/javascript">
$( document ).ready(function() {
});
</script>

17
resources/views/admin/payment_method/index.blade.php
View file

@ -27,6 +27,7 @@
data-name="{{ $value->name }}"
data-short="{{ $value->short }}"
data-show_at="{{ $value->show_at }}"
data-max_price="{{ $value->getFormattedMaxPrice() }}"
data-default="{{ $value->default }}"
data-active="{{ $value->active }}">
<span class="far fa-edit"></span>
@ -47,6 +48,7 @@
data-pos=""
data-name=""
data-short=""
data-max_price=""
data-show_at="9"
data-default="1"
data-active="1"
@ -84,9 +86,16 @@
</div>
</div>
<div class="form-group col-sm-5">
<label class="form-label" for="show_at">{{ __('Produkt anzeigen') }}</label>
{{ Form::select('show_at', \App\Models\PaymentMethod::$showATs, 9, array('data-live-search'=>'false', 'class'=>'selectpicker', 'id'=>'show_at') ) }}
<div class="form-row">
<div class="form-group col-sm-6">
<label class="form-label" for="show_at">{{ __('Produkt anzeigen') }}</label>
{{ Form::select('show_at', \App\Models\PaymentMethod::$showATs, 9, array('data-live-search'=>'false', 'class'=>'selectpicker', 'id'=>'show_at') ) }}
</div>
<div class="form-group col-sm-6">
<label class="form-label" for="max_price">{{ __('Max. Preis für Zahlung') }}</label>
<input type="text" class="form-control" name="max_price" placeholder="{{__('Aktiv wenn Preis > 0')}}">
</div>
</div>
<div class="form-row">
@ -126,12 +135,12 @@
$(this).find(".modal-content input[name='id']").val(button.data('id'));
$(this).find(".modal-body input[name='name']").val(button.data('name'));
$(this).find(".modal-body input[name='short']").val(button.data('short'));
$(this).find(".modal-body input[name='max_price']").val(button.data('max_price'));
$(this).find(".modal-body input[name='pos']").val(button.data('pos'));
$(this).find(".modal-body select[name='show_at']").val(button.data('show_at'));
$(this).find(".modal-body input[name='active']").prop( "checked", button.data('active'));
$(this).find(".modal-body input[name='default']").prop( "checked", button.data('default'));
$('.selectpicker').selectpicker('refresh');
});

46
resources/views/admin/product/form.blade.php
View file

@ -45,10 +45,7 @@
<label class="form-label" for="copy">{{ __('Produktbeschreibung') }}</label>
{{ Form::textarea('copy', $product->copy , array('placeholder'=>__('Produktbeschreibung'), 'class'=>'form-control summernote', 'id'=>'copy')) }}
</div>
<label class="custom-control custom-checkbox float-right">
{!! Form::checkbox('shipping_addon', 1, $product->shipping_addon, ['class'=>'custom-control-input']) !!}
<span class="custom-control-label">Kompensationprodukt beim Versand für Berater</span>
</label>
</div>
</div>
@ -58,22 +55,18 @@
</h5>
<div class="card-body">
<div class="form-row">
<div class="form-group col-sm-4 col-md-3">
<div class="form-group col-sm-4">
<label class="form-label" for="price">{{ __('Preis VK in EUR (Brutto)') }}</label>
{{ Form::text('price', $product->getFormattedPrice(), array('placeholder'=>__('Preis VK in EUR (Brutto)'), 'class'=>'form-control', 'id'=>'price')) }}
</div>
<div class="form-group col-sm-4 col-md-3">
<label class="form-label" for="price_ek">{{ __('Preis EK in EUR') }}</label>
{{ Form::text('price_ek', $product->getFormattedPriceEk(), array('placeholder'=>__('Preis EK in EUR'), 'class'=>'form-control', 'id'=>'price_ek')) }}
</div>
<div class="form-group col-sm-4 col-md-3">
<div class="form-group col-sm-4">
<label class="form-label" for="tax">{{ __('MwSt in %') }}</label>
{{ Form::text('tax', $product->getFormattedTax(), array('placeholder'=>__('MwSt in %'), 'class'=>'form-control', 'id'=>'tax')) }}
</div>
<div class="form-group col-sm-4 col-md-3">
<div class="form-group col-sm-4">
<label class="form-label" for="price_old">{{ __('Streichpreis in EUR (wenn > 0)') }}</label>
{{ Form::text('price_old', $product->getFormattedPriceOld(), array('placeholder'=>__('Streichpreis'), 'class'=>'form-control', 'id'=>'price_old')) }}
@ -85,16 +78,45 @@
<label class="form-label" for="weight">{{ __('Gewicht in g') }}</label>
{{ Form::text('weight', $product->weight, array('placeholder'=>__('Gewicht in g'), 'class'=>'form-control', 'id'=>'weight')) }}
</div>
<div class="form-group col-sm-4">
{{-- <div class="form-group col-sm-4">
<label class="form-label" for="points">{{ __('Points pro Produkt') }}</label>
{{ Form::text('points', $product->points, array('placeholder'=>__('Points pro Produkt'), 'class'=>'form-control', 'id'=>'points')) }}
</div>
--}}
<div class="form-group col-sm-4">
<label class="form-label" for="amount">{{ __('Anzahl/Verfügbarkeit') }}</label>
{{ Form::text('amount', $product->amount, array('placeholder'=>__('Anzahl/Verfügbarkeit'), 'class'=>'form-control', 'id'=>'amount')) }}
</div>
<div class="form-group col-sm-4">
<label class="form-label" for="price_ek">{{ __('Preis EK in EUR') }}</label>
{{ Form::text('price_ek', $product->getFormattedPriceEk(), array('placeholder'=>__('Preis EK in EUR'), 'class'=>'form-control', 'id'=>'price_ek')) }}
</div>
</div>
<div class="form-row">
<div class="form-group col-sm-4">
<label class="form-label" for="weight">{{ __('Keine Staffelprovision') }}</label>
<label class="custom-control custom-checkbox mt-2">
{!! Form::checkbox('single_commission', 1, $product->single_commission, ['class'=>'custom-control-input']) !!}
<span class="custom-control-label">Einzelrabatt für dieses Produkt</span>
</label>
<label class="custom-control custom-checkbox mt-2">
{!! Form::checkbox('amount_commission', 1, $product->amount_commission, ['class'=>'custom-control-input']) !!}
<span class="custom-control-label">Betrag zum Staffelumsatz addieren</span>
</label>
</div>
<div class="form-group col-sm-4">
<label class="form-label" for="value_commission">{{ __('Einzelrabatt in %') }}</label>
{{ Form::text('value_commission', $product->getFormattedValueCommission(), array('placeholder'=>__('Einzelrabatt in %'), 'class'=>'form-control', 'id'=>'value_commission')) }}
</div>
<div class="form-group col-sm-4">
<label class="form-label" for="partner_commission">{{ __('Vertriebspartner Einzelrabatt in %') }}</label>
{{ Form::text('partner_commission', $product->getFormattedPartnerCommission(), array('placeholder'=>__('Vertriebspartner Einzelrabatt in %'), 'class'=>'form-control', 'id'=>'partner_commission')) }}
</div>
</div>
</div>
</div>

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

@ -20,14 +20,13 @@
<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>{{__('sichbar')}}</th>
<th>{{__('KP')}}</th>
<th>{{__('ER')}}</th>
<th>{{__('Status')}}</th>
<th></th>
</tr>
@ -54,13 +53,12 @@
@endforeach
</td>
<td>{{ $value->getFormattedPrice() }}</td>
<td>{{ $value->points }}</td>
<td>{{ $value->contents_total }}</td>
<td>{{ $value->getUnitType() }}</td>
<td>{{ $value->getBasePriceFormatted() }}</td>
<td>{{ $value->weight }}</td>
<td>{{ $value->getShowAtType() }}</td>
<td data-sort="{{ $value->shipping_addon }}">{!! get_active_badge($value->shipping_addon) !!}</td>
<td data-sort="{{ $value->single_commission }}">{!! get_active_badge($value->single_commission) !!}</td>
<td data-sort="{{ $value->active }}">{!! get_active_badge($value->active) !!}</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>

89
resources/views/admin/sales/_detail.blade.php
View file

@ -73,7 +73,7 @@
</div>
</div>
@endif
<div class="text-muted small">Zugewiesener Berater</div>
<div class="text-muted small">Zugewiesener Vertriebspartner</div>
@if($isView === 'sales_user')
{{-- @if($shopping_order->user_shop)
{{$shopping_order->user_shop->title}}
@ -88,7 +88,7 @@
data-action="shopping-user-is-like-member"
data-back="{{route('admin_sales_customers_detail', [$shopping_order->id])}}"
data-modal="modal-xl"
data-route="{{route('modal_load')}}"><span class="fa fa-edit"></span> Berater zuordnen</button>
data-route="{{route('modal_load')}}"><span class="fa fa-edit"></span> Vertriebspartner zuordnen</button>
@else
@if($shopping_order->member)
<a class="btn btn-xs btn-outline-primary" href="{{route('admin_lead_edit', [$shopping_order->member->id])}}"><i class="ion ion-ios-contacts"></i></a>
@ -121,7 +121,7 @@
@if($shopping_order->shopping_user->is_from === 'shopping' || $shopping_order->shopping_user->is_from === 'extern')
Rechnungsadresse des Kunden
@else
Rechnungsadresse des Beraters
Rechnungsadresse des Vertriebspartners
@endif
</h6>
<div class="row">
@ -186,16 +186,16 @@
<h6 class="small font-weight-semibold">
@if($shopping_order->shopping_user->is_from === 'user_order' || $shopping_order->shopping_user->is_from === 'extern')
@if($shopping_order->shopping_user->is_for === 'me')
Lieferadresse des Berater
Lieferadresse des Vertriebspartner
@else
Lieferadresse des Kunden
@endif
@endif
@if($shopping_order->shopping_user->is_from === 'wizard')
Lieferadresse des Berater
Lieferadresse des Vertriebspartner
@endif
@if($shopping_order->shopping_user->is_from === 'membership')
Lieferadresse des Berater
Lieferadresse des Vertriebspartner
@endif
@if($shopping_order->shopping_user->is_from === 'shopping')
Lieferadresse des Kunden
@ -266,22 +266,22 @@
<h6 class="small font-weight-semibold">
@if($shopping_order->shopping_user->is_from === 'user_order')
@if($shopping_order->shopping_user->is_for === 'me')
<strong>Bestellung für Berater</strong>
<strong>Bestellung für Vertriebspartner</strong>
@else
<strong>Bestellung für Kunde</strong>
@endif
@endif
@if($shopping_order->shopping_user->is_from === 'wizard')
<strong>Beraterbestellung für Registrierung</strong>
<strong>Vertriebspartnerbestellung für Registrierung</strong>
@endif
@if($shopping_order->shopping_user->is_from === 'membership')
<strong>Beraterbestellung für Mitgliedschaft</strong>
<strong>Vertriebspartnerbestellung für Mitgliedschaft</strong>
@endif
@if($shopping_order->shopping_user->is_from === 'shopping')
<strong>Kundenbestellung über Shop</strong>
@endif
@if($shopping_order->shopping_user->is_from === 'homeparty')
<h5>Beraterbestellung für eine Homeparty</h5>
<h5>Vertriebspartnerbestellung für eine Homeparty</h5>
<hr>
@endif
</h6>
@ -360,43 +360,92 @@
</tbody>
<tfoot>
<style>
.table_small_td {
padding-top: 0.125rem !important;
}
</style>
@if($shopping_order->shopping_user->is_from === 'user_order')
<tr class="">
<td colspan="3">
Zwischensumme
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.2em;">
{{ $shopping_order->getFormattedSubtotalFull() }} &euro;*
</td>
</tr>
<tr class="">
<td class="table_small_td" colspan="3">
Handelspanne
</td>
<td class="table_small_td" style="color:#37302d; text-align: right; vertical-align: top;line-height:1.2em;">
- {{ $shopping_order->getFormattedDiscount() }} &euro;*
</td>
</tr>
<tr class="border-bottom">
<td class="table_small_td" colspan="3">
<strong>Summe (Netto)</strong>
</td>
<td class="table_small_td" style="color:#37302d; text-align: right; vertical-align: top;line-height:1.2em;">
<strong>{{ $shopping_order->getFormattedSubtotal() }} &euro;*</strong>
</td>
</tr>
@endif
<tr class="border-bottom">
<td colspan="3">
{{__('email.checkout_mail_shipping')}}
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.4em;">
@if($shopping_order->shopping_user->is_from === 'user_order')
{{ $shopping_order->getFormattedShippingNet() }} &euro;
{{ $shopping_order->getFormattedShippingNet() }} &euro;*
@else
{{ $shopping_order->getFormattedShipping() }} &euro;
@endif
</td>
</tr>
<tr>
<td colspan="3">
{{__('email.checkout_mail_subtotal_ws')}}
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
{{ $shopping_order->getFormattedSubtotalWs() }} &euro;
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.2em;">
{{ $shopping_order->getFormattedSubtotalShipping() }} &euro;*
</td>
</tr>
<tr class="border-bottom">
<td colspan="3">
<td class="table_small_td" colspan="3">
{{__('email.checkout_mail_tax')}}
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
<td class="table_small_td" style="color:#37302d; text-align: right; vertical-align: top;line-height:1.2em;">
{{ $shopping_order->getFormattedTax() }} &euro;
</td>
</tr>
@if($shopping_order->shopping_user->is_from === 'user_order' && $shopping_order->payment_credit > 0)
<tr>
<td colspan="3">
<b> Summe (Brutto):</b>
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.2em;">
<b> {{ $shopping_order->getFormattedTotalWithoutCredit() }} &euro;</b>
</td>
</tr>
<tr class="border-bottom">
<td class="table_small_td" colspan="3">
aus Guthaben (Brutto):
</td>
<td class="table_small_td" style="color:#37302d; text-align: right; vertical-align: top;line-height:1.2em;">
{{ $shopping_order->getFormattedPaymentCredit() }} &euro;
</td>
</tr>
@endif
<tr>
<td colspan="3">
<b>{{__('email.checkout_mail_total')}}</b>
<b>Gesamtsumme (Brutto):</b>
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.4em;">
<b>{{ $shopping_order->getFormattedTotalShipping() }} &euro;</b>
<br>
<span style="font-size: 0.8em">{{__('email.checkout_mail_tax_info')}}</span>
<span style="font-size: 0.9em"><em>* Nettobeträge</em></span>
</td>
</tr>
</tfoot>

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

@ -10,7 +10,7 @@
<div class="card-header">
<div class="form-row align-items-center">
<div class="col-sm-4 mb-2">
<label class="form-label" for="filter_member_id">Filter zugewiesener Berater</label>
<label class="form-label" for="filter_member_id">Filter zugewiesener Vertriebspartner</label>
<select class="custom-select" name="filter_member_id" id="filter_member_id">
<option value="">Filter aus</option>
@foreach($filter_members as $member)
@ -51,7 +51,7 @@
<th>{{__('First name')}}</th>
<th>{{__('Last name')}}</th>
<th>{{__('E-Mail')}}</th>
<th>{{__('zugewiesener Berater')}}</th>
<th>{{__('zugewiesener Vertriebspartner')}}</th>
<th>{{__('Rf-Nr.')}}</th>
<th>{{__('Käufe')}}</th>
</tr>

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

@ -4,7 +4,7 @@
<h4 class="font-weight-bold py-2 mb-2">
<a href="{{route('admin_sales_users')}}" class="btn btn-sm btn-default float-right">zurück</a>
{{ __('Bestellung Berater') }} <span class="text-muted">#{{$shopping_order->id}}</span>
{{ __('Bestellung Vertriebspartner') }} <span class="text-muted">#{{$shopping_order->id}}</span>
</h4>
@include('admin.sales._detail')
<a href="{{route('admin_sales_users')}}" class="btn btn-sm btn-default mt-2 float-right">zurück</a>

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

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