last changes since 6-2023

This commit is contained in:
Kevin Adametz 2023-07-03 10:07:08 +02:00
parent da10f19fcb
commit 3a81b8a0f5
139 changed files with 5377 additions and 1511 deletions

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

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>