User Order all Margins / Checkout
This commit is contained in:
Kevin Adametz
parent
a96d7d5c77
commit
224bf9e951
92 changed files with 3551 additions and 561 deletions
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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
46
resources/views/admin/modal/user_level_margin.blade.php
Normal 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>
|
||||
Loading…
Add table
Add a link
Reference in a new issue