From fb454c9f9879bca988baa6d29cde1b3b8730760d Mon Sep 17 00:00:00 2001
From: Andreas Palm <ap@ewsp.de>
Date: Tue, 4 Feb 2025 22:06:19 +0100
Subject: [PATCH] Output additional Information (Pickup-/Delivery-Date) after
 shipment creation

---
 classes/Modules/ShippingMethod/Model/CreateShipmentResult.php | 1 +
 www/lib/class.versanddienstleister.php                        | 2 ++
 www/lib/versandarten/go.php                                   | 1 +
 3 files changed, 4 insertions(+)

diff --git a/classes/Modules/ShippingMethod/Model/CreateShipmentResult.php b/classes/Modules/ShippingMethod/Model/CreateShipmentResult.php
index 041c65ce..044071cd 100644
--- a/classes/Modules/ShippingMethod/Model/CreateShipmentResult.php
+++ b/classes/Modules/ShippingMethod/Model/CreateShipmentResult.php
@@ -16,4 +16,5 @@ class CreateShipmentResult
   public ?string $ExportDocuments;
   public ?string $TrackingNumber;
   public ?string $TrackingUrl;
+  public ?string $AdditionalInfo;
 }
\ No newline at end of file
diff --git a/www/lib/class.versanddienstleister.php b/www/lib/class.versanddienstleister.php
index 7bd7b48f..fc685af9 100644
--- a/www/lib/class.versanddienstleister.php
+++ b/www/lib/class.versanddienstleister.php
@@ -445,6 +445,8 @@ abstract class Versanddienstleister
                 $this->app->printer->Drucken($this->documentPrinterId, $filefullpath);
             }
             $ret['messages'][] = ['class' => 'info', 'text' => "Paketmarke wurde erfolgreich erstellt: $result->TrackingNumber"];
+            if ($result->AdditionalInfo != null)
+                $ret['messages'][] = ['class' => 'info', 'text' => $result->AdditionalInfo];
         } else {
             $ret['messages'] = array_map(fn(string $item) => ['class' => 'error', 'text' => $item], array_unique($result->Errors));
         }
diff --git a/www/lib/versandarten/go.php b/www/lib/versandarten/go.php
index f73e770b..1243481c 100644
--- a/www/lib/versandarten/go.php
+++ b/www/lib/versandarten/go.php
@@ -128,6 +128,7 @@ class Versandart_go extends Versanddienstleister
       $ret->TrackingNumber = $result->hwbNumber;
       $ret->TrackingUrl =  'https://www.general-overnight.com/deu_de/versenden/sendungsverfolgung.html?reference='.$result->hwbNumber;
       $ret->Label = base64_decode($result->hwbOrPackageLabel);
+      $ret->AdditionalInfo = "Abholtag: ".$result->pickupDate->format('d.m.Y')." / Zustelltag: ".$result->deliveryDate->format('d.m.Y');
     } else {
       $ret->Errors[] = $result;
     }