last changes since 6-2023
This commit is contained in:
Kevin Adametz
parent
0341c9c189
commit
04d677d37a
142 changed files with 7895 additions and 2855 deletions
|
|
@ -1,29 +1,5 @@
|
|||
<table class="table user-view-table m-0">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>Account ID:</td>
|
||||
<td>
|
||||
{{ $TreeCalcBot->business_user->m_account }}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Karriere-Level:</td>
|
||||
<td>
|
||||
{{ $TreeCalcBot->business_user->user_level_name }}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Kundenprovision:</td>
|
||||
<td>
|
||||
{{ $TreeCalcBot->business_user->margin }} %
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Shop Provision:</td>
|
||||
<td>
|
||||
{{ $TreeCalcBot->business_user->margin_shop }} %
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Account:</td>
|
||||
<td>
|
||||
|
|
@ -35,6 +11,7 @@
|
|||
@if($TreeCalcBot->business_user->active_date)
|
||||
bis: {{ formatDate($TreeCalcBot->business_user->active_date) }}
|
||||
@endif
|
||||
(ID: {{ $TreeCalcBot->business_user->m_account }})
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
@ -57,18 +34,32 @@
|
|||
@if($TreeCalcBot->business_user->isSave())
|
||||
<span class="badge badge-outline-success"><i class="fa fa-check-circle"></i></span>
|
||||
@else
|
||||
<span class="badge badge-outline-warning"><i class="fa fa-times"></i></span>
|
||||
<span class="badge badge-outline-warning-dark"><i class="fa fa-times"></i></span>
|
||||
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Gesamte Points:</td>
|
||||
<td>
|
||||
<strong>{{ $TreeCalcBot->business_user->sales_volume_points_sum }}</strong>
|
||||
(Eigene: {{ $TreeCalcBot->business_user->sales_volume_points }} | Shop: {{ $TreeCalcBot->business_user->sales_volume_points_shop }})
|
||||
<td>Karriere-Level:</td>
|
||||
<td>
|
||||
{{ $TreeCalcBot->business_user->user_level_name }}
|
||||
<span class="badge badge-outline-success"> KP {{ $TreeCalcBot->business_user->qual_kp }} / PP {{ formatNumber($TreeCalcBot->business_user->qual_pp, 0) }}</span>
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Kundenprovision:</td>
|
||||
<td>
|
||||
{{ $TreeCalcBot->business_user->margin }} %
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Shop Provision:</td>
|
||||
<td>
|
||||
{{ $TreeCalcBot->business_user->margin_shop }} %
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td>Umsatz netto:</td>
|
||||
<td>
|
||||
|
|
@ -77,37 +68,79 @@
|
|||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Persönliches Volumen:</td>
|
||||
<td>Kunden Points:</td>
|
||||
<td>
|
||||
<span class="badge {{ $TreeCalcBot->business_user->isQualKP() ? 'badge-outline-success' : 'badge-outline-danger' }}"> KD {{ $TreeCalcBot->business_user->qual_kp }}</span>
|
||||
<strong>{{ formatNumber($TreeCalcBot->business_user->sales_volume_points_KP_sum, 0) }} KP</strong>
|
||||
(Eigene: {{ formatNumber($TreeCalcBot->business_user->sales_volume_KP_points, 0) }} | Shop: {{ formatNumber($TreeCalcBot->business_user->sales_volume_points_shop, 0) }})
|
||||
<span class="badge {{ $TreeCalcBot->business_user->isQualKP() ? 'badge-outline-success' : 'badge-outline-warning-dark' }}"> KP {{ $TreeCalcBot->business_user->qual_kp }}</span>
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
@if($TreeCalcBot->business_user->version == 1)
|
||||
<tr>
|
||||
<td>Qualifikation Points:</td>
|
||||
<td>
|
||||
<strong>{{ formatNumber($TreeCalcBot->business_user->total_qual_pp, 0) }} TP</strong> (+ Volumen KP)
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Qualifikation Provision:</td>
|
||||
<td>
|
||||
TP {{ formatNumber($TreeCalcBot->business_user->qual_tp, 0) }} /
|
||||
@if($TreeCalcBot->business_user->isQualKP())
|
||||
<strong> TP {{ formatNumber($TreeCalcBot->business_user->total_qual_tp, 0) }}</strong>
|
||||
@if($TreeCalcBot->business_user->qual_user_level)
|
||||
<span class="badge badge-outline-success">{{ formatNumber($TreeCalcBot->business_user->qual_user_level['qual_tp'], 0) }} | {{ $TreeCalcBot->business_user->qual_user_level['name'] }}</span>
|
||||
@if($TreeCalcBot->business_user->isQualLevel())
|
||||
<span class="badge {{ $TreeCalcBot->business_user->isQualEqualLevel() ? 'badge-outline-success' : 'badge-outline-info' }}">
|
||||
KP {{ formatNumber($TreeCalcBot->business_user->sales_volume_points_KP_sum, 0) }} /
|
||||
<strong>{{ formatNumber($TreeCalcBot->business_user->qual_user_level['qual_kp'], 0) }}</strong> |
|
||||
TP {{ formatNumber($TreeCalcBot->business_user->total_qual_pp, 0) }} /
|
||||
<strong>{{ formatNumber($TreeCalcBot->business_user->qual_user_level['qual_pp'], 0) }}</strong>
|
||||
| {{ $TreeCalcBot->business_user->qual_user_level['name'] }}</span>
|
||||
@endif
|
||||
@else
|
||||
<span class="ion ion-md-close text-danger"></span>
|
||||
@endif
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
@endif
|
||||
|
||||
@if($TreeCalcBot->business_user->version == 2)
|
||||
<tr>
|
||||
<td>Payline Points:</td>
|
||||
<td>
|
||||
<strong>{{ formatNumber($TreeCalcBot->business_user->payline_points, 0) }} PP</strong>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td>Qualifikation Karriere:</td>
|
||||
<td>Qualifikation Points:</td>
|
||||
<td>
|
||||
@if($TreeCalcBot->business_user->next_qual_user_level)
|
||||
<span class="badge badge-outline-success">{{ formatNumber($TreeCalcBot->business_user->next_qual_user_level['qual_tp'], 0) }} | {{ $TreeCalcBot->business_user->next_qual_user_level['name'] }}</span>
|
||||
@else
|
||||
<span class="badge badge-outline-warning"><i class="fa fa-times"></i></span>
|
||||
@endif
|
||||
<strong>{{ formatNumber($TreeCalcBot->business_user->payline_points_qual_kp, 0) }} PP</strong> (+ Volumen KP)
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td>aktuelle Provisions-Stufe:</td>
|
||||
<td>
|
||||
@if($TreeCalcBot->business_user->isQualLevel())
|
||||
<span class="badge {{ $TreeCalcBot->business_user->isQualEqualLevel() ? 'badge-outline-success' : 'badge-outline-info' }}">
|
||||
KP {{ formatNumber($TreeCalcBot->business_user->sales_volume_points_KP_sum, 0) }} /
|
||||
<strong>{{ formatNumber($TreeCalcBot->business_user->qual_user_level['qual_kp'], 0) }}</strong> |
|
||||
PP {{ formatNumber($TreeCalcBot->business_user->payline_points_qual_kp, 0) }} /
|
||||
<strong>{{ formatNumber($TreeCalcBot->business_user->qual_user_level['qual_pp'], 0) }}</strong>
|
||||
| {{ $TreeCalcBot->business_user->qual_user_level['name'] }}</span>
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
@if($TreeCalcBot->business_user->qual_user_level_next)
|
||||
<tr>
|
||||
<td>nächste Provisions-Stufe:</td>
|
||||
<td>
|
||||
<span class="badge badge-outline-warning-dark">
|
||||
KP {{ formatNumber($TreeCalcBot->business_user->sales_volume_points_KP_sum, 0) }} /
|
||||
<strong>{{ formatNumber($TreeCalcBot->business_user->qual_user_level_next['qual_kp'], 0) }}</strong> |
|
||||
PP {{ formatNumber($TreeCalcBot->business_user->payline_points_qual_kp, 0) }} /
|
||||
<strong>{{ formatNumber($TreeCalcBot->business_user->qual_user_level_next['qual_pp'], 0) }}</strong>
|
||||
| {{ $TreeCalcBot->business_user->qual_user_level_next['name'] }}</span>
|
||||
</td>
|
||||
</tr>
|
||||
@endif
|
||||
@endif
|
||||
|
||||
<tr>
|
||||
<td><strong>Provision Shop:</strong></td>
|
||||
<td>
|
||||
|
|
@ -116,19 +149,72 @@
|
|||
(Umsatz Shop netto: {{ formatNumber($TreeCalcBot->business_user->sales_volume_total_shop) }} € / {{ $TreeCalcBot->business_user->margin_shop }} %)
|
||||
</td>
|
||||
</tr>
|
||||
@if($TreeCalcBot->business_user->version == 1)
|
||||
<tr>
|
||||
<td><strong>Provision Team:</strong></td>
|
||||
<td>
|
||||
<span class="badge badge-primary" style="font-size: 1em;"><strong>{{ formatNumber($TreeCalcBot->business_user->commission_team_total) }} €</strong></span>
|
||||
<span class="badge badge-primary" style="font-size: 1em;"><strong>{{ formatNumber($TreeCalcBot->business_user->commission_pp_total) }} €</strong></span>
|
||||
</td>
|
||||
</tr>
|
||||
@endif
|
||||
@if($TreeCalcBot->business_user->version == 2)
|
||||
<tr>
|
||||
<td><strong>Provision Payline:</strong></td>
|
||||
<td>
|
||||
<span class="badge badge-primary" style="font-size: 1em;"><strong>{{ formatNumber($TreeCalcBot->business_user->commission_pp_total) }} €</strong></span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong>Provision Wachstumsbonus:</strong></td>
|
||||
<td>
|
||||
<span class="badge badge-primary" style="font-size: 1em;"><strong>{{ formatNumber($TreeCalcBot->business_user->commission_growth_total) }} €</strong></span>
|
||||
</td>
|
||||
</tr>
|
||||
@endif
|
||||
<tr>
|
||||
<td><strong>Provision Gesamt:</strong></td>
|
||||
<td>
|
||||
<span class="badge badge-secondary" style="font-size: 1em;"><strong>{{ formatNumber($TreeCalcBot->business_user->getCommissionTotal()) }} €</strong></span>
|
||||
</td>
|
||||
</tr>
|
||||
@if($TreeCalcBot->business_user->version == 2)
|
||||
|
||||
<tr>
|
||||
<td>Team Points:</td>
|
||||
<td>
|
||||
<strong>{{ formatNumber($TreeCalcBot->business_user->total_pp, 0) }} TP</strong>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Qualifikation Team Points:</td>
|
||||
<td>
|
||||
<strong>{{ formatNumber($TreeCalcBot->business_user->total_qual_pp, 0) }} TP</strong> (+ Volumen KP)
|
||||
</td>
|
||||
</tr>
|
||||
@endif
|
||||
<tr>
|
||||
<td>@if($TreeCalcBot->business_user->next_qual_user_level) Qualifikation<br> @endif nächster Karriere-Level:</td>
|
||||
<td>
|
||||
|
||||
@if($TreeCalcBot->business_user->next_qual_user_level)
|
||||
<span class="badge badge-outline-success">
|
||||
KP {{ formatNumber($TreeCalcBot->business_user->sales_volume_points_KP_sum, 0) }} /
|
||||
<strong>{{ formatNumber($TreeCalcBot->business_user->next_qual_user_level['qual_kp'], 0) }}</strong> |
|
||||
TP {{ formatNumber($TreeCalcBot->business_user->total_qual_pp, 0) }} /
|
||||
<strong>{{ formatNumber($TreeCalcBot->business_user->next_qual_user_level['qual_pp'], 0) }}</strong>
|
||||
| {{ $TreeCalcBot->business_user->next_qual_user_level['name'] }}</span>
|
||||
@elseif($TreeCalcBot->business_user->next_can_user_level)
|
||||
<span class="badge badge-outline-warning-dark">
|
||||
KP {{ formatNumber($TreeCalcBot->business_user->sales_volume_points_KP_sum, 0) }} /
|
||||
<strong>{{ formatNumber($TreeCalcBot->business_user->next_can_user_level['qual_kp'], 0) }}</strong> |
|
||||
TP {{ formatNumber($TreeCalcBot->business_user->total_qual_pp, 0) }} /
|
||||
<strong>{{ formatNumber($TreeCalcBot->business_user->next_can_user_level['qual_pp'], 0) }}</strong>
|
||||
| {{ $TreeCalcBot->business_user->next_can_user_level['name'] }}</span>
|
||||
@else
|
||||
<span class="badge badge-outline-warning"><i class="fa fa-times"></i></span>
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<hr class="border-light m-0 mb-2">
|
||||
|
|
@ -141,34 +227,31 @@
|
|||
<th>Provision %</th>
|
||||
<th>Provision €</th>
|
||||
</tr>
|
||||
|
||||
@for ($line=1; $line<=6; $line++)
|
||||
<tr>
|
||||
<td>
|
||||
<div class="font-weight-bolder line-height-1 my-2 text-dark badge badge-outline-dark">{{ $line }}</div>
|
||||
</td>
|
||||
<td>{{ formatNumber($TreeCalcBot->getKeybyLine($line, 'points'), 0) }}</td>
|
||||
<td>{{ formatNumber($TreeCalcBot->getKeybyLine($line, 'margin'), 1) }} %</td>
|
||||
<td>{{ formatNumber($TreeCalcBot->getKeybyLine($line, 'commission'), 2) }} €</td>
|
||||
</tr>
|
||||
@endfor
|
||||
@foreach ($TreeCalcBot->getGrowthBonus() as $line => $growthBonu)
|
||||
<tr>
|
||||
<td>
|
||||
<div class="font-weight-bolder line-height-1 my-2 text-dark badge badge-outline-dark">{{ $line+7 }}</div>
|
||||
</td>
|
||||
<td>{{ formatNumber($TreeCalcBot->getKeybyLine($line+7, 'points'), 0) }}</td>
|
||||
<td>{{ formatNumber($TreeCalcBot->getKeybyLine($line+7, 'margin'), 1) }} %</td>
|
||||
<td>{{ formatNumber($TreeCalcBot->getKeybyLine($line+7, 'commission'), 2) }} €</td>
|
||||
|
||||
@foreach ($TreeCalcBot->business_user->business_lines as $line => $object)
|
||||
<tr>
|
||||
<td>
|
||||
|
||||
@if($line <= $TreeCalcBot->business_user->getQualLevelPaylines())
|
||||
<div class="font-weight-bolder line-height-1 my-2 text-dark badge badge-outline-success">{{ $line }}. PP</div>
|
||||
@elseif($line <= $TreeCalcBot->business_user->isQualLevelGrowth($line))
|
||||
<div class="font-weight-bolder line-height-1 my-2 text-dark badge badge-outline-warning-dark">{{ $line }}. WB</div>
|
||||
@else
|
||||
<div class="font-weight-bolder line-height-1 my-2 text-dark badge badge-outline-dark">{{ $line }}.</div>
|
||||
@endif
|
||||
</td>
|
||||
<td>{{ formatNumber($TreeCalcBot->getKeybyLine($line, 'points'), 0) }}</td>
|
||||
<td>{{ formatNumber($TreeCalcBot->getKeybyLine($line, 'margin'), 1) }} %</td>
|
||||
<td>{{ formatNumber($TreeCalcBot->getKeybyLine($line, 'commission'), 2) }} €</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
@endforeach
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td>Gesamt</td>
|
||||
<td>{{ formatNumber($TreeCalcBot->business_user->total_tp, 0) }}</td>
|
||||
<td>{{ formatNumber($TreeCalcBot->business_user->total_pp, 0) }}</td>
|
||||
<td></td>
|
||||
<td><strong>{{ formatNumber($TreeCalcBot->business_user->commission_team_total, 2) }} €</strong></td>
|
||||
<td><strong>{{ formatNumber($TreeCalcBot->business_user->commission_pp_total, 2) }} €</strong></td>
|
||||
</tr>
|
||||
|
||||
</tfoot>
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@
|
|||
"order": [[3, "desc" ]],
|
||||
"columns": [
|
||||
{ data: 'commission_total', name: 'commission_total', orderable: false, searchable: false },
|
||||
{ data: 'commission_team_total', name: 'commission_team_total', orderable: true, searchable: false },
|
||||
{ data: 'commission_pp_total', name: 'commission_pp_total', orderable: true, searchable: false },
|
||||
{ data: 'commission_shop_sales', name: 'commission_shop_sales', orderable: true, searchable: false },
|
||||
{ data: 'm_account', name: 'm_account', orderable: true , searchable: true },
|
||||
{ data: 'first_name', name: 'first_name', orderable: true , searchable: true },
|
||||
|
|
|
|||
|
|
@ -34,6 +34,14 @@
|
|||
{{ Form::text('points', '', array('placeholder'=>__('Points'), 'class'=>'form-control', 'id'=>'points', 'required'=>true)) }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-row">
|
||||
<div class="form-group col-4">
|
||||
<label for="status_points" class="form-label">{{ __('Points berechnen für') }}*</label>
|
||||
{{ Form::select('status_points', \App\Models\UserSalesVolume::$statusPointsTypes , 1, array('class'=>'custom-select', 'id'=>'status_points')) }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-row">
|
||||
<div class="form-group col-sm-4">
|
||||
<label for="total_net" class="form-label">{{__('Umsatz netto%')}}</label>
|
||||
|
|
@ -49,10 +57,9 @@
|
|||
|
||||
<label class="custom-control custom-checkbox">
|
||||
{!! Form::checkbox('is_checked_action', 1, 0, ['class' => 'custom-control-input', 'id' => 'is_checked_action', 'required'=>true]) !!}
|
||||
<span class="custom-control-label">Points / Umsatz hinzufügen</span>
|
||||
<span class="custom-control-label">ja, Points / Umsatz hinzufügen</span>
|
||||
</label>
|
||||
|
||||
|
||||
<hr>
|
||||
<i>Points werden mit für den akutellen Datum hinzugefügt, da die monatliche Auswertung für die Monate davor schon berechnet sind.</i><br>
|
||||
|
||||
|
|
|
|||
|
|
@ -61,6 +61,12 @@
|
|||
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-4">
|
||||
<label for="status_points" class="form-label">{{ __('Points berechnen für') }}*</label>
|
||||
{{ Form::select('status_points', \App\Models\UserSalesVolume::$statusPointsTypes , $userSalesVolume->status_points, array('class'=>'custom-select', 'id'=>'status_points')) }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-sm-4">
|
||||
<label for="total_net" class="form-label">{{__('Umsatz netto')}}</label>
|
||||
|
|
@ -76,7 +82,7 @@
|
|||
|
||||
<label class="custom-control custom-checkbox">
|
||||
{!! Form::checkbox('is_checked_action', 1, 0, ['class' => 'custom-control-input', 'id' => 'is_checked_action', 'required'=>true]) !!}
|
||||
<span class="custom-control-label">Points / Umsatz ändern</span>
|
||||
<span class="custom-control-label">ja, Points / Umsatz ändern</span>
|
||||
</label>
|
||||
@else
|
||||
Points können nicht mehr geändet werden werden.
|
||||
|
|
@ -84,11 +90,7 @@
|
|||
<hr>
|
||||
<i>Points können nur innerhalb des akutellen Monats geändert 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>
|
||||
|
||||
|
||||
|
||||
|
||||
{{-- <a class="btn btn-sm btn-default mt-2" href="{{ route('admin_business_points') }}">Business -> Points gutschreiben</a> --}}
|
||||
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
|
|
|
|||
|
|
@ -63,7 +63,8 @@
|
|||
<th>{{__('Datum') }}</th>
|
||||
<th>{{__('Points')}}</th>
|
||||
<th>{{__('Umsatz netto')}}</th>
|
||||
<th>{{__('Art')}}</th>
|
||||
<th>{{__('aus')}}</th>
|
||||
<th>{{__('für')}}</th>
|
||||
<th>{{__('Bestellung')}}</th>
|
||||
<th>{{__('Berater Nr.')}}</th>
|
||||
<th>{{__('Vorname')}}</th>
|
||||
|
|
@ -103,6 +104,7 @@
|
|||
{ data: 'points', name: 'points', orderable: true, searchable: false },
|
||||
{ data: 'total_net', name: 'total_net', orderable: true, searchable: false },
|
||||
{ data: 'status', name: 'status', orderable: true, searchable: false },
|
||||
{ data: 'status_points', name: 'status_points', orderable: true, searchable: false },
|
||||
{ data: 'order', name: 'order', orderable: false , searchable: false },
|
||||
{ data: 'm_account', name: 'm_account', orderable: true , searchable: true },
|
||||
{ data: 'first_name', name: 'first_name', orderable: true , searchable: true },
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@
|
|||
{ data: 'm_account', name: 'm_account', orderable: true, searchable: true },
|
||||
{ data: 'user_level', name: 'user_level', orderable: false, searchable: false },
|
||||
{ data: 'is_qual_kp', name: 'is_qual_kp', orderable: false, searchable: false },
|
||||
{ data: 'sales_volume_points', name: 'sales_volume_points', orderable: false, searchable: false },
|
||||
{ data: 'sales_volume_KP_points', name: 'sales_volume_KP_points', orderable: false, searchable: false },
|
||||
{ data: 'sales_volume_total', name: 'sales_volume_total', orderable: false, searchable: false },
|
||||
{ data: 'email', name: 'email', orderable: true, searchable: true},
|
||||
{ data: 'first_name', name: 'first_name', orderable: true, searchable: true },
|
||||
|
|
|
|||
|
|
@ -161,6 +161,17 @@
|
|||
</div>
|
||||
</div>
|
||||
<hr class="m-0">
|
||||
<div class="card-body">
|
||||
<h6 class="small font-weight-semibold">
|
||||
Bemerkungen
|
||||
</h6>
|
||||
<div class="row">
|
||||
<div class="col-md-12 mb-3">
|
||||
{!! nl2br($shopping_user->remarks) !!}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<hr class="m-0">
|
||||
<!-- / Shipping -->
|
||||
@if($isAdmin)
|
||||
<!-- Order -->
|
||||
|
|
|
|||
|
|
@ -254,6 +254,14 @@
|
|||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-12">
|
||||
<label class="form-label" for="remarks">{{ __('Bemerkungen') }}</label>
|
||||
{{ Form::textarea('remarks', $shopping_user->remarks, array('placeholder'=>'Bemerkungen', 'class'=>'form-control', 'rows'=>4, 'id'=>'remarks')) }}
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
|
||||
{{ Form::hidden('faker_mail', $shopping_user->faker_mail) }}
|
||||
|
||||
@if($isView === 'customer-add')
|
||||
|
|
|
|||
|
|
@ -23,6 +23,9 @@
|
|||
<th>{{__('Pr. L.4') }}</th>
|
||||
<th>{{__('Pr. L.5') }}</th>
|
||||
<th>{{__('Pr. L.6') }}</th>
|
||||
<th>{{__('Pr. L.7') }}</th>
|
||||
<th>{{__('Pr. L.8') }}</th>
|
||||
<th>{{__('Paylines') }}</th>
|
||||
<th>{{__('W.Bonus') }}</th>
|
||||
<th>{{__('Status')}}</th>
|
||||
<th>{{__('Standard')}}</th>
|
||||
|
|
@ -45,13 +48,17 @@
|
|||
<td>{{ $value->margin }}</td>
|
||||
<td>{{ $value->margin_shop }}</td>
|
||||
<td>{{ $value->qual_kp }}</td>
|
||||
<td>{{ $value->qual_tp }}</td>
|
||||
<td>{{ $value->qual_pp }}</td>
|
||||
<td>{{ $value->pr_line_1 }}</td>
|
||||
<td>{{ $value->pr_line_2 }}</td>
|
||||
<td>{{ $value->pr_line_3 }}</td>
|
||||
<td>{{ $value->pr_line_4 }}</td>
|
||||
<td>{{ $value->pr_line_5 }}</td>
|
||||
<td>{{ $value->pr_line_6 }}</td>
|
||||
<td>{{ $value->pr_line_7 }}</td>
|
||||
<td>{{ $value->pr_line_8 }}</td>
|
||||
<td>{{ $value->paylines }}</td>
|
||||
|
||||
<td>{{ $value->getFormattedGrowthBonus() }}</td>
|
||||
<td data-sort="{{ $value->active }}">{!! get_active_badge($value->active) !!}</td>
|
||||
<td data-sort="{{ $value->default }}">{!! get_active_badge($value->default) !!}</td>
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
</h5>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="modal-body modal-body-overflow">
|
||||
@if(isset($TreeCalcBot))
|
||||
@include('admin.business._user_detail_in')
|
||||
@endif
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@
|
|||
</div>
|
||||
<div class="col-sm-12">
|
||||
|
||||
@if($current->member_id)
|
||||
@if($current->member_id && $current->member)
|
||||
<input type="hidden" name="change_shopping_user" value="true">
|
||||
|
||||
<hr>
|
||||
|
|
@ -195,7 +195,7 @@
|
|||
<hr>
|
||||
<p class="font-weight-bold">Zugeordneter Berater:</p>
|
||||
<p>
|
||||
@if($possible->member_id)
|
||||
@if($possible->member_id && $possible->member)
|
||||
<span class="text-muted">#{{$possible->member->number}}</span><br>
|
||||
{{$possible->member->getFullName()}}<br>
|
||||
@if(isset($possible->member->account->zipcode)){{$possible->member->account->zipcode}} @endif
|
||||
|
|
|
|||
|
|
@ -45,8 +45,8 @@
|
|||
|
||||
</div>
|
||||
<div class="form-group col-sm-6">
|
||||
<label for="qual_tp" class="form-label">{{__('Qualifikation')}} {{__('Team-Points')}}</label>
|
||||
{{ Form::text('qual_tp', $value->qual_tp, array('placeholder'=>__('Team-Points'), 'class'=>'form-control', 'id'=>'qual_tp')) }}
|
||||
<label for="qual_pp" class="form-label">{{__('Qualifikation')}} {{__('Payline Points')}}</label>
|
||||
{{ Form::text('qual_pp', $value->qual_pp, array('placeholder'=>__('Payline Points'), 'class'=>'form-control', 'id'=>'qual_pp')) }}
|
||||
|
||||
</div>
|
||||
|
||||
|
|
@ -82,6 +82,14 @@
|
|||
<label for="pr_line_6" class="form-label">6 {{__('Ebene in %')}} </label>
|
||||
{{ Form::text('pr_line_6', $value->pr_line_6, array('placeholder'=>__('Ebene 1'), 'class'=>'form-control', 'id'=>'pr_line_6')) }}
|
||||
</div>
|
||||
<div class="form-group col-sm-4">
|
||||
<label for="pr_line_7" class="form-label">7 {{__('Ebene in %')}} </label>
|
||||
{{ Form::text('pr_line_7', $value->pr_line_7, array('placeholder'=>__('Ebene 1'), 'class'=>'form-control', 'id'=>'pr_line_7')) }}
|
||||
</div>
|
||||
<div class="form-group col-sm-4">
|
||||
<label for="pr_line_8" class="form-label">8 {{__('Ebene in %')}} </label>
|
||||
{{ Form::text('pr_line_8', $value->pr_line_8, array('placeholder'=>__('Ebene 1'), 'class'=>'form-control', 'id'=>'pr_line_8')) }}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@
|
|||
<td>{{ $user_credit_item['first_name'] }}</td>
|
||||
<td>{{ $user_credit_item['last_name'] }}</td>
|
||||
<td>{{ $user_credit_item['email'] }}</td>
|
||||
<td>{!! formatNumber($user_credit_item['sum']) !!} €</td>
|
||||
<td><span class="no-line-break">{!! formatNumber($user_credit_item['sum']) !!} €</span></td>
|
||||
<td>
|
||||
@foreach ($user_credit_item['entries'] as $key => $credit)
|
||||
<div class="td-entry-table-margin">
|
||||
|
|
@ -94,22 +94,22 @@
|
|||
Gutschriften / Auszahlungen
|
||||
</h5>
|
||||
<div class="card-body p-0">
|
||||
{!! Form::open(['url' => route('admin_payments_invoice'), 'class' => 'form-horizontal', 'id'=>'form_filter_payment_invoices']) !!}
|
||||
{!! Form::open(['url' => route('admin_payments_credit'), 'class' => 'form-horizontal', 'id'=>'form_filter_payment_credits']) !!}
|
||||
|
||||
<div class="form-row align-items-center px-4 pb-2 pt-3">
|
||||
<div class="col-12 col-sm-4 col-md-4 col-lg-4 mb-1">
|
||||
<input class="form-control on_keyup_invoice" name="credit_filter_name" type="text" value="{{session('credit_filter_name')}}" placeholder="Name">
|
||||
<input class="form-control on_keyup_credits" name="credit_filter_name" type="text" value="{{session('credit_filter_name')}}" placeholder="Name">
|
||||
</div>
|
||||
|
||||
<div class="col-6 col-sm-4 col-md-4 col-lg-4 mb-1">
|
||||
<select class="custom-select on_change_invoice" name="credit_filter_month">
|
||||
<select class="custom-select on_change_credits" name="credit_filter_month">
|
||||
@foreach($filter_months as $key=>$value)
|
||||
<option value="{{$key}}" @if(session('credit_filter_month') == $key) selected @endif>{{$value}}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-6 col-sm-4 col-md-4 col-lg-4 mb-1">
|
||||
<select class="custom-select on_change_invoice" name="credit_filter_year">
|
||||
<select class="custom-select on_change_credits" name="credit_filter_year">
|
||||
@foreach($filter_years as $key=>$value)
|
||||
<option value="{{$value}}" @if(session('credit_filter_year') == $value) selected @endif>{{$value}}</option>
|
||||
@endforeach
|
||||
|
|
@ -154,7 +154,6 @@
|
|||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="form-group col-sm-12">
|
||||
|
||||
{{ Form::select('credit_option', ['create'=>'Gutschrift erstellen'], false, array('data-live-search'=>'false', 'class'=>'selectpicker')) }}
|
||||
</div>
|
||||
<div class="form-group col-sm-12">
|
||||
|
|
@ -188,7 +187,9 @@
|
|||
ajax: {
|
||||
url: '{!! route( 'admin_payments_credit_datatable') !!}',
|
||||
data: function(d) {
|
||||
d.filter_sales_year = $('select[name=filter_sales_year]').val();
|
||||
d.credit_filter_name = $('input[name=credit_filter_name]').val();
|
||||
d.credit_filter_month = $('select[name=credit_filter_month]').val();
|
||||
d.credit_filter_year = $('select[name=credit_filter_year]').val();
|
||||
}
|
||||
},
|
||||
"order": [[0, "desc" ]],
|
||||
|
|
@ -210,10 +211,13 @@
|
|||
"url": "/js/German.json"
|
||||
}
|
||||
});
|
||||
$('#filter_sales_year').on('change', function(){
|
||||
oTable.draw();
|
||||
});
|
||||
|
||||
$('select.on_change_credits').on('change', function(){
|
||||
oTable.draw();
|
||||
});
|
||||
|
||||
$('input.on_keyup_credits').on('keyup', function(){
|
||||
oTable.draw();
|
||||
});
|
||||
$( document ).ready(function() {
|
||||
$('#modals-credit').on('show.bs.modal', function (event) {
|
||||
var button = $(event.relatedTarget);
|
||||
|
|
|
|||
|
|
@ -1,7 +1,4 @@
|
|||
{!! Form::open(['url' => route('admin_payments_credit_create'), 'class' => 'modal-content', 'enctype' => 'multipart/form-data']) !!}
|
||||
|
||||
|
||||
|
||||
<style>
|
||||
.unselectable {
|
||||
-moz-user-select: none;
|
||||
|
|
|
|||
|
|
@ -136,11 +136,18 @@
|
|||
<span class="custom-control-label">Für dieses Produkt ist für Berater nur 1x käuflich (z.B. Starter-Kit).</span>
|
||||
</label>
|
||||
</div>
|
||||
{{-- <div class="form-group col-sm-4">
|
||||
<label class="form-label">Kaufeinschränkung Anzahl</label>
|
||||
{{ Form::text('buying_restriction_amount', $product->buying_restriction_amount, array('placeholder'=>__('Anzahl'), 'class'=>'form-control', 'id'=>'buying_restriction_amount')) }}
|
||||
</div>
|
||||
--}}
|
||||
</div>
|
||||
<hr>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-sm-12">
|
||||
<label class="custom-control custom-checkbox">
|
||||
{!! Form::checkbox('sponsor_buying_points', 1, $product->sponsor_buying_points, ['class'=>'custom-control-input', 'id'=>'sponsor_buying_points']) !!}
|
||||
<span class="custom-control-label">Sponsor erhält beim Kauf Points (z.B. Starter-Kit).</span>
|
||||
</label>
|
||||
</div>
|
||||
<div class="form-group col-md-3 col-sm-6">
|
||||
{{ Form::text('sponsor_buying_points_amount', $product->sponsor_buying_points_amount, array('placeholder'=>__('Anzahl KP'), 'class'=>'form-control', 'id'=>'sponsor_buying_points_amount')) }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
114
resources/views/admin/product/salesvolume.blade.php
Normal file
114
resources/views/admin/product/salesvolume.blade.php
Normal file
|
|
@ -0,0 +1,114 @@
|
|||
@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
|
||||
|
||||
<div class="card">
|
||||
<h5 class="card-header">
|
||||
{{ __('navigation.products') }} {{ __('navigation.sales_volumes') }}
|
||||
</h5>
|
||||
<div class="card-body">
|
||||
{!! Form::open(['url' => route('admin_product_sales_volumes_download'), 'class' => '']) !!}
|
||||
{!! Form::hidden('key', 'value') !!}
|
||||
<button type="submit" name="action" value="export" class="btn btn-md btn-primary mb-2"><i class="ion ion-md-download"></i> Export als xls</button>
|
||||
<hr>
|
||||
<div class="form-row align-items-center px-0 pb-2 pt-0">
|
||||
<div class="col-6 col-sm-4 col-md-4 col-lg-4 mb-1">
|
||||
<select class="custom-select on_change_select_filter" name="product_sales_vol_filter_month">
|
||||
@foreach($filter_months as $key=>$value)
|
||||
<option value="{{$key}}" @if(session('product_sales_vol_filter_month') == $key) selected @endif>{{$value}}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-6 col-sm-4 col-md-4 col-lg-4 mb-1">
|
||||
<select class="custom-select on_change_select_filter" name="product_sales_vol_filter_year">
|
||||
@foreach($filter_years as $key=>$value)
|
||||
<option value="{{$value}}" @if(session('product_sales_vol_filter_year') == $value) selected @endif>{{$value}}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
{!! Form::close() !!}
|
||||
|
||||
<div class="card">
|
||||
<div class="card-datatable table-responsive">
|
||||
<table class="table table-striped table-bordered" id="datatable-sales-volume">
|
||||
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{{__('#') }}</th>
|
||||
<th>{{__('Produkt')}}</th>
|
||||
<th>{{__('Artikelnummer')}}</th>
|
||||
<th>{{__('Menge')}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<script>
|
||||
|
||||
$( document ).ready(function() {
|
||||
|
||||
|
||||
var oTable = $('#datatable-sales-volume').DataTable({
|
||||
"processing": true,
|
||||
"serverSide": true,
|
||||
"stateSave": true,
|
||||
"searching": false,
|
||||
ajax: {
|
||||
url: '{!! route('admin_product_sales_volumes_datatable') !!}',
|
||||
data: function(d) {
|
||||
d.product_sales_vol_filter_month = $('select[name=product_sales_vol_filter_month]').val();
|
||||
d.product_sales_vol_filter_year = $('select[name=product_sales_vol_filter_year]').val();
|
||||
}
|
||||
},
|
||||
"order": [[0, "asc" ]],
|
||||
"columns": [
|
||||
{ data: 'id', orderable: true, searchable: false },
|
||||
{ data: 'name', name: 'name', orderable: true, searchable: false },
|
||||
{ data: 'number', name: 'number', orderable: true, searchable: false },
|
||||
{ data: 'value', name: 'value', orderable: true, searchable: false },
|
||||
|
||||
],
|
||||
"bLengthChange": false,
|
||||
"iDisplayLength": 100,
|
||||
"language": {
|
||||
"url": "/js/German.json"
|
||||
}
|
||||
});
|
||||
|
||||
$('select.on_change_select_filter').on('change', function(){
|
||||
oTable.draw();
|
||||
});
|
||||
|
||||
$('input.on_keyup_input_filter').on('keyup', function(){
|
||||
oTable.draw();
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
});
|
||||
</script>
|
||||
@endsection
|
||||
|
|
@ -67,8 +67,7 @@
|
|||
@endif
|
||||
</div>
|
||||
<div class="col-md-3 mb-1">
|
||||
|
||||
@if ($isAdmin)
|
||||
@if ($isAdmin && $shopping_order->payment_for != 8)
|
||||
<strong class="mr-2">Lieferschein:</strong>
|
||||
@if ($shopping_order->isInvoice())
|
||||
<a href="{{ route('storage_file', [$shopping_order->id, 'delivery', 'download']) }}"
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@
|
|||
<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>
|
||||
<span class="badge badge-pill badge-{{ $shopping_order->getPaymentForColor() }}" style="font-size: 0.65em;">{{ $shopping_order->getPaymentForType() }}</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>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue