gitmedia/gruene-seele
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:39:21 +02:00
parent 6167273a48
commit 9b54eb0512
348 changed files with 34535 additions and 5774 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,13 +3,14 @@
<!-- Status -->
<div class="card-body">
<div class="row">
<div class="col-md-4 mb-1">
<div class="col-md-3 mb-1">
<strong class="mr-2">Status:</strong>
<span class="text-big">
{!! \App\Services\Payment::getShoppingOrderBadge($shopping_order); !!}
</span>
{!! \App\Services\Payment::getPaymentForTypeBadge($shopping_order) !!}
{!! \App\Services\Payment::getShoppingOrderBadge($shopping_order) !!}
</span>
</div>
<div class="col-md-4 mb-1">
<div class="col-md-3 mb-1">
<strong class="mr-2">Versand:</strong>
@if($isAdmin)
<button type="button" class="btn btn-sm btn-{{$shopping_order->getShippedColor()}}" data-toggle="modal" data-target="#modals-shipped"
@ -25,18 +26,18 @@
</span>
@endif
</div>
<div class="col-md-4 mb-1">
<div class="col-md-3 mb-1">
<strong class="mr-2">Rechnung:</strong>
@if($isAdmin)
@if(App\Services\Invoice::isInvoice($shopping_order))
<a href="{{ route('storage_file', [$shopping_order->id, 'invoice', 'download']) }}" class="btn btn-primary btn-sm"><i class="fa fa-download"></i></a>
<a href="{{ route('storage_file', [$shopping_order->id, 'invoice', 'stream']) }}" target="_blank" class="btn btn-warning btn-sm"><i class="fa fa-eye"></i></a>
@if(false && Auth::user()->isSySAdmin())
<button type="button" class="btn btn-sm btn-danger" data-toggle="modal" data-target="#modals-invoice"
@if(Auth::user()->isSuperAdmin())
<button type="button" class="btn btn-sm btn-danger" title="Rechnung überschreiben" data-toggle="modal" data-target="#modals-invoice"
data-id="{{ $shopping_order->id }}"
data-back="{{url()->current()}}"
data-action="create_invoice">
<span class="far fa-file-invoice"></span> <strong>Rechnung überschreiben</strong>
<span class="far fa-file-invoice"></span></strong>
</button>
@endif
@else
@ -57,6 +58,22 @@
@endif
@endif
</div>
<div class="col-md-3 mb-1">
@if ($isAdmin)
<strong class="mr-2">Lieferschein:</strong>
@if (App\Services\Invoice::isDelivery($shopping_order))
<a href="{{ route('storage_file', [$shopping_order->id, 'delivery', 'download']) }}"
class="btn btn-primary btn-sm"><i class="fa fa-download"></i></a>
<a href="{{ route('storage_file', [$shopping_order->id, 'delivery', 'stream']) }}"
target="_blank" class="btn btn-warning btn-sm"><i class="fa fa-eye"></i></a>
<a href="{{ route('storage_file', [$shopping_order->id, 'invoice_delivery', 'download']) }}"
class="btn btn-dark btn-sm"><i class="fa fa-file-download"></i><i class="fa fa-file-download"></i></a>
@endif
@endif
</div>
</div>
</div>
@ -504,6 +521,45 @@
</div>
</div>
<hr class="m-0">
@if($shopping_order->shopping_order_margin)
<div class="card-body">
<h6 class="small font-weight-semibold">
Provisionen / Handelspanne
</h6>
<div class="row">
<div class="col-md-3 mb-3">
<div class="text-muted small">Einzelrabatt </div>
{{ number_format( $shopping_order->shopping_order_margin->getRestoreContent('commission')->single_value_commission, 2, ",", ".") }}
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Staffelrabatt</div>
@foreach ($shopping_order->shopping_order_margin->getRestoreContent('items') as $item)
ab {{ $item->price_from }} / {{ $item->trading_margin }}% :
{{ number_format($item->value_margin , 2, ",", ".") }} €*<br>
@endforeach
</div>
@if($isAdmin)
<div class="col-md-3 mb-3">
<div class="text-muted small">Provisionen Vertriebspartner<br> @if($shopping_order->member){{ $shopping_order->member->getFullName(false) }} @endif</div>
{{$shopping_order->shopping_order_margin->getFormattedNetDiscount()}} €
</div>
<div class="col-md-3 mb-3">
<div class="text-muted small">Provisionen Sponsor<br> @if($shopping_order->member && $shopping_order->member->user_sponsor) {{ $shopping_order->member->user_sponsor->getFullName(false) }} @endif </div>
@if($shopping_order->shopping_order_margin->net_partner_commission)
{{ $shopping_order->shopping_order_margin->getFormattedNetPartnerCommission() }} €
@endif
</div>
@endif
</div>
</div>
<hr class="m-0">
@endif
@if($shopping_order->txaction === 'extern')
<div class="card-body">
@if($shopping_order->wp_invoice_path)
@ -669,7 +725,7 @@
</div>
<div class="form-group col-sm-12">
<label class="custom-control custom-checkbox">
{!! Form::checkbox('invoice_send_mail', 1, true, ['class'=>'custom-control-input']) !!}
{!! Form::checkbox('invoice_send_mail', 1, false, ['class'=>'custom-control-input']) !!}
<span class="custom-control-label">Rechnung an {{ $shopping_order->shopping_user->billing_email }}</span>
</label>
</div>