From f6bbe6522edf8e0685bbcc29e46de59363a8665a Mon Sep 17 00:00:00 2001 From: Andreas Palm Date: Mon, 13 Jan 2025 22:26:55 +0100 Subject: [PATCH 1/2] GO: Add setting "defaultContent" as a workaround for international shipments until "Paketmarke"-Form gets updated --- www/lib/versandarten/go.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/www/lib/versandarten/go.php b/www/lib/versandarten/go.php index 53ba826f..728277a8 100644 --- a/www/lib/versandarten/go.php +++ b/www/lib/versandarten/go.php @@ -61,6 +61,7 @@ class Versandart_go extends Versanddienstleister 'consignorEmail' => ['typ' => 'text', 'bezeichnung' => 'Absender Email:'], 'defaultPickupFrom' => ['typ' => 'text', 'bezeichnung' => 'Standard Abholzeit von:'], 'defaultPickupTill' => ['typ' => 'text', 'bezeichnung' => 'Standard Abholzeit bis:'], + 'defaultContent' => ['typ' => 'text', 'bezeichnung' => 'Standard Inhalt:'] ]; } @@ -73,6 +74,7 @@ class Versandart_go extends Versanddienstleister $order->shipment->orderStatus = $this->settings->orderAsDraft ? OrderStatus::New : OrderStatus::Released; $order->shipment->SetService($json->product); $order->shipment->customerReference = $json->order_number; + $order->shipment->content = $this->settings->defaultContent ?? ''; $order->shipment->weight = floatval($json->weight); $order->shipment->pickup->dateFrom = new DateTime($this->settings->defaultPickupFrom); if ($order->shipment->pickup->dateFrom < new DateTime('now')) From 7bde3b8415853e4c2a81ae5e75e7be692d88ba56 Mon Sep 17 00:00:00 2001 From: Andreas Palm Date: Mon, 13 Jan 2025 22:28:58 +0100 Subject: [PATCH 2/2] GO: Add Tracking-Link --- www/lib/versandarten/go.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/lib/versandarten/go.php b/www/lib/versandarten/go.php index 728277a8..f73e770b 100644 --- a/www/lib/versandarten/go.php +++ b/www/lib/versandarten/go.php @@ -126,7 +126,7 @@ class Versandart_go extends Versanddienstleister if ($result instanceof CreateOrderResponse) { $ret->Success = true; $ret->TrackingNumber = $result->hwbNumber; - $ret->TrackingUrl = ''; + $ret->TrackingUrl = 'https://www.general-overnight.com/deu_de/versenden/sendungsverfolgung.html?reference='.$result->hwbNumber; $ret->Label = base64_decode($result->hwbOrPackageLabel); } else { $ret->Errors[] = $result;