From 162827dff7ccfc5ecee770c8ad658ee96f4d6335 Mon Sep 17 00:00:00 2001 From: Konstantinos Arvanitakis Date: Wed, 30 Sep 2026 21:22:41 +0300 Subject: [PATCH] Fix: Adding Comments to Fulfillment Services --- resources/views/shipping/carriers/elta/label-a6.blade.php | 4 ++++ .../shipping/carriers/elta/partials/_main-copy.blade.php | 4 ++++ .../carriers/elta/partials/_payment-stub.blade.php | 5 +++++ src/Shipping/Carriers/Acs/AcsFulfillmentService.php | 5 +++++ src/Shipping/Carriers/Elta/EltaFulfillmentService.php | 8 +++++++- src/Shipping/Carriers/Elta/EltaLabelRenderer.php | 5 +++++ 6 files changed, 30 insertions(+), 1 deletion(-) diff --git a/resources/views/shipping/carriers/elta/label-a6.blade.php b/resources/views/shipping/carriers/elta/label-a6.blade.php index 6e84796..bd2604f 100644 --- a/resources/views/shipping/carriers/elta/label-a6.blade.php +++ b/resources/views/shipping/carriers/elta/label-a6.blade.php @@ -206,6 +206,10 @@ {{-- ΠΑΡΑΤΗΡΗΣΕΙΣ --}}
* ΠΑΡΑΤΗΡΗΣΕΙΣ *
+ {{-- sxolia_1/2 (textbox49/50) --}} + @foreach (array_slice($sxolia, 0, 2) as $i => $line) +
{{ $line }}
+ @endforeach
@if ($multiPiece) diff --git a/resources/views/shipping/carriers/elta/partials/_main-copy.blade.php b/resources/views/shipping/carriers/elta/partials/_main-copy.blade.php index 2a94e45..fe3b1e6 100644 --- a/resources/views/shipping/carriers/elta/partials/_main-copy.blade.php +++ b/resources/views/shipping/carriers/elta/partials/_main-copy.blade.php @@ -139,6 +139,10 @@
* ΠΑΡΑΤΗΡΗΣΕΙΣ *
+ {{-- sxolia_1..3 (textbox92/95/94) --}} + @foreach ($sxolia as $i => $line) +
{{ $line }}
+ @endforeach
{{-- Right-hand signature / print-timestamp column, differs by copy type --}} diff --git a/resources/views/shipping/carriers/elta/partials/_payment-stub.blade.php b/resources/views/shipping/carriers/elta/partials/_payment-stub.blade.php index bdfff60..98cb4d2 100644 --- a/resources/views/shipping/carriers/elta/partials/_payment-stub.blade.php +++ b/resources/views/shipping/carriers/elta/partials/_payment-stub.blade.php @@ -73,6 +73,11 @@
Συν.Χρέωσης (€):
Πρόσθετες Υπηρεσίες
+ {{-- sxolia_1..3 (textbox91/132/133) sit under this heading in the RDLC; + this stub's boxes are shorter than the RDLC's, so only 2 lines fit. --}} + @foreach (array_slice($sxolia, 0, 2) as $i => $line) +
{{ $line }}
+ @endforeach
diff --git a/src/Shipping/Carriers/Acs/AcsFulfillmentService.php b/src/Shipping/Carriers/Acs/AcsFulfillmentService.php index 4a66325..d4f9eb5 100644 --- a/src/Shipping/Carriers/Acs/AcsFulfillmentService.php +++ b/src/Shipping/Carriers/Acs/AcsFulfillmentService.php @@ -72,6 +72,11 @@ class AcsFulfillmentService implements CarrierFulfillmentInterface, SupportsExtr 'Reference_Key1' => (string) $order->reference, ]; + // The customer's delivery instructions, for the courier. + if ($instructions = trim(preg_replace('/\s+/u', ' ', (string) $address->delivery_instructions))) { + $params['Delivery_Notes'] = $instructions; + } + $codAmount = $request->paymentMode === 'cod' ? (float) ($request->amountToCollect ?? $order->total->decimal) : null; diff --git a/src/Shipping/Carriers/Elta/EltaFulfillmentService.php b/src/Shipping/Carriers/Elta/EltaFulfillmentService.php index a6fce6a..6f9ca21 100644 --- a/src/Shipping/Carriers/Elta/EltaFulfillmentService.php +++ b/src/Shipping/Carriers/Elta/EltaFulfillmentService.php @@ -63,6 +63,11 @@ class EltaFulfillmentService implements CarrierFulfillmentInterface, IssuesVouch $weight = $request->weight ?? 0.5; $surcharges = $this->surchargeCodes($request); + // The customer's delivery instructions, as ELTA's remarks + // (ΠΑΡΑΤΗΡΗΣΕΙΣ): one line, at most 90 characters — the ELTA + // client's own field limit. + $remarks = mb_substr(trim(preg_replace('/\s+/u', ' ', (string) $address->delivery_instructions)), 0, 90); + $params = [ 'pel_apost_code' => config('elta.apost_code'), 'pel_paral_name' => trim("{$address->first_name} {$address->last_name}"), @@ -78,7 +83,7 @@ class EltaFulfillmentService implements CarrierFulfillmentInterface, IssuesVouch 'pel_y' => '', 'pel_z' => '', 'pel_temaxia' => (string) $request->packageCount, - 'pel_paral_sxolia' => '', + 'pel_paral_sxolia' => $remarks, 'pel_sur_1' => $surcharges[0] ?? '', 'pel_sur_2' => $surcharges[1] ?? '', 'pel_sur_3' => $surcharges[2] ?? '', @@ -129,6 +134,7 @@ class EltaFulfillmentService implements CarrierFulfillmentInterface, IssuesVouch 'meta' => [ 'carrier_id' => $this->findPendingVoucherId((string) $order->reference), 'reference' => (string) $order->reference, + 'delivery_instructions' => $remarks ?: null, 'weight' => $weight, 'package_count' => $pieces, 'cod_amount' => $codAmount, diff --git a/src/Shipping/Carriers/Elta/EltaLabelRenderer.php b/src/Shipping/Carriers/Elta/EltaLabelRenderer.php index dd7159b..9cce3fd 100644 --- a/src/Shipping/Carriers/Elta/EltaLabelRenderer.php +++ b/src/Shipping/Carriers/Elta/EltaLabelRenderer.php @@ -240,6 +240,11 @@ class EltaLabelRenderer // older vouchers were sent the order id). 'order_reference' => $isChild ? null : (string) $order->reference, + // ΠΑΡΑΤΗΡΗΣΕΙΣ: the remarks we sent ELTA (the customer's delivery + // instructions), in the client's 27-character lines — up to 3 + // on A4, the first 2 on A6. Extra parcels print them too. + 'sxolia' => array_slice(mb_str_split((string) ($meta['delivery_instructions'] ?? ''), 27), 0, 3), + // sydetaE.rdlc's "Πρόσθετες Υπηρεσίες" (sur_1..4): the ticked // extra services, in ELTA's own wording and slots. 'sur_1' => $surcharges[1],