Updates to 03-2025
This commit is contained in:
parent
bfa3bb1df4
commit
9ae662f63e
243 changed files with 12580 additions and 12018 deletions
|
|
@ -299,7 +299,8 @@
|
|||
border-bottom: 1px solid #d6d6de;
|
||||
}
|
||||
.card hr {
|
||||
border-color: #d7d700;
|
||||
border:#d7d700 0.2pt solid;
|
||||
background-color: transparent;
|
||||
margin: 6mm 0;
|
||||
}
|
||||
|
||||
|
|
@ -323,6 +324,11 @@
|
|||
color: #484e3e;
|
||||
}
|
||||
|
||||
.badge-info {
|
||||
background-color: #28c3d7;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.badge-secondary {
|
||||
background-color: #d7d700;
|
||||
color: #565600;
|
||||
|
|
@ -452,6 +458,79 @@
|
|||
</div>
|
||||
<hr>
|
||||
@endif
|
||||
|
||||
{{-- Eigene Marge --}}
|
||||
@if (isset($collection->own_order[$date]))
|
||||
@php($order = $collection->own_order[$date])
|
||||
@if (isset($cbot))
|
||||
<div class="card-header">
|
||||
<table class="table user-view-table m-0">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>
|
||||
<strong>{{ __('team.own') }} {{ __('tables.margin') }} </strong>
|
||||
</td>
|
||||
<td>
|
||||
<span class="badge badge-info"
|
||||
style="font-size: 1em;"><strong>
|
||||
{{ formatNumber($cbot->business_user->getSalesVolumeTotalMargin()) }}
|
||||
€</strong></span>
|
||||
|
||||
({{ __('team.net_turnover') }}:
|
||||
{{ formatNumber($cbot->business_user->sales_volume_total) }} € /
|
||||
{{ $cbot->business_user->margin }} %)
|
||||
<br>
|
||||
<em>{{ __('team.consultant_margin_info') }}</em>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
@endif
|
||||
<div class="card-body table-responsive pt-0 pb-0">
|
||||
<table class="datatables-style table table-striped ">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{{ __('tables.date') }}</th>
|
||||
<th>{{ __('tables.net_sales') }}</th>
|
||||
<th>{{ __('tables.margin') }} %</th>
|
||||
<th>{{ __('tables.margin') }} €</th>
|
||||
<th>{{ __('tables.order') }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach ($order->user_sales_volumes as $user_sales_volume)
|
||||
<tr>
|
||||
<td>{{ $user_sales_volume->date }}</td>
|
||||
<td>{{ formatNumber($user_sales_volume->total_net) }} €</td>
|
||||
<td>{{ $cbot->business_user->margin }} %</td>
|
||||
<td>{{ formatNumber($user_sales_volume->caluCommissonTotalNet($cbot->business_user->margin)) }} €</td>
|
||||
<td>
|
||||
{{ $user_sales_volume->shopping_order_id }}
|
||||
@if ($user_sales_volume->shopping_order)
|
||||
<br><span
|
||||
class="small">{{ $user_sales_volume->shopping_order->getShoppingUserFullName() }}</span>
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr style="background-color: #28c3d7; color:#fff;">
|
||||
<td class="text-left"><b>{{ __('tables.total') }}<b></td>
|
||||
<td>{{ formatNumber($order->credit_total_net) }} €</td>
|
||||
<td> </td>
|
||||
<td><strong>{{ formatNumber($cbot->business_user->getSalesVolumeTotalMargin()) }} €</strong></td>
|
||||
<td> </td>
|
||||
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
</div>
|
||||
<hr>
|
||||
@endif
|
||||
|
||||
{{-- Provision Shop --}}
|
||||
@if (isset($collection->commission_shop[$date]))
|
||||
@php($cs = $collection->commission_shop[$date])
|
||||
@if (isset($cbot))
|
||||
|
|
@ -476,8 +555,6 @@
|
|||
</table>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
|
||||
<div class="card-body table-responsive pt-0 pb-0">
|
||||
<table class="datatables-style table table-striped ">
|
||||
<thead>
|
||||
|
|
@ -520,8 +597,8 @@
|
|||
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td class="text-right"> {{ __('tables.total') }} </td>
|
||||
<tr style="background-color: #b5c49b;">
|
||||
<td class="text-left"><b>{{ __('tables.total') }}</b></td>
|
||||
<td>{{ formatNumber($cs->user_sales_volumes_total->month_shop_total_net) }} €</td>
|
||||
<td> </td>
|
||||
<td><strong>{{ formatNumber($cbot->business_user->commission_shop_sales) }} €</strong></td>
|
||||
|
|
@ -530,83 +607,9 @@
|
|||
</tfoot>
|
||||
</table>
|
||||
</div>
|
||||
<hr>
|
||||
|
||||
@endif
|
||||
|
||||
@if (isset($collection->own_order[$date]))
|
||||
@php($order = $collection->own_order[$date])
|
||||
@if (isset($cbot))
|
||||
<div class="card-header">
|
||||
<table class="table user-view-table m-0">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>
|
||||
<strong>{{ __('team.own') }} {{ __('tables.margin') }} </strong>
|
||||
</td>
|
||||
<td>
|
||||
<span class="badge badge-primary"
|
||||
style="font-size: 1em;"><strong>
|
||||
{{ formatNumber($cbot->business_user->getSalesVolumeTotalMargin()) }}
|
||||
€</strong></span>
|
||||
|
||||
({{ __('team.net_turnover') }}:
|
||||
{{ formatNumber($cbot->business_user->sales_volume_total) }} € /
|
||||
{{ $cbot->business_user->margin }} %)
|
||||
<br>
|
||||
<em>{{ __('team.consultant_margin_info') }}</em>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div class="card-body table-responsive pt-0 pb-0">
|
||||
<table class="datatables-style table table-striped ">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{{ __('tables.date') }}</th>
|
||||
<th>{{ __('tables.net_sales') }}</th>
|
||||
<th>{{ __('tables.margin') }} %</th>
|
||||
<th>{{ __('tables.margin') }} €</th>
|
||||
<th>{{ __('tables.order') }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach ($order->user_sales_volumes as $user_sales_volume)
|
||||
<tr>
|
||||
<td>{{ $user_sales_volume->date }}</td>
|
||||
<td>{{ formatNumber($user_sales_volume->total_net) }} €</td>
|
||||
<td>{{ $cbot->business_user->margin }} %</td>
|
||||
<td>{{ formatNumber($user_sales_volume->caluCommissonTotalNet($cbot->business_user->margin)) }} €</td>
|
||||
<td>
|
||||
{{ $user_sales_volume->shopping_order_id }}
|
||||
@if ($user_sales_volume->shopping_order)
|
||||
<br><span
|
||||
class="small">{{ $user_sales_volume->shopping_order->getShoppingUserFullName() }}</span>
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td class="text-right"> {{ __('tables.total') }} </td>
|
||||
<td>{{ formatNumber($order->credit_total_net) }} €</td>
|
||||
<td> </td>
|
||||
<td><strong>{{ formatNumber($cbot->business_user->getSalesVolumeTotalMargin()) }} €</strong></td>
|
||||
<td> </td>
|
||||
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
</div>
|
||||
<hr>
|
||||
|
||||
@endif
|
||||
|
||||
|
||||
{{-- Points Registration
|
||||
@if (isset($collection->commission_registration[$date]))
|
||||
@php($cr = $collection->commission_registration[$date])
|
||||
<div class="card-header">
|
||||
|
|
@ -648,10 +651,12 @@
|
|||
</table>
|
||||
</div>
|
||||
<hr>
|
||||
|
||||
@endif
|
||||
--}}
|
||||
|
||||
|
||||
@if (isset($cbot))
|
||||
{{-- Payline Points / Provision / Wachstumsbonus
|
||||
<div class="card-header">
|
||||
<table class="table user-view-table m-0">
|
||||
<tbody>
|
||||
|
|
@ -680,6 +685,10 @@
|
|||
</table>
|
||||
</div>
|
||||
<hr>
|
||||
--}}
|
||||
|
||||
{{-- Payline Points / Provision / Wachstumsbonus
|
||||
|
||||
<div class="card-header">
|
||||
<table class="table user-view-table m-0">
|
||||
<tbody>
|
||||
|
|
@ -726,6 +735,9 @@
|
|||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
--}}
|
||||
|
||||
{{-- Table Payline Points / Provision / Wachstumsbonus
|
||||
<div class="card-body table-responsive pt-0 pb-0">
|
||||
<table class="datatables-style table table-striped ">
|
||||
<thead>
|
||||
|
|
@ -767,7 +779,28 @@
|
|||
</table>
|
||||
</div>
|
||||
<hr>
|
||||
|
||||
--}}
|
||||
<div class="page-break-always">
|
||||
<div class="card-header">
|
||||
<table class="table user-view-table m-0">
|
||||
<tbody>
|
||||
@if($cbot->business_user->version == 2)
|
||||
<tr>
|
||||
<td><strong>{{ __('team.commission_payline') }}:</strong></td>
|
||||
<td>
|
||||
<span class="badge badge-secondary" style="font-size: 1em;"><strong>{{ formatNumber($cbot->business_user->commission_pp_total) }} €</strong></span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><strong>{{ __('team.commission_WB') }}:</strong></td>
|
||||
<td>
|
||||
<span class="badge badge-secondary" style="font-size: 1em;"><strong>{{ formatNumber($cbot->business_user->commission_growth_total) }} €</strong></span>
|
||||
</td>
|
||||
</tr>
|
||||
@endif
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div class="card-body table-responsive pt-0 pb-0">
|
||||
<table class="datatables-style table table-striped ">
|
||||
<thead>
|
||||
|
|
@ -785,6 +818,7 @@
|
|||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
@endforeach
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue