#53, #52, #51 change Points

This commit is contained in:
Kevin Adametz 2022-07-21 10:37:34 +02:00
parent 582ca8299d
commit 263cf93a1e
41 changed files with 812 additions and 288 deletions

View file

@ -0,0 +1,83 @@
{!! Form::open(['url' => $route, 'class' => 'modal-content', 'enctype' => 'multipart/form-data']) !!}
<div class="modal-header">
<h5 class="modal-title">
{{ __('Points / Umsatz') }}
<span class="font-weight-light">zuweisen/ändern</span>
</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'] }}">
<div class="form-row">
<div class="form-group col">
<label for="change_member_key" class="form-label">{{ __('Passwort eingeben') }}*</label>
<input type="text" class="form-control" name="change_member_key" id="change_member_key"
placeholder="mivita" required>
</div>
</div>
<div class="form-row">
<div class="form-group col">
<label for="change_member_id" class="form-label">{{ __('Berater 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>
</div>
</div>
<div class="table-responsive">
<table class="table table-bordered table-striped">
<thead>
<tr>
<th>Datum</th>
<th>Points</th>
<th>Umsatz netto</th>
<th>Status</th>
</tr>
</thead>
<tbody>
@if($value->user_sales_volume)
<tr>
<td>{{ $value->user_sales_volume->date }}</td>
<td>{{ $value->user_sales_volume->points }}</td>
<td>{{ formatNumber($value->user_sales_volume->total_net) }} &euro;</td>
<td>{{ $value->user_sales_volume->getStatusType() }}</td>
</tr>
@if($value->user_sales_volume->message)
<tr>
<td colspan="4">{{ $value->user_sales_volume->message }}</td>
</tr>
@endif
@endif
</tbody>
</table>
</div>
@if($value->user_sales_volume->isCurrentMonthYear())
<label class="custom-control custom-checkbox">
{!! Form::checkbox('change_points', 1, 0, ['class' => 'custom-control-input', 'id' => 'change_points', 'required'=>true]) !!}
<span class="custom-control-label">Points / Umsatz einen neuen Berater zuweisen</span>
</label>
@else
Points können nicht mehr verschoben werden.
@endif
<hr>
<i>Points können nur innerhalb des akutellen Monats verschoben werden, da sonst die monatliche Auswertung schon berechnet ist.
Danach können Points für den akutellen Monat manuell gutgeschrieben werden.</i><br>
<a class="btn btn-sm btn-default mt-2" href="{{ route('admin_business_points') }}">Business -> Points gutschreiben</a>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">schließen</button>
<button type="submit" class="btn btn-primary">{{ __('übernehmen') }}</button>
</div>
{!! Form::close() !!}
<script type="text/javascript">
$(document).ready(function() {
});
</script>

View file

@ -11,18 +11,20 @@
<div class="col-md-3 mb-1">
<strong class="mr-2">Versand:</strong>
@if ($isAdmin)
<button type="button" class="btn btn-sm btn-{{ $shopping_order->getShippedColor() }}"
data-toggle="modal" data-target="#modals-shipped" data-id="{{ $shopping_order->id }}"
data-shipped="{{ $shopping_order->shipped }}" data-back="{{ url()->current() }}"
data-action="store_shipped">
<span class="far fa-edit"></span> <strong>{{ $shopping_order->getShippedType() }}</strong>
</button>
@else
<span class="text-big">
<span
class="badge badge-pill badge-{{ $shopping_order->getShippedColor() }}">{{ $shopping_order->getShippedType() }}</span>
</span>
@if($shopping_order->payment_for !== 8)
@if ($isAdmin)
<button type="button" class="btn btn-sm btn-{{ $shopping_order->getShippedColor() }}"
data-toggle="modal" data-target="#modals-shipped" data-id="{{ $shopping_order->id }}"
data-shipped="{{ $shopping_order->shipped }}" data-back="{{ url()->current() }}"
data-action="store_shipped">
<span class="far fa-edit"></span> <strong>{{ $shopping_order->getShippedType() }}</strong>
</button>
@else
<span class="text-big">
<span
class="badge badge-pill badge-{{ $shopping_order->getShippedColor() }}">{{ $shopping_order->getShippedType() }}</span>
</span>
@endif
@endif
</div>
<div class="col-md-3 mb-1">
@ -59,7 +61,7 @@
target="_blank" class="btn btn-warning btn-sm"><i class="fa fa-eye"></i></a>
@endif
@endif
@if ($shopping_order->txaction === 'extern' && $shopping_order->wp_invoice_path)
@if (($shopping_order->txaction === 'extern' || $shopping_order->txaction === 'extern_paid') && $shopping_order->wp_invoice_path)
<a href="{{ $shopping_order->wp_invoice_path }}" class="btn btn-secondary btn-sm"><i
class="fa fa-external-link-alt"></i> <i class="fa fa-download"></i></a>
@endif
@ -99,12 +101,30 @@
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Points gesamt</div>
{{ $shopping_order->points }}
{{ $shopping_order->points }}
</div>
</div>
</div>
<hr class="m-0">
<div class="card-body pb-1">
<div class="row">
<div class="col-md-12 mb-3">
<div class="text-muted small">Punkte / Umsatz zugewiesen</div>
@if($shopping_order->user_sales_volume && $shopping_order->user_sales_volume->user)
{{ $shopping_order->user_sales_volume->user->getFullName() }}
@endif
@if ($isAdmin)
<button type="button" class="btn btn-xs btn-outline-secondary" data-toggle="modal"
data-target="#modals-load-content" data-id="{{ $shopping_order->id }}"
data-action="shopping-order-change-points" data-view="{{ $isView }}"
data-route="{{ route('modal_load') }}"><span class="fa fa-edit"></span></button>
@endif
</div>
</div>
</div>
<hr class="m-0">
<!-- / Info -->
@if ($isAdmin)
<!-- Member -->
@ -343,7 +363,7 @@
<hr>
@endif
@if ($shopping_order->shopping_user->is_from === 'collection')
<h5>Berater Sammelbestellung</h5>
<h5>Berater Sammelrechnung</h5>
<hr>
@endif
</h6>

View file

@ -121,7 +121,7 @@
</table>
</div>
<h5 class="mt-4">Sammelbestellung behinhaltet folgende Kundenbestellungen</h5>
<h5 class="mt-4">Sammelrechnung behinhaltet folgende Kundenbestellungen</h5>
<div class="card-datatable table-responsive pt-0">
<table class="table table-striped table-bordered">