27-05-2026 Update DHL Modul v2.0
This commit is contained in:
parent
53bdba33cd
commit
036595be94
41 changed files with 3346 additions and 310 deletions
|
|
@ -54,9 +54,10 @@
|
|||
<span class="badge badge-info">{{ __('dhl.status.delivered') }}</span>
|
||||
</div>
|
||||
@break
|
||||
@case('canceled')
|
||||
@case('cancelled')
|
||||
<div class="h5 mb-0 font-weight-bold text-gray-800">
|
||||
<span class="badge badge-secondary">{{ __('dhl.status.cancelled') }}</span>
|
||||
<span class="badge badge-secondary">{{ __('dhl.status.canceled') }}</span>
|
||||
</div>
|
||||
@break
|
||||
@case('failed')
|
||||
|
|
@ -110,7 +111,7 @@
|
|||
@if(false)
|
||||
<code class="text-info">{{ $shipment->dhl_shipment_no }}</code>
|
||||
<br>
|
||||
<a href="{{ route('public.tracking') }}?dhl_shipment_no={{ $shipment->dhl_shipment_no }}"
|
||||
<a href="{{ route('public.tracking') }}?tracking_number={{ $shipment->dhl_shipment_no }}"
|
||||
target="_blank" class="text-muted small">
|
||||
<i class="fas fa-external-link-alt"></i> Verfolgen
|
||||
</a>
|
||||
|
|
@ -147,7 +148,7 @@
|
|||
</div>
|
||||
|
||||
<!-- Action Buttons -->
|
||||
@if($shipment->status != 'cancelled')
|
||||
@if(!in_array($shipment->status, ['canceled', 'cancelled']))
|
||||
<div class="card mb-4">
|
||||
<div class="card-body">
|
||||
<div class="d-flex flex-wrap gap-2">
|
||||
|
|
@ -219,6 +220,16 @@
|
|||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="font-weight-semibold">Referenz:</td>
|
||||
<td>
|
||||
@if($shipment->reference)
|
||||
<code class="text-dark">{{ $shipment->reference }}</code>
|
||||
@else
|
||||
<span class="text-muted">Nicht gesetzt</span>
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
{{--
|
||||
<tr>
|
||||
<td class="font-weight-semibold">Routing-Code:</td>
|
||||
|
|
@ -511,14 +522,71 @@
|
|||
</div>
|
||||
<div class="card-body">
|
||||
@if($shipment->wasTrackingEmailSent())
|
||||
<div class="alert alert-success mb-0">
|
||||
<div class="alert alert-success">
|
||||
<i class="fas fa-check-circle"></i>
|
||||
<strong>E-Mail gesendet</strong><br>
|
||||
<strong>Zuletzt gesendet</strong><br>
|
||||
<small>
|
||||
Am {{ $shipment->tracking_email_sent_at->format('d.m.Y \u\m H:i') }} Uhr
|
||||
({{ $shipment->tracking_email_type === 'auto' ? 'automatisch' : 'manuell' }})
|
||||
</small>
|
||||
</div>
|
||||
|
||||
@php($trackingEmailHistory = $shipment->getTrackingEmailHistory())
|
||||
@if(!empty($trackingEmailHistory))
|
||||
<div class="table-responsive">
|
||||
<table class="table table-sm mb-0">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Zeitpunkt</th>
|
||||
<th>Typ</th>
|
||||
<th>Status</th>
|
||||
<th>Empfänger</th>
|
||||
<th>Sendungen</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($trackingEmailHistory as $entry)
|
||||
<tr>
|
||||
<td>
|
||||
@if(!empty($entry['sent_at']))
|
||||
{{ \Carbon\Carbon::parse($entry['sent_at'])->format('d.m.Y H:i') }}
|
||||
@else
|
||||
<span class="text-muted">-</span>
|
||||
@endif
|
||||
</td>
|
||||
<td>
|
||||
<span class="badge badge-{{ ($entry['type'] ?? '') === 'auto' ? 'info' : 'secondary' }}">
|
||||
{{ ($entry['type'] ?? '') === 'auto' ? 'Automatisch' : 'Manuell' }}
|
||||
</span>
|
||||
</td>
|
||||
<td>
|
||||
<span class="badge badge-{{ \Acme\Dhl\Models\DhlShipment::getStatusBadgeClassFor($entry['status'] ?? 'unknown') }}">
|
||||
{{ \Acme\Dhl\Models\DhlShipment::getStatusTranslationFor($entry['status'] ?? 'unknown') }}
|
||||
</span>
|
||||
@if(!empty($entry['tracking_status']))
|
||||
<br><small class="text-muted">{{ $entry['tracking_status'] }}</small>
|
||||
@endif
|
||||
</td>
|
||||
<td>
|
||||
@if(!empty($entry['recipient_email']))
|
||||
<small>{{ $entry['recipient_email'] }}</small>
|
||||
@else
|
||||
<span class="text-muted">-</span>
|
||||
@endif
|
||||
</td>
|
||||
<td>
|
||||
@if(!empty($entry['included_shipment_ids']))
|
||||
<small>#{{ implode(', #', $entry['included_shipment_ids']) }}</small>
|
||||
@else
|
||||
<span class="text-muted">-</span>
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
@endif
|
||||
@else
|
||||
<div class="alert alert-secondary mb-0">
|
||||
<i class="fas fa-clock"></i>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue