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

last changes since 6-2023

Browse source
This commit is contained in:
Kevin Adametz 2023-07-03 10:07:08 +02:00
parent 0341c9c189
commit 04d677d37a
142 changed files with 7895 additions and 2855 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/lang/de/email.php
View file

@ -48,7 +48,7 @@
'invoice_title' => 'Rechnung zu Deiner Bestellung auf mivita.care',
'credit_title' => 'Deine Gutschrift auf mivita.care',
'invoice_copy1line' => 'vielen Dank für Deine Bestellung bei mivita.care. Nachfolgend senden wir Dir die Rechnung zu deiner Bestellung: ',
'credit_copy1line' => 'nachfolgend senden wir Dir Deine Gutschrift zu.',
'credit_copy1line' => "Deine Gutschrift ist da und die hast Du Dir redlich verdient!\n\nWir werden den Auszahlungsbetrag in den nächsten 5 Werktagen auf Dein Konto überweisen. Bitte prüfe, ob Deine aktuellen Bankdaten in Deinem Salescenter-Account hinterlegt sind (Mein Konto -> Meine Daten). Wir wünschen Dir weiterhin eine erfolgreiche Zeit bei MIVITA.\n\nDu möchtest noch mehr erreichen? Dann sprich Deinen Sponsor oder andere Teamleiter an. Sie erarbeiten mit Dir auf Basis unseres Marketingplans einen ganz persönlichen Weg Deines Erfolges.\n\nViele Grüße,\nDein Team von MIVITA ",
'update_level_title' => 'Deine Karriere-Level auf mivita.care',
'update_level_copy1line' => 'Herzlichen Glückwunsch, Du hast im letzten Monat Deine Qualifikation (TP :tp) erreicht und hast damit Deinen nächsten Karriere-Level erreicht.<br><br>Ab sofort bist Du: <b>:to</b>',
'footer_copy1' => 'mivita e.K. | Leinfeld 2 | 87755 Kirchhaslach | Telefon: +49 (0) 8333 946 17 67 | E-Mail: info@mivita.care',

3
resources/lang/de/navigation.php
View file

@ -45,5 +45,6 @@ return [
'business' => 'Business',
'structure' => 'Struktur',
'commissions' => 'Provisionen',
'export' => 'Export',
'sales_volumes' => 'Absatzmengen',
];

221
resources/views/admin/business/_user_detail_in.blade.php
View file

@ -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 }} &nbsp;
<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) }})
&nbsp; <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) &nbsp;
</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> &nbsp;
@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) }} &euro; / {{ $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) }} &euro;</strong></span>
<span class="badge badge-primary" style="font-size: 1em;"><strong>{{ formatNumber($TreeCalcBot->business_user->commission_pp_total) }} &euro;</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) }} &euro;</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) }} &euro;</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()) }} &euro;</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 &euro;</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) }} &euro;</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) }} &euro;</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) }} &euro;</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) }} &euro;</strong></td>
<td><strong>{{ formatNumber($TreeCalcBot->business_user->commission_pp_total, 2) }} &euro;</strong></td>
</tr>
</tfoot>

2
resources/views/admin/business/commissions.blade.php
View file

@ -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 },

11
resources/views/admin/business/modal_add_points.blade.php
View file

@ -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>

14
resources/views/admin/business/modal_edit_points.blade.php
View file

@ -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">

4
resources/views/admin/business/points.blade.php
View file

@ -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 },

2
resources/views/admin/business/show.blade.php
View file

@ -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 },

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

@ -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 -->

8
resources/views/admin/customer/_edit.blade.php
View file

@ -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')

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

@ -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>

2
resources/views/admin/modal/business_user_detail.blade.php
View file

@ -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

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

@ -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

12
resources/views/admin/modal/user_level_edit.blade.php
View file

@ -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>

26
resources/views/admin/payment/credit.blade.php
View file

@ -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']) !!} &euro;</td>
<td><span class="no-line-break">{!! formatNumber($user_credit_item['sum']) !!} &euro;</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);

3
resources/views/admin/payment/modal_credit_status.blade.php
View file

@ -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;

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

@ -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
View 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> &nbsp;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

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

@ -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']) }}"

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

@ -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>

4
resources/views/dashboard/_membership.blade.php
View file

@ -28,7 +28,7 @@
<td class="text-left font-weight-semibold">{{__('Provision')}}:</td>
<td class="text-left font-weight-semibold">{{__('Shop Provision')}}:</td>
<td class="text-left font-weight-semibold">{{__('Qualifikation')}}:</td>
<td class="text-left font-weight-semibold">{{__('Team Qualifikation')}}:</td>
<td class="text-left font-weight-semibold">{{__('Payline Qualifikation')}}:</td>
</tr>
@if($user->m_level && $user->user_level)
<tr>
@ -42,7 +42,7 @@
{{ $user->user_level->qual_kp }} Points
</td>
<td class="text-left font-weight-bold">
{{ $user->user_level->qual_tp }} Points
{{ $user->user_level->qual_pp }} Points
</td>
</tr>
@endif

2
resources/views/dashboard/_points.blade.php
View file

@ -9,7 +9,7 @@
@php($userSalesVolume = $user->getUserSalesVolume(date('n'), date('Y'), 'first'))
@if($userSalesVolume)
<div class="mb-2">
<strong>Gesamte Points: {{ $userSalesVolume->getPointsSum() }}</strong> | Eigene: {{ $userSalesVolume->month_points }} | Shop: {{ $userSalesVolume->month_shop_points }}<br>
<strong>Gesamte Points: {{ $userSalesVolume->getPointsKPSum() }}</strong> | Eigene: {{ $userSalesVolume->month_points }} | Shop: {{ $userSalesVolume->month_shop_points }}<br>
</div>
<div>
<strong>Gesamter Umsatz: {{ formatNumber($userSalesVolume->getTotalNetSum()) }} &euro;</strong> | Eigene: {{ formatNumber($userSalesVolume->month_total_net) }} &euro; | Shop: {{ formatNumber($userSalesVolume->month_shop_total_net) }} &euro;

13
resources/views/emails/collection_detail.blade.php
View file

@ -11,26 +11,26 @@
{{$shop_item['name']}}
</td>
<td style="color:#37302d; text-align: center; vertical-align: top;line-height:1.6em;">
{{ formatNumber($shop_item['user_price_total_net']) }} &euro;
{{ formatNumber($shop_item['user_price_net']) }} &euro;
</td>
<td style="color:#37302d; text-align: center; vertical-align: top; width: 10%;line-height:1.6em;">
{{$shop_item['qty']}}
</td>
<td style="color:#37302d; text-align: right; vertical-align: top;line-height:1.6em;">
{{ formatNumber($shop_item['user_tax_total']) }} &euro;
{{ formatNumber($shop_item['user_price_total_net']) }} &euro;
</td>
</tr>
@endforeach
<tr>
<td style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
<td style="color:#37302d; text-align: left; vertical-align:top; line-height:1.6em;">
Gesamte Versandkosten
</td>
<td style="color:#37302d; text-align: center; vertical-align: top;line-height:1.6em;">
<td style="color:#37302d; text-align: center; vertical-align:top; line-height:1.6em;">
</td>
<td style="color:#37302d; text-align: center; vertical-align: top; width: 10%;line-height:1.6em;">
<td style="color:#37302d; text-align: center; vertical-align:top; width:10%; line-height:1.6em;">
1
</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.6em;">
{{ formatNumber($shopping_order->shopping_collect_order->shipping_net) }} &euro;
</td>
</tr>
@ -40,7 +40,6 @@
</td>
</tr>
<tr>
<td colspan="3" style="color:#37302d; text-align: left; vertical-align: top;line-height:1.6em;">
Summe
</td>

15
resources/views/layouts/includes/layout-sidenav.blade.php
View file

@ -62,6 +62,15 @@
<li class="sidenav-item{{ Request::is('user/team/structure') ? ' active' : '' }}">
<a href="{{ route('user_team_structure') }}" class="sidenav-link"><i class="sidenav-icon ion ion ion-md-funnel rotate-180" style="text-align: right"></i><div>{{ __('navigation.structure') }}</div></a>
</li>
@if(Auth::user()->isAdmin())
<li class="sidenav-item{{ Request::is('user/team/export') ? ' active' : '' }}">
<a href="{{ route('user_team_export') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-download"></i><div>{{ __('navigation.export') }}</div>
<div class="pl-1 ml-auto">
<div class="badge badge-primary">Admin</div>
</div>
</a>
</li>
@endif
<li class="sidenav-item{{ Request::is('user/team/points') ? ' active' : '' }}">
<a href="{{ route('user_team_points') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-arrow-dropup-circle"></i><div>{{ __('navigation.points') }}</div></a>
</li>
@ -196,9 +205,13 @@
<li class="sidenav-item{{ Request::is('admin/product/ingredients') ? ' active' : '' }}">
<a href="{{ route('admin_product_ingredients') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-ice-cream"></i><div>{{ __('navigation.ingredients') }}</div></a>
</li>
<li class="sidenav-item{{ Request::is('admin/product/attributes') ? ' active' : '' }}">
<li class="sidenav-item{{ Request::is('admin/product/sales/volume') ? ' active' : '' }}">
<a href="{{ route('admin_product_sales_volumes') }}" class="sidenav-link"><i class="sidenav-icon ion ion-ios-cart"></i><div>{{ __('navigation.sales_volumes') }}</div></a>
</li>
{{-- <li class="sidenav-item{{ Request::is('admin/product/attributes') ? ' active' : '' }}">
<a href="{{ route('admin_product_attributes') }}" class="sidenav-link"><i class="sidenav-icon ion ion-md-apps"></i><div>{{ __('navigation.attribute') }}</div></a>
</li>
--}}
</ul>
</li>

32
resources/views/pdf/credit.blade.php
View file

@ -239,7 +239,7 @@
width: 180mm;
height: 20mm;
z-index: 6;
text-align: center;
text-align: left;
}
.text-right {
@ -311,16 +311,14 @@
</tr>
@if($user->account->tax_number)
<tr>
<td>
{{ __('St.-Nr') }}: {{ $user->account->tax_number}}
</td>
<td class="text-left">{{ __('Steuer-Nr.') }}:</td>
<td class="text-right">{{ $user->account->tax_number}}</td>
</tr>
@else
@if($user->account->tax_identification_number)
<tr>
<td>
{{ __('USt-IdNr.') }}: {{ $user->account->tax_identification_number}}
</td>
<td class="text-left">{{ __('USt-IdNr.') }}:</td>
<td class="text-right">{{ $user->account->tax_identification_number}}</td>
</tr>
@endif
@endif
@ -351,7 +349,7 @@
{!! nl2br($user_credit_item->message) !!} / {{ $user_credit_item->created_at->format('d.m.Y') }}
</td>
<td class="text-right small">
{{ \App\Services\Util::formatNumber($user_credit_item->credit) }} &euro;*
* {{ \App\Services\Util::formatNumber($user_credit_item->credit) }} &euro;
</td>
</tr>
@endforeach
@ -362,7 +360,7 @@
Zwischensumme
</td>
<td class="text-right">
{{ \App\Services\Util::formatNumber($user_credits->net) }} &euro;*
* {{\App\Services\Util::formatNumber($user_credits->net) }} &euro;
</td>
</tr>
@ -380,8 +378,6 @@
<tr class="">
<td class="text-right">
Mehrwertsteuer: {{ $user_credits->tax_rate }} % <br>
Gutschriftsempfänger ist Kleinunternehmer nach § 19 (1) UStG.
</td>
<td class="text-right">
{{ \App\Services\Util::formatNumber($user_credits->tax) }} &euro;
@ -406,6 +402,20 @@
<div id="footer_box">
<div class="text">
@if($user_credits->taxable === 2)
<p>
Als Kleinunternehmer im Sinne von § 19 Abs. 1 UStG wird keine Umsatzsteuer berechnet.
</p>
@endif
@if($user_credits->taxable === 3)
<p>
Reverse-Charge-Verfahren, Umkehr der Steuerschuldnerschaft.
</p>
@endif
</div>
</div>

10
resources/views/pdf/delivery-homeparty.blade.php
View file

@ -2,20 +2,20 @@
<table>
<thead>
<tr>
<th class="text-left" style="width: 10%">Artikel-Nr.</th>
<th class="text-left" style="width: 40%">Bezeichnung</th>
<th class="text-right" style="width: 10%">Menge</th>
<th class="text-left" style="width: 15%">Artikel-Nr.</th>
<th class="text-left" style="width: 70%">Bezeichnung</th>
<th class="text-right" style="width: 15%">Menge</th>
</tr>
</thead>
<tbody>
@if($shopping_order->homeparty->homeparty_host)
@include('pdf.delivery-homeparty-detail', ['homeparty'=>$shopping_order->homeparty, 'homeparty_user' => $shopping_order->homeparty->homeparty_host])
@endif
@if($shopping_order->homeparty->homeparty_guests)
@foreach($shopping_order->homeparty->homeparty_guests as $homeparty_guest)
@include('pdf.delivery-homeparty-detail', ['homeparty'=>$shopping_order->homeparty, 'homeparty_user' => $homeparty_guest])
@endforeach
@endif
</tbody>
</tbody>
</table>
</div>

40
resources/views/pdf/delivery.blade.php
View file

@ -370,5 +370,45 @@
@else
@include('pdf.delivery-detail')
@endif
<div id="footer_box">
<div class="text">
@if($shopping_order->member)
<div class="dotted-line"></div>
<p>Bei Fragen sind wir jederzeit für Dich da.<br>
@if($shopping_order->member->shop && $shopping_order->member->isActiveShop())
@if($shopping_order->member->shop->title)
<b>{{ $shopping_order->member->shop->title }}</b><br>
@endif
@if($shopping_order->member->shop->contact)
{!! str_replace(array("\r\n", "\r", "\n"), " • ", $shopping_order->member->shop->contact) !!}<br>
@endif
<a href="{{ $shopping_order->member->shop->getSubdomain(true) }}">{{ $shopping_order->member->shop->getSubdomain(true) }}</a>
@else
Dein Berater: {{$shopping_order->member->getFullName()}}
@endif
</p>
@endif
@if($shopping_order->payment_for === 4)
<div class="dotted-line"></div>
<p>Bei Fragen sind wir jederzeit für Dich da.<br>
@if($shopping_order->auth_user->shop && $shopping_order->auth_user->isActiveShop())
@if($shopping_order->auth_user->shop->title)
<b>{{ $shopping_order->auth_user->shop->title }}</b><br>
@endif
@if($shopping_order->auth_user->shop->contact)
{!! str_replace(array("\r\n", "\r", "\n"), " • ", $shopping_order->auth_user->shop->contact) !!}<br>
@endif
<a href="{{ $shopping_order->auth_user->shop->getSubdomain(true) }}">{{ $shopping_order->auth_user->shop->getSubdomain(true) }}</a>
@else
Dein Berater: {{$shopping_order->auth_user->getFullName()}}
@endif
</p>
@endif
</div>
</div>
</body>
</html>

21
resources/views/pdf/invoice-collection.blade.php
View file

@ -106,15 +106,18 @@
</td>
</tr>
@foreach ($shopping_order->shopping_collect_order->tax_split as $tax_rate => $tax)
<tr class="">
<td class="text-right">&nbsp;</td>
<td class="text-left" colspan="5">
zzgl. {{ $tax_rate }}% MwSt
</td>
<td class="text-right" colspan="2">
{{ formatNumber($tax) }} &euro;
</td>
</tr>
<tr class="">
<td class="text-right">&nbsp;</td>
<td class="text-left" colspan="5">
zzgl. {{ $tax_rate }}% MwSt
@if(isset($shopping_order->shopping_collect_order->net_split[$tax_rate]))
/ aus {{ Util::formatNumber($shopping_order->shopping_collect_order->net_split[$tax_rate]) }} &euro; netto
@endif
</td>
<td class="text-right" colspan="2">
{{ formatNumber($tax) }} &euro;
</td>
</tr>
@endforeach

3
resources/views/pdf/invoice-detail.blade.php
View file

@ -112,6 +112,9 @@
<td class="text-right">&nbsp;</td>
<td class="text-left" colspan="{{ $colspan }}">
zzgl. {{ $tax_rate }}% MwSt
@if(isset($shopping_order->net_split[$tax_rate]))
/ aus {{ Util::formatNumber($shopping_order->net_split[$tax_rate]) }} &euro; netto
@endif
</td>
<td class="text-right">
{{ formatNumber($tax) }} &euro;

5
resources/views/pdf/invoice-homeparty.blade.php
View file

@ -60,7 +60,10 @@
<tr class="foot-small">
<td class="">&nbsp;</td>
<td class="text-left" colspan="4">
zzgl. {{ $tax_rate }}% MwSt
zzgl. {{ $tax_rate }}% MwSt
@if(isset($shopping_order->net_split[$tax_rate]))
/ aus {{ Util::formatNumber($shopping_order->net_split[$tax_rate]['ek_net']) }} &euro; EK netto
@endif
</td>
<td class="text-muted text-right">
<span class="no-line-break">

4
resources/views/pdf/invoice.blade.php
View file

@ -384,7 +384,6 @@
<p>
@if(isset($shopping_order->shopping_user->auth_user->account->tax_identification_number))
USt-ID des Leistungsempfängers: {{ $shopping_order->shopping_user->auth_user->account->tax_identification_number }}<br>
@else
@if(isset($shopping_order->shopping_user->auth_user->account->tax_number))
USt-Nr. des Leistungsempfängers: {{ $shopping_order->shopping_user->auth_user->account->tax_number }}<br>
@ -394,6 +393,9 @@
<span class="xsmall">Die Rechnung erfolgt ohne Umsatzsteuer, da vorliegend der Wechsel der Steuerschuldnerschaft (Reverse-Charge-Verfahren) greift.<br>
Die Umsatzsteuer ist vom Leistungsempfänger anzumelden und abzuführen.</span>
@endif
@if(isset($user_tax_free) && $user_tax_free)
<br><span class="xsmall">Steuerfreie Ausfuhrlieferung</span>
@endif
</p>
@endif
@if($shopping_order->member)

2
resources/views/sys/index.blade.php
View file

@ -15,6 +15,8 @@
<a href="{{ route('sysadmin_tool', ['shopping_orders']) }}" class="d-block mb-3"><i class="ion ion-ios-arrow-forward"></i>&nbsp; Shopping Orders Käufe</a>
<a href="{{ route('sysadmin_tool', ['import']) }}" class="d-block mb-3"><i class="ion ion-ios-arrow-forward"></i>&nbsp; Import</a>
<a href="{{ route('sysadmin_tool', ['corrections']) }}" class="d-block mb-3"><i class="ion ion-ios-arrow-forward"></i>&nbsp; Corrections Points / Payment / Price / Tax / Tax Spit / Points / Discount </a>
<a href="{{ route('sysadmin_tool', ['change_user_businesses']) }}" class="d-block mb-3"><i class="ion ion-ios-arrow-forward"></i>&nbsp; Change user level qual_pp in UserBusiness </a>
</div>
</div>
</div>

19
resources/views/user/homeparty/show_calc_bonus_host.blade.php
View file

@ -1,6 +1,15 @@
@php($user_cart = \App\Services\HomepartyCart::getUserCartHost())
@php($homeparty = \App\Services\HomepartyCart::$homeparty)
@if(!$user_cart->isPrice() && (\App\Services\HomepartyCart::$is_bonus || \App\Services\HomepartyCart::$is_bonus_coupon))
<tr class="foot-small">
<td colspan="8" class="text-left bg-danger text-white">
<strong>Gutschein / Bonus kann nicht angewendet werden, da beim Gastgeber:in keine Produkte hinzugefügt wurden.</strong>
</td>
</tr>
@endif
@if(\App\Services\HomepartyCart::$is_bonus)
<tr class="foot-small">
<td colspan="5" class="text-left">Gutschrift Homeparty Gutschein</td>
@ -47,7 +56,9 @@
<td>&nbsp;</td>
</tr>
@endif
<tr class="foot-small">
{{-- <tr class="foot-small">
<td colspan="5" class="text-left bg-warning-light">Versandkosten:</td>
<td class="bg-warning-light">&nbsp;</td>
<td class="text-right bg-warning-light">&nbsp;</td>
@ -57,7 +68,7 @@
<span class="small">~{{ $user_cart->getCurrencyByKey('ShippingPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
</tr>--}}
<tr>
<td colspan="4" class="border-top"><strong>Gesamt:</strong></td>
<td class="border-top text-right">
@ -76,9 +87,9 @@
@endif
</td>
<td class="border-top text-right">
<div class="no-line-break"><strong>{{$user_cart->getFormattedEkPrice()}} &euro;</strong></div>
<div class="no-line-break"><strong>{{$user_cart->getFormattedEkPriceWithout()}} &euro;</strong></div>
@if($homeparty->isPriceCurrency())
<span class="small">~{{ $user_cart->getCurrencyByKey('EkPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
<span class="small">~{{ $user_cart->getCurrencyByKey('EkPriceWithout') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>

16
resources/views/user/homeparty/show_products_order.blade.php
View file

@ -106,7 +106,7 @@
@endif
</tr>
@if($homeparty_guest->getDelivery() === 'direct')
<tr>
{{-- <tr>
<td colspan="5" class="text-left bg-warning-light">Versandkosten</td>
<td class="bg-warning-light">&nbsp;</td>
<td class="text-right bg-warning-light">
@ -121,29 +121,29 @@
<span class="small no-line-break">~{{ $user_cart->getCurrencyByKey('ShippingPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>
</tr>--}}
@endif
<tr>
<td colspan="4" class="border-top"><strong>Gesamt:</strong></td>
<td class="border-top text-right">
<div class="no-line-break"><strong>{{$user_cart->getFormattedPoints()}}</strong></div>
<div class="no-line-break"><strong>{{ $user_cart->getFormattedPoints()}}</strong></div>
</td>
<td class="border-top text-right">
<div class="no-line-break"><strong>{{$user_cart->getFormattedIncomePrice()}} &euro;</strong></div>
<div class="no-line-break"><strong>{{ $user_cart->getFormattedIncomePrice()}} &euro;</strong></div>
@if($homeparty->isPriceCurrency())
<span class="small no-line-break">~{{ $user_cart->getCurrencyByKey('IncomePrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
<td class="border-top text-right">
<div class="no-line-break"><strong>{{$user_cart->getFormattedPrice()}} &euro;</strong></div>
<div class="no-line-break"><strong>{{$user_cart->getFormattedPriceWithout()}} &euro;</strong></div>
@if($homeparty->isPriceCurrency())
<span class="small no-line-break">~{{ $user_cart->getCurrencyByKey('Price') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
<span class="small no-line-break">~{{ $user_cart->getCurrencyByKey('PriceWithout') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
<td class="border-top text-right">
<div class="no-line-break"><strong>{{$user_cart->getFormattedEkPrice()}} &euro;</strong></div>
<div class="no-line-break"><strong>{{$user_cart->getFormattedEkPriceWithout()}} &euro;</strong></div>
@if($homeparty->isPriceCurrency())
<span class="small no-line-break">~{{ $user_cart->getCurrencyByKey('EkPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
<span class="small no-line-break">~{{ $user_cart->getCurrencyByKey('EkPriceWithout') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@endif
</td>
</tr>

14
resources/views/user/homeparty/show_total_order.blade.php
View file

@ -14,7 +14,7 @@
@php($user_cart = \App\Services\HomepartyCart::getUserCart($homeparty->homeparty_host->id))
<tr>
<td>
<strong>Gastgeber/in {{$homeparty->homeparty_host->billing_firstname}} {{$homeparty->homeparty_host->billing_lastname}}</strong>
<strong>Gastgeber:in | {{$homeparty->homeparty_host->billing_firstname}} {{$homeparty->homeparty_host->billing_lastname}}</strong>
</td>
<td class="text-right">
{{$user_cart->getFormattedPoints()}}
@ -40,8 +40,8 @@
</tr>
@if($user_cart->shipping_price > 0)
<tr>
<td class="text-left bg-warning-light" colspan="4">Versandkosten:</td>
<td class="text-right bg-warning-light">
<td class="text-left bg-warning-light1" colspan="4">Versandkosten Gastgeber:in</td>
<td class="text-right bg-warning-light1">
<div class="no-line-break">{{$user_cart->getFormattedShippingPrice()}} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small no-line-break">~{{ $user_cart->getCurrencyByKey('ShippingPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>
@ -52,12 +52,12 @@
@endif
@if($homeparty->homeparty_guests)
@php($g_count = 1)
@php($g_count = 0)
@foreach($homeparty->homeparty_guests as $homeparty_guest)
@php($user_cart = \App\Services\HomepartyCart::getUserCart($homeparty_guest->id))
<tr>
<td>
<strong> {!! $g_count++ !!}. Gast {{$homeparty_guest->billing_firstname}} {{$homeparty_guest->billing_lastname}}</strong>
<strong> {!! ++$g_count !!}. Gast | {{$homeparty_guest->billing_firstname}} {{$homeparty_guest->billing_lastname}}</strong>
</td>
<td class="text-right">
{{$user_cart->getFormattedPoints()}}
@ -83,8 +83,8 @@
</tr>
@if($user_cart->shipping_price > 0)
<tr>
<td class="text-left bg-warning-light" colspan="4">Versandkosten:</td>
<td class="text-right bg-warning-light">
<td class="text-left bg-warning-light1" colspan="4">Versandkosten {!! $g_count !!}. Gast</td>
<td class="text-right bg-warning-light1">
<div class="no-line-break">{{$user_cart->getFormattedShippingPrice()}} &euro;</div>
@if($homeparty->isPriceCurrency())
<span class="small no-line-break">~{{ $user_cart->getCurrencyByKey('ShippingPrice') }} {{ $homeparty->getPriceCurrencyUnit() }} </span>

2
resources/views/user/team/_points_sum.blade.php
View file

@ -1,7 +1,7 @@
<h6>
@if($userSalesVolume)
<div class="mb-2">
<strong>Gesamte Points: {{ $userSalesVolume->getPointsSum() }}</strong> | Eigene: {{ $userSalesVolume->month_points }} | Shop: {{ $userSalesVolume->month_shop_points }}<br>
<strong>Gesamte Points: {{ $userSalesVolume->getPointsKPSum() }}</strong> | Eigene: {{ $userSalesVolume->month_points }} | Shop: {{ $userSalesVolume->month_shop_points }}<br>
</div>
<div>
<strong>Gesamter Umsatz: {{ formatNumber($userSalesVolume->getTotalNetSum()) }} &euro;</strong> | Eigene: {{ formatNumber($userSalesVolume->month_total_net) }} &euro; | Shop: {{ formatNumber($userSalesVolume->month_shop_total_net) }} &euro;

103
resources/views/user/team/export.blade.php Normal file
View file

@ -0,0 +1,103 @@
@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">
{{ __('navigation.my_team') }}
</h4>
<div class="card">
<h5 class="card-header">
{{__('Export')}}
</h5>
<div class="card-body">
{!! Form::open(['url' => route('user_team_export_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> &nbsp;Export als xls</button>
{!! Form::close() !!}
<div class="card">
<div class="card-datatable table-responsive">
<table class="table table-striped table-bordered" id="datatable-user-team">
<thead>
<tr>
<th>{{__('Line') }}</th>
<th>{{__('Level')}}</th>
<th>{{__('E-Mail')}}</th>
<th>{{__('Vorname')}}</th>
<th>{{__('Nachname')}}</th>
<th>{{__('Adresse')}}</th>
<th>{{__('Zusatz') }}</th>
<th>{{__('PLZ') }}</th>
<th>{{__('Ort') }}</th>
<th>{{__('Land') }}</th>
<th>{{__('Tel') }}</th>
<th>{{__('Mobil') }}</th>
<th>{{__('Geburtstag') }}</th>
<th>{{__('Account') }}</th>
<th>{{__('Account bis') }}</th>
<th>{{__('Sponsor')}}</th>
</tr>
</thead>
<tbody>
@if(isset($ExportBot) && isset($ExportBot->user_list->childs))
@foreach ($ExportBot->user_list->childs as $child)
<tr>
<td>{{ $child->line }}</td>
<td>{{ $child->level_name }}</td>
<td>{{ $child->email }}</td>
<td>{{ $child->first_name }}</td>
<td>{{ $child->last_name }}</td>
<td>{{ $child->address }}</td>
<td>{{ $child->address_2 }}</td>
<td>{{ $child->zipcode }}</td>
<td>{{ $child->city }}</td>
<td>{{ $child->country_id }}</td>
<td>{{ $child->phone }}</td>
<td>{{ $child->mobil }}</td>
<td>{{ $child->birthday }}</td>
<td>{!! ($child->active_account == 1 ? 'JA' : 'NEIN') !!}</td>
<td>{{ $child->payment_account_date }}</td>
<td>{{ $child->sponsor_name }}</td>
</tr>
@endforeach
@endif
</tbody>
</table>
</div>
</div>
</div>
</div>
<script>
$( document ).ready(function() {
$('#datatable-user-team').dataTable({
"bLengthChange": false,
"iDisplayLength": 50,
"order": [[ 1, "desc" ]],
"language": {
"url": "/js/German.json"
}
});
});
</script>
@endsection

3
resources/views/user/wizard/_payment.blade.php
View file

@ -104,12 +104,13 @@
@endif
<div class="text-left mt-3">
<hr>
<label class="custom-control custom-checkbox">
{{-- <label class="custom-control custom-checkbox">
<input type="checkbox" class="custom-control-input" name="abo_options">
<span class="custom-control-label secondary"><strong>{{__('payment.status.auto_renewal_hl')}}:</strong> {{__('payment.status.auto_renewal_line_1')}}</span>
<p class="text-muted">{{__('payment.status.auto_renewal_line_2')}}</p>
</label>
<hr>
--}}
<div class="float-right">
<strong>Gesamtsumme @if(\App\Services\UserService::getTaxFree()) netto @else brutto @endif: <span id="card_total_price">0</span> €</strong>