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

update 20.10.2025

Browse source
This commit is contained in:
Kevin Adametz 2025-10-20 17:42:08 +02:00
parent 8c11130b5d
commit a939cd51ef
616 changed files with 84821 additions and 4121 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,15 +2,15 @@
<!-- Status -->
<div class="card-body">
<div class="row">
<div class="col-md-3 mb-1">
<div class="col-md-2 mb-1">
<strong class="mr-2">{{ __('Status') }}:</strong>
<span class="text-big">
{!! \App\Services\Payment::getShoppingOrderBadge($shopping_order) !!}
</span>
</div>
<div class="col-md-3 mb-1">
<div class="col-md-4 mb-1">
<strong class="mr-2">{{ __('order.shipping') }}:</strong>
<div style="display: inline-block;">
@if($shopping_order->payment_for !== 8)
@if ($isAdmin)
<button type="button" class="btn btn-sm btn-{{ $shopping_order->getShippedColor() }}"
@ -19,6 +19,15 @@
data-action="store_shipped">
<span class="fa fa-edit"></span> <strong>{{ $shopping_order->getShippedType() }}</strong>
</button>
<button type="button" class="btn btn-sm btn-{{ $shopping_order->hasDhlShipments() ? 'primary' : 'secondary' }}"
data-toggle="modal"
data-id="{{ $shopping_order->id }}"
data-target="#modals-load-content"
data-action="create-dhl-shipment"
data-route="{{ route('modal_load') }}">
<i class="fas fa-shipping-fast"></i> DHL
</button>
@else
<span class="text-big">
<span
@ -26,9 +35,11 @@
</span>
@endif
@endif
</div>
</div>
<div class="col-md-3 mb-1">
<strong class="mr-2">{{ __('order.invoice') }}:</strong>
<div style="display: inline-block;">
@if ($isAdmin)
@if ($shopping_order->isInvoice())
<a href="{{ route('storage_file', [$shopping_order->id, 'invoice', 'download']) }}"
@ -65,16 +76,19 @@
<a href="{{ $shopping_order->wp_invoice_path }}" class="btn btn-secondary btn-sm"><i
class="fa fa-external-link-alt"></i> <i class="fa fa-download"></i></a>
@endif
</div>
</div>
<div class="col-md-3 mb-1">
@if ($isAdmin && $shopping_order->payment_for != 8)
<strong class="mr-2">{{ __('order.delivery_note') }}:</strong>
<div style="display: inline-block;">
@if ($shopping_order->isInvoice())
<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>
@endif
</div>
@endif
</div>
</div>

2
resources/views/admin/sales/customers.blade.php
View file

@ -54,6 +54,7 @@
<th>{{__('tables.payment')}}</th>
<th>{{__('tables.status')}}</th>
<th>{{__('tables.shipping')}}</th>
<th>{{__('dhl.dhl')}}</th>
<th>{{__('tables.invoice')}}</th>
<th>{{__('First name')}}</th>
<th>{{__('Last name')}}</th>
@ -89,6 +90,7 @@
{ data: 'payment', name: 'payment', orderable: false },
{ data: 'txaction', name: 'txaction' },
{ data: 'shipped', name: 'shipped' },
{ data: 'dhl_button', name: 'dhl_button' },
{ data: 'invoice', name: 'invoice', orderable: false },
{ data: 'shopping_user.billing_firstname', name: 'shopping_user.billing_firstname' },
{ data: 'shopping_user.billing_lastname', name: 'shopping_user.billing_lastname' },

2
resources/views/admin/sales/users.blade.php
View file

@ -20,6 +20,7 @@
<th>{{__('Zahlung')}}</th>
<th>{{__('tables.status')}}</th>
<th>{{__('Versand')}}</th>
<th>{{__('dhl.dhl')}}</th>
<th>{{__('Art')}}</th>
<th>{{__('Rechnung')}}</th>
<th>{{__('First name')}}</th>
@ -50,6 +51,7 @@
{ data: 'payment', name: 'payment', orderable: false },
{ data: 'txaction', name: 'txaction' },
{ data: 'shipped', name: 'shipped' },
{ data: 'dhl_button', name: 'dhl_button' },
{ data: 'payment_for', name: 'payment_for' },
{ data: 'invoice', name: 'invoice', orderable: false },
{ data: 'shopping_user.shipping_firstname', name: 'shopping_user.shipping_firstname', orderable: false },