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

Updates to 03-2025

Browse source
This commit is contained in:
Kevin Adametz 2025-04-01 10:36:47 +02:00
parent bfa3bb1df4
commit 9ae662f63e
243 changed files with 12580 additions and 12018 deletions
Download patch file Download diff file Expand all files Collapse all files

198
resources/views/pdf/credit_details.blade.php
View file

@ -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()) }}
&euro;</strong></span>
&nbsp;
({{ __('team.net_turnover') }}:
{{ formatNumber($cbot->business_user->sales_volume_total) }} &euro; /
{{ $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') }} &euro;</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) }} &euro;</td>
<td>{{ $cbot->business_user->margin }} %</td>
<td>{{ formatNumber($user_sales_volume->caluCommissonTotalNet($cbot->business_user->margin)) }} &euro;</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) }} &euro;</td>
<td>&nbsp;</td>
<td><strong>{{ formatNumber($cbot->business_user->getSalesVolumeTotalMargin()) }} &euro;</strong></td>
<td>&nbsp;</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) }} &euro;</td>
<td>&nbsp;</td>
<td><strong>{{ formatNumber($cbot->business_user->commission_shop_sales) }} &euro;</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()) }}
&euro;</strong></span>
&nbsp;
({{ __('team.net_turnover') }}:
{{ formatNumber($cbot->business_user->sales_volume_total) }} &euro; /
{{ $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') }} &euro;</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) }} &euro;</td>
<td>{{ $cbot->business_user->margin }} %</td>
<td>{{ formatNumber($user_sales_volume->caluCommissonTotalNet($cbot->business_user->margin)) }} &euro;</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) }} &euro;</td>
<td>&nbsp;</td>
<td><strong>{{ formatNumber($cbot->business_user->getSalesVolumeTotalMargin()) }} &euro;</strong></td>
<td>&nbsp;</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) }} &euro;</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) }} &euro;</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>

171
resources/views/pdf/credit_details_long.blade.php
View file

@ -328,6 +328,11 @@
color: #565600;
}
.badge-info {
background-color: #28c3d7;
color: #fff;
}
.badge-outline-success {
background-color: #fff;
border-color: #64bc40;
@ -452,6 +457,84 @@
</div>
<hr>
@endif
{{-- Eigene Marge --}}
@if (isset($collection->own_order[$date]))
<div class="page-break">
@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()) }}
&euro;</strong></span>
&nbsp;
({{ __('team.net_turnover') }}:
{{ formatNumber($cbot->business_user->sales_volume_total) }} &euro; /
{{ $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>#</th>
<th>{{ __('Datum') }}</th>
<th>{{ __('Typ') }}</th>
<th>{{ __('Umsatz netto') }}</th>
<th>{{ __('tables.points') }}</th>
<th>{{ __('für') }}</th>
<th>{{ __('VE') }}</th>
<th>{{ __('Bestellung') }}</th>
</tr>
</thead>
<tbody>
@foreach ($order->user_sales_volumes as $user_sales_volume)
<tr>
<td>{{ $user_sales_volume->id }}</td>
<td>{{ $user_sales_volume->date }}</td>
<td>{{ $user_sales_volume->getStatusType() }}</td>
<td>{{ formatNumber($user_sales_volume->total_net) }} &euro;</td>
<td>{{ $user_sales_volume->points }}</td>
<td>{{ $user_sales_volume->getStatusPointsType() }}</td>
<td>{{ $user_sales_volume->getStatusTurnoverType() }}</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 colspan="3" class="text-right"> {{ __('tables.total') }} </td>
<td><strong>{{ formatNumber($order->credit_total_net) }} &euro;</strong></td>
<td><strong>{{ $order->credit_total_points }}</strong></td>
<td colspan="3"></td>
</tr>
</tfoot>
</table>
</div>
<hr>
</div>
@endif
{{-- Provision Shop --}}
@if (isset($collection->commission_shop[$date]))
<div class="page-break">
@php($cs = $collection->commission_shop[$date])
@ -544,84 +627,9 @@
</div>
@endif
@if (isset($collection->own_order[$date]))
<div class="page-break">
@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()) }}
&euro;</strong></span>
&nbsp;
({{ __('team.net_turnover') }}:
{{ formatNumber($cbot->business_user->sales_volume_total) }} &euro; /
{{ $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>#</th>
<th>{{ __('Datum') }}</th>
<th>{{ __('Typ') }}</th>
<th>{{ __('Umsatz netto') }}</th>
<th>{{ __('tables.points') }}</th>
<th>{{ __('für') }}</th>
<th>{{ __('VE') }}</th>
<th>{{ __('Bestellung') }}</th>
</tr>
</thead>
<tbody>
@foreach ($order->user_sales_volumes as $user_sales_volume)
<tr>
<td>{{ $user_sales_volume->id }}</td>
<td>{{ $user_sales_volume->date }}</td>
<td>{{ $user_sales_volume->getStatusType() }}</td>
<td>{{ formatNumber($user_sales_volume->total_net) }} &euro;</td>
<td>{{ $user_sales_volume->points }}</td>
<td>{{ $user_sales_volume->getStatusPointsType() }}</td>
<td>{{ $user_sales_volume->getStatusTurnoverType() }}</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 colspan="3" class="text-right"> {{ __('tables.total') }} </td>
<td><strong>{{ formatNumber($order->credit_total_net) }} &euro;</strong></td>
<td><strong>{{ $order->credit_total_points }}</strong></td>
<td colspan="3"></td>
</tr>
</tfoot>
</table>
</div>
<hr>
</div>
@endif
{{-- Points Registration
@if (isset($collection->commission_registration[$date]))
<div class="page-break">
@php($cr = $collection->commission_registration[$date])
@ -674,9 +682,11 @@
<hr>
</div>
@endif
--}}
@if (isset($cbot))
{{-- Gesamt
<div class="page-break">
<div class="card-header">
<table class="table user-view-table m-0">
@ -706,6 +716,9 @@
</table>
</div>
</div>
––}}
{{-- Payline Points / Provision / Wachstumsbonus
<div class="page-break">
<div class="card-header">
<table class="table user-view-table m-0">
@ -793,7 +806,9 @@
</tfoot>
</table>
</div>
<hr>
<hr>
--}}
<div class="card-body table-responsive pt-0 pb-0">
<table class="datatables-style table table-striped ">
<thead>

2
resources/views/pdf/delivery-detail.blade.php
View file

@ -19,7 +19,7 @@
{{ maxStrLength($shopping_order_item->product->getLang('name'), 35) }}
</td>
<td class="text-right small">
{{ $shopping_order_item->qty }}
{{ cleanIntegerFromString($shopping_order_item->qty) }}
</td>
</tr>
@endforeach

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

@ -9,7 +9,7 @@
{{ maxStrLength($value->product->getLang('name'), 35) }}
</td>
<td class="text-right small">
{{ $value->qty }}
{{ cleanIntegerFromString($value->qty) }}
</td>
</tr>
@endforeach

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

@ -28,13 +28,13 @@
{{ maxStrLength($shop_item['name'], 30) }}
</td>
<td class="text-right small">
{{$shop_item['points_total']}}
{{ number_format($shop_item['points_total'], 0) }}
</td>
<td class="text-right small">
{{ formatNumber($shop_item['user_price_net']) }} &euro;
</td>
<td class="text-right small">
{{$shop_item['qty']}}
{{ number_format($shop_item['qty'], 0) }}
</td>
<td class="text-right small">
{{ formatNumber($shop_item['user_price_total_net']) }} &euro;
@ -80,7 +80,7 @@
<td class="text-right">
</td>
<td class="text-right">
<strong>{{ $shopping_order->shopping_collect_order->qty_total }}</strong>
<strong>{{ cleanIntegerFromString($shopping_order->shopping_collect_order->qty_total) }}</strong>
</td>
<td class="text-right">
<span class="no-line-break">

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

@ -39,7 +39,7 @@
{{ $shopping_order_item->getFormattedPrice() }} &euro;
</td>
<td class="text-right small">
{{ $shopping_order_item->qty }}
{{ cleanIntegerFromString($shopping_order_item->qty) }}
</td>
<td class="text-right small">
{{ $shopping_order_item->getFormattedTaxRate() }}%
@ -52,7 +52,7 @@
{{ $shopping_order_item->getFormattedPriceVkNet() }} &euro;
</td>
<td class="text-right small">
{{ $shopping_order_item->qty }}
{{ cleanIntegerFromString($shopping_order_item->qty) }}
</td>
<td class="text-right small">
{{ $shopping_order_item->points }}

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

@ -9,7 +9,7 @@
{{ maxStrLength($value->product->getLang('name') , 35) }}
</td>
<td class="text-right small">
{{ $value->qty }}
{{ cleanIntegerFromString($value->qty) }}
</td>
<td class="text-right small">
{{ $value->getFormattedTotalPoints() }}

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

@ -106,7 +106,7 @@
{{ $shopping_order_item->getFormattedPrice() }} &euro;
</td>
<td class="text-right">
{{ $shopping_order_item->qty }}
{{ cleanIntegerFromString($shopping_order_item->qty) }}
</td>
<td class="text-right">
{{ $shopping_order_item->getFormattedTotalPrice() }} &euro;