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

23-01-2026

Browse source
This commit is contained in:
Kevin Adametz 2026-01-23 17:35:23 +01:00
parent a939cd51ef
commit a8b395e20d
248 changed files with 29342 additions and 4805 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -636,7 +636,7 @@
@foreach ($cr->user_sales_volumes as $user_sales_volume)
<tr>
<td>{{ $user_sales_volume->date }}</td>
<td>{{ $user_sales_volume->points }}</td>
<td>{{ $user_sales_volume->getFormattedPoints() }}</td>
<td>{{ $user_sales_volume->info }}</td>
</tr>
@endforeach
@ -656,7 +656,7 @@
@if (isset($cbot))
{{-- Payline Points / Provision / Wachstumsbonus
{{-- Payline Points / Provision / Tiefenbonus
<div class="card-header">
<table class="table user-view-table m-0">
<tbody>
@ -687,7 +687,7 @@
<hr>
--}}
{{-- Payline Points / Provision / Wachstumsbonus
{{-- Payline Points / Provision / Tiefenbonus
<div class="card-header">
<table class="table user-view-table m-0">
@ -737,7 +737,7 @@
</div>
--}}
{{-- Table Payline Points / Provision / Wachstumsbonus
{{-- Table Payline Points / Provision / Tiefenbonus
<div class="card-body table-responsive pt-0 pb-0">
<table class="datatables-style table table-striped ">
<thead>

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

@ -507,7 +507,7 @@
<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->getFormattedPoints() }}</td>
<td>{{ $user_sales_volume->getStatusPointsType() }}</td>
<td>{{ $user_sales_volume->getStatusTurnoverType() }}</td>
<td>
@ -581,7 +581,7 @@
<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->getFormattedPoints() }}</td>
<td>{{ $user_sales_volume->getStatusPointsType() }}</td>
<td>{{ $user_sales_volume->getStatusTurnoverType() }}</td>
<td>
@ -663,7 +663,7 @@
<td>{{ $user_sales_volume->id }}</td>
<td>{{ $user_sales_volume->date }}</td>
<td>{{ $user_sales_volume->getStatusType() }}</td>
<td>{{ $user_sales_volume->points }}</td>
<td>{{ $user_sales_volume->getFormattedPoints() }}</td>
<td>{{ $user_sales_volume->getStatusPointsType() }}</td>
<td>{{ $user_sales_volume->getStatusTurnoverType() }}</td>
<td>{{ $user_sales_volume->info }}</td>
@ -718,7 +718,7 @@
</div>
––}}
{{-- Payline Points / Provision / Wachstumsbonus
{{-- Payline Points / Provision / Tiefenbonus
<div class="page-break">
<div class="card-header">
<table class="table user-view-table m-0">

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

@ -22,6 +22,22 @@
{{ cleanIntegerFromString($shopping_order_item->qty) }}
</td>
</tr>
{{-- Bundle-Items: Enthaltene Produkte im Set/Kit auflisten --}}
@if($shopping_order_item->product->bundleItems && $shopping_order_item->product->bundleItems->count() > 0)
@foreach($shopping_order_item->product->bundleItems as $bundleItem)
<tr class="item" style="background-color: #f9f9f9;">
<td class="small text-left" style="padding-left: 5mm; color: #666;">
{{ $bundleItem->number }}
</td>
<td class="small text-left" style="color: #666;">
<span style="font-size: 0.9em;">↳ {{ $bundleItem->pivot->quantity }}x {{ maxStrLength($bundleItem->getLang('name'), 30) }}</span>
</td>
<td class="text-right small" style="color: #999;">
-
</td>
</tr>
@endforeach
@endif
@endforeach
</tbody>
</table>

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

@ -300,6 +300,9 @@
@if($shopping_order->shopping_user->shipping_address_2)
{{ $shopping_order->shopping_user->shipping_address_2 }}<br>
@endif
@if($shopping_order->shopping_user->shipping_postnumber)
<strong>{{ __('payment.dhl_postnumber') }}: {{ $shopping_order->shopping_user->shipping_postnumber }}</strong><br>
@endif
{{ $shopping_order->shopping_user->shipping_zipcode }} {{ $shopping_order->shopping_user->shipping_city }}<br>
@if($shopping_order->shopping_user->shipping_country)
{{ $shopping_order->shopping_user->shipping_country->getLocated() }}
@ -314,7 +317,7 @@
<td class="text-right">{{ $invoice_date }}</td>
</tr>
<tr>
<td class="text-left">{{ __('pdf.delivery_note_no.') }}:</td>
<td class="text-left">{{ __('pdf.invoice_nr') }}:</td>
<td class="text-right">{{ $invoice_number }}</td>
</tr>
<tr>

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

@ -75,7 +75,7 @@
<b>{{ __('order.sums') }}</b>
</td>
<td class="text-right">
<strong>{{ $shopping_order->shopping_collect_order->points }} <strong>
<strong>{{ $shopping_order->shopping_collect_order->getFormattedPoints() }} <strong>
</td>
<td class="text-right">
</td>

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

@ -54,8 +54,8 @@
<td class="text-right small">
{{ cleanIntegerFromString($shopping_order_item->qty) }}
</td>
<td class="text-right small">
{{ $shopping_order_item->points }}
<td class="text-right small">
{{ $shopping_order_item->getFormattedPoints() }}
</td>
<td class="text-right small">
@if($shopping_order_item->price > 0)
@ -70,6 +70,31 @@
@endif
</tr>
{{-- Bundle-Items: Enthaltene Produkte im Set/Kit auflisten --}}
@if($shopping_order_item->product->bundleItems && $shopping_order_item->product->bundleItems->count() > 0)
@foreach($shopping_order_item->product->bundleItems as $bundleItem)
<tr class="item" style="background-color: #f9f9f9;">
<td class="small text-left" style="padding-left: 5mm; color: #666;">
{{ $bundleItem->number }}
</td>
<td class="small text-left" style="color: #666;">
<span style="font-size: 0.9em;">{{ $bundleItem->pivot->quantity }}x {{ maxStrLength($bundleItem->getLang('name'), 30) }}</span>
</td>
@if($shopping_order->payment_for === 6)
<td class="text-right small" style="color: #999;">-</td>
<td class="text-right small" style="color: #999;">-</td>
<td class="text-right small" style="color: #999;">-</td>
<td class="text-right small" style="color: #999;">-</td>
@else
<td class="text-right small" style="color: #999;">-</td>
<td class="text-right small" style="color: #999;">-</td>
<td class="text-right small" style="color: #999;">-</td>
<td class="text-right small" style="color: #999;">-</td>
<td class="text-right small" style="color: #999;">-</td>
@endif
</tr>
@endforeach
@endif
@endforeach
</tbody>
<tfoot>

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

@ -72,7 +72,7 @@
<td colspan="4">
<b>Bestellnummer: {{ $order['order_id'] }}</b> |
WP Number: {{ $order['wp_order_number'] }} |
Points: {{ $order['shopping_order']->points }}
Points: {{ $order['shopping_order']->getFormattedPoints() }}
</td>
</tr>
<tr class="bg-grey">

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

@ -340,15 +340,15 @@
@if(isset($user_sales_volume))
<tr>
<td class="text-left">{{ __('pdf.points_order') }}:</td>
<td class="text-right">{{ $user_sales_volume->points }}</td>
<td class="text-right">{{ $user_sales_volume->getFormattedPoints() }}</td>
</tr>
<tr>
<td class="text-left">{{ __('pdf.points') }} {{ $user_sales_volume->getFormatedMonthYear() }}:</td>
<td class="text-right">{{ $user_sales_volume->month_points }}</td>
<td class="text-right">{{ $user_sales_volume->getFormattedMonthKPPoints() }}</td>
</tr>
<tr>
<td class="text-left">{{ __('pdf.points_shop') }} {{ $user_sales_volume->getFormatedMonthYear() }}:</td>
<td class="text-right">{{ $user_sales_volume->month_shop_points }}</td>
<td class="text-right">{{ $user_sales_volume->getFormattedMonthShopPoints() }}</td>
</tr>
@endif
<tr>