Feat: Updates to fullfilment services, shipping views, timezones, and elta labels
This commit is contained in:
@@ -0,0 +1,113 @@
|
||||
{{--
|
||||
Copy of lunarphp/lunar's resources/views/livewire/components/activity-log-feed.blade.php
|
||||
(the order page's Timeline), overriding it via View::prependNamespace('lunarpanel')
|
||||
in CoreServiceProvider. The only changes: the day heading and each entry's time are
|
||||
shown in core.display_timezone instead of UTC (Lunar formats them by hand, so
|
||||
Filament's display timezone doesn't reach them). Re-copy it if Lunar changes the
|
||||
original. Lunar still groups entries by UTC day, so an entry just after local
|
||||
midnight can sit under the previous day's heading.
|
||||
--}}
|
||||
<div class="px-2 pb-4 scroll-mt-32" id="lunar-panel-timeline">
|
||||
<div class="relative flex items-end gap-4 mt-4">
|
||||
<div class="shrink-0">
|
||||
<div>
|
||||
<img src="{{ $this->userAvatar }}"
|
||||
class="inline-block w-8 h-8 rounded-full" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<form class="w-full"
|
||||
wire:submit.prevent="addComment">
|
||||
|
||||
{{ $this->form }}
|
||||
|
||||
<div class="absolute right-0 mt-2">
|
||||
{{ $this->addCommentAction }}
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<div class="relative pt-8 -ml-[5px] z-10 pointer-events-none">
|
||||
<span class="absolute inset-y-0 left-5 w-[2px] bg-gray-200 dark:bg-gray-600 rounded-full"></span>
|
||||
|
||||
<div class="flow-root">
|
||||
<ul class="-my-8 divide-y-2 divide-gray-200 dark:divide-gray-600"
|
||||
role="list">
|
||||
@foreach ($this->activityLog as $log)
|
||||
<li class="relative py-8 ml-5">
|
||||
<p class="ml-8 font-bold text-gray-950 dark:text-gray-300">
|
||||
{{ $log['items']->first()['log']->created_at->inDisplayTimezone()->format('F jS, Y') }}
|
||||
</p>
|
||||
|
||||
<ul class="mt-4 space-y-6 pointer-events-auto">
|
||||
@foreach ($log['items'] as $item)
|
||||
@php
|
||||
$logUserName = $item['log']->causer ? ($item['log']->causer->fullName ?: $item['log']->causer->name) : null;
|
||||
@endphp
|
||||
|
||||
<li class="relative pl-8">
|
||||
<div @class([
|
||||
'absolute top-[2px]',
|
||||
'-left-[calc(0.75rem_-_1px)]' => $item['log']->causer,
|
||||
'-left-[calc(0.5rem_-_1px)]' => !$item['log']->causer,
|
||||
])>
|
||||
@if ($email = $item['log']->causer?->email)
|
||||
<img
|
||||
src="{{ $this->getAvatarUrl($email) }}"
|
||||
class="w-6 h-6 rounded-full ring-4 ring-gray-200 dark:ring-gray-600"
|
||||
alt="{{ $logUserName }}"
|
||||
/>
|
||||
@else
|
||||
<span @class([
|
||||
'absolute w-4 h-4 rounded-full ring-4',
|
||||
match($item['log']->description){
|
||||
'created' => 'bg-sky-500 ring-sky-100 dark:ring-sky-800',
|
||||
'updated' => 'bg-teal-500 ring-teal-100 dark:ring-teal-800',
|
||||
'status-update' => 'bg-purple-500 ring-purple-100 dark:ring-purple-800',
|
||||
default => 'bg-gray-300 ring-gray-200 dark:ring-gray-600',
|
||||
},
|
||||
])>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<div @class([
|
||||
'flex justify-between',
|
||||
'pt-[5px]' => $item['log']->causer,
|
||||
'pt-[1px]' => !$item['log']->causer,
|
||||
])>
|
||||
<div>
|
||||
<div class="text-xs font-medium text-gray-500 dark:text-gray-400">
|
||||
@if (!$item['log']->causer)
|
||||
{{ __('lunarpanel::components.activity-log.system') }}
|
||||
@else
|
||||
{{ $logUserName }}
|
||||
@endif
|
||||
</div>
|
||||
|
||||
@if (count($item['renderers']))
|
||||
<div class="mt-2 text-sm font-medium text-gray-700 dark:text-gray-200">
|
||||
@foreach ($item['renderers'] as $class)
|
||||
{{ $class->render($item['log']) }}
|
||||
@endforeach
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<time class="flex-shrink-0 ml-4 text-xs mt-0.5 text-gray-500 dark:text-gray-400 font-medium">
|
||||
{{ $item['log']->created_at->inDisplayTimezone()->format('h:ia') }}
|
||||
</time>
|
||||
</div>
|
||||
</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="pt-4">
|
||||
{{ $this->activityLog->links('lunarpanel::components.activity-log.timeline-paginator.index', data: ['scrollTo' => '#lunar-panel-timeline']) }}
|
||||
</div>
|
||||
</div>
|
||||
@@ -77,7 +77,7 @@
|
||||
class="w-4"
|
||||
/>
|
||||
</div>
|
||||
<span>{{ $transaction->created_at->format('jS F Y h:ia') }}</span>
|
||||
<span>{{ $transaction->created_at->inDisplayTimezone()->format('jS F Y h:ia') }}</span>
|
||||
</div>
|
||||
|
||||
<div class="flex space-x-2">
|
||||
|
||||
@@ -0,0 +1,120 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="el">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<style>
|
||||
{{--
|
||||
An extra parcel of a multi-parcel send on A4 — ELTA's own client
|
||||
prints these with a separate, smaller report (ELTA_PEL.sydetaE1.rdlc,
|
||||
via epexergasia.cs::print_child()) instead of the full 3-copy
|
||||
voucher: one block with the parcel's own voucher/barcode, its
|
||||
piece ("002/002"), the master voucher and, for cash on delivery,
|
||||
only the warning (the amount is collected on the master). Every
|
||||
position below is that report's own Top/Left in cm, on the page.
|
||||
Classes are ch-* so they don't collide with label-a4's when a
|
||||
batch PDF holds both.
|
||||
--}}
|
||||
@page { margin: 0; size: 21cm 29.7cm; }
|
||||
html, body { margin: 0; padding: 0; }
|
||||
body { font-family: 'DejaVu Sans', sans-serif; font-size: 6.5pt; color: #000; }
|
||||
|
||||
.ch-page { position: relative; width: 21cm; height: 29.7cm; }
|
||||
.ch-page > * { position: absolute; box-sizing: border-box; }
|
||||
.ch-box { border: 1px solid #000; }
|
||||
.ch-box > * { position: absolute; }
|
||||
.ch-label { font-size: 6pt; }
|
||||
.ch-val { font-size: 8pt; font-weight: bold; }
|
||||
.ch-line { font-size: 9pt; white-space: nowrap; overflow: hidden; }
|
||||
.ch-center { text-align: center; left: 0; width: 100%; }
|
||||
.ch-logo img { width: 100%; }
|
||||
.ch-company { font-size: 5pt; line-height: 1.25; white-space: nowrap; }
|
||||
.ch-company-name { font-weight: bold; font-size: 5.5pt; }
|
||||
.ch-barcode img { width: 100%; height: 0.62cm; }
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="page ch-page">
|
||||
{{-- Image22 (logo) + image4 (ELTA details bitmap, reproduced as text) --}}
|
||||
<div class="ch-logo" style="top:9.07cm;left:0.41cm;width:1.33cm;height:1.28cm;">
|
||||
<img src="{{ $eltaLogo }}" alt="ELTA Courier">
|
||||
</div>
|
||||
<div class="ch-company" style="top:9.07cm;left:1.95cm;width:3.38cm;">
|
||||
<div class="ch-company-name">ΕΛΛΗΝΙΚΑ ΤΑΧΥΔΡΟΜΕΙΑ Α.Ε.</div>
|
||||
<div>Απελλού 1, 105 51, Αθήνα</div>
|
||||
<div>Τ. 210-6073000 | www.eltacourier.gr</div>
|
||||
</div>
|
||||
<div style="top:10.38cm;left:0.41cm;width:4.99cm;font-size:6pt;">ΕΕΤΤ ΑΜ 99-150 Γενική Αδεια Ταχ/κων Υπηρεσιών</div>
|
||||
|
||||
{{-- rectangle17: title, barcode, this parcel's voucher --}}
|
||||
<div class="ch-box" style="top:9.02cm;left:5.44cm;width:8.07cm;height:1.76cm;">
|
||||
<div class="ch-center" style="top:0.13cm;font-size:9pt;font-weight:bold;">ΣΥΝΟΔΕΥΤΙΚΟ ΔΕΛΤΙΟ ΤΑΧΥΜΕΤΑΦΟΡΑΣ</div>
|
||||
<div class="ch-barcode" style="top:0.57cm;left:0.19cm;width:7.65cm;">
|
||||
<img src="{{ $barcode_voucher }}" alt="">
|
||||
</div>
|
||||
<div class="ch-center" style="top:1.30cm;font-size:11pt;font-weight:bold;">{{ $voucher_no }}</div>
|
||||
</div>
|
||||
|
||||
<div style="top:11.02cm;left:5.10cm;width:4.55cm;font-size:8pt;">Ημερομηνία - Ωρα Εκτύπωσης :</div>
|
||||
<div style="top:11.02cm;left:9.70cm;width:3.70cm;font-size:8pt;">{{ $date }} {{ $time }}</div>
|
||||
|
||||
{{-- rectangle18-21: deposit station, weight, volumetric, pieces --}}
|
||||
<div class="ch-box" style="top:11.45cm;left:0.11cm;width:1.51cm;height:0.82cm;">
|
||||
<div class="ch-label" style="top:0.11cm;left:0.05cm;">Γρ.Κατάθεσης</div>
|
||||
<div style="top:0.42cm;left:0.05cm;font-size:9pt;font-weight:bold;">{{ $station_apo }}</div>
|
||||
</div>
|
||||
<div class="ch-box" style="top:11.45cm;left:1.81cm;width:1.35cm;height:0.82cm;">
|
||||
<div class="ch-label" style="top:0.11cm;left:0.05cm;">Βάρος</div>
|
||||
<div class="ch-val" style="top:0.42cm;left:0.05cm;">{{ $weight }}</div>
|
||||
</div>
|
||||
<div class="ch-box" style="top:11.45cm;left:3.29cm;width:2.83cm;height:0.82cm;">
|
||||
<div class="ch-label" style="top:0.11cm;left:0.05cm;">Ογκ/κο Βάρος</div>
|
||||
<div class="ch-val" style="top:0.42cm;left:0.05cm;">{{ $volumetric_weight }}</div>
|
||||
</div>
|
||||
<div class="ch-box" style="top:11.45cm;left:6.28cm;width:1.22cm;height:0.82cm;">
|
||||
<div class="ch-label" style="top:0.11cm;left:0.05cm;">Τεμάχια</div>
|
||||
<div class="ch-val" style="top:0.42cm;left:0.05cm;">{{ $package_label }}</div>
|
||||
</div>
|
||||
|
||||
{{-- rectangle1: service --}}
|
||||
<div class="ch-box" style="top:11.48cm;left:13.49cm;width:6.20cm;height:0.86cm;">
|
||||
<div style="top:0.06cm;left:0.13cm;font-size:8pt;font-weight:bold;">ΥΠΗΡΕΣΙΑ :</div>
|
||||
<div style="top:0.04cm;left:3.19cm;font-size:9pt;font-weight:bold;">{{ $service_code }}</div>
|
||||
<div style="top:0.43cm;left:0.06cm;width:5.82cm;font-size:8pt;font-weight:bold;">{{ $service_name }}</div>
|
||||
</div>
|
||||
|
||||
{{-- rectangle30: destination station --}}
|
||||
<div class="ch-box" style="top:12.38cm;left:0.11cm;width:12.59cm;height:0.61cm;">
|
||||
<div class="ch-label" style="top:0.18cm;left:0.08cm;">Γρ.Προορισμού</div>
|
||||
<div class="ch-val" style="top:0.13cm;left:1.79cm;">{{ $station_pros }}</div>
|
||||
<div class="ch-val" style="top:0.14cm;left:3.65cm;width:8.73cm;">{{ $station_pros_title }}</div>
|
||||
</div>
|
||||
|
||||
{{-- rectangle52: multi-parcel panel — piece, COD warning, master voucher --}}
|
||||
<div class="ch-box" style="top:12.61cm;left:13.50cm;width:6.27cm;height:6.24cm;">
|
||||
<div class="ch-center" style="top:0.26cm;font-size:10pt;font-weight:bold;">** ΠΟΛΛΑΠΛΗ ΑΠΟΣΤΟΛΗ **</div>
|
||||
<div class="ch-center" style="top:1.89cm;font-size:20pt;font-weight:bold;">{{ $piece_label }}</div>
|
||||
@if ($antik_1)
|
||||
<div class="ch-center" style="top:3.66cm;font-size:10pt;font-weight:bold;">{{ $antik_1 }}</div>
|
||||
@endif
|
||||
<div class="ch-center" style="top:4.77cm;font-size:10pt;font-weight:bold;">ΜASTER ΣΥΔΕΤΑ</div>
|
||||
<div class="ch-center" style="top:5.31cm;font-size:11pt;font-weight:bold;">{{ $copy }}</div>
|
||||
</div>
|
||||
|
||||
{{-- rectangle24: sender (sender_1..5) --}}
|
||||
<div class="ch-box" style="top:13.06cm;left:0.11cm;width:12.57cm;height:2.74cm;">
|
||||
<div style="top:0.08cm;left:0.05cm;font-size:9pt;font-weight:bold;">ΑΠΟΣΤΟΛΕΑΣ</div>
|
||||
@foreach ($sender_lines as $i => $line)
|
||||
<div class="ch-line" style="top:{{ 0.53 + $i * 0.43 }}cm;left:0.05cm;width:11.96cm;">{{ $line }}</div>
|
||||
@endforeach
|
||||
</div>
|
||||
|
||||
{{-- rectangle27: recipient (rec_1..5) --}}
|
||||
<div class="ch-box" style="top:15.94cm;left:0.11cm;width:12.57cm;height:2.90cm;">
|
||||
<div style="top:0.05cm;left:0.05cm;font-size:9pt;font-weight:bold;">ΠΑΡΑΛΗΠΤΗΣ</div>
|
||||
@foreach ($recipient_lines as $i => $line)
|
||||
<div class="ch-line" style="top:{{ 0.49 + $i * 0.44 }}cm;left:0.05cm;width:12.12cm;font-weight:bold;">{{ $line }}</div>
|
||||
@endforeach
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
@@ -89,6 +89,10 @@
|
||||
|
||||
<div class="a6-datetime" style="top:1.68cm;left:0.13cm;width:1.68cm;">{{ $date }}</div>
|
||||
<div class="a6-title" style="top:1.79cm;left:1.93cm;width:5.89cm;">ΣΥΝΟΔΕΥΤΙΚΟ ΔΕΛΤΙΟ ΤΑΧΥΜΕΤΑΦΟΡΑΣ</div>
|
||||
{{-- textbox15 (copy): "ΠΟΛΛΑΠΛH" on the extra parcels of a multi-parcel send --}}
|
||||
@if ($copy)
|
||||
<div class="a6-title" style="top:1.84cm;left:7.95cm;width:2.21cm;">{{ $copy }}</div>
|
||||
@endif
|
||||
{{-- The RDLC's own barcode textbox here uses the "Free 3 of 9
|
||||
Extended" barcode font — we don't have that font, so this
|
||||
would-be *{voucher}* fallback text is dropped in favor of the
|
||||
|
||||
Reference in New Issue
Block a user