s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2025-02-05 17:21:14 +01:00
Code Issues Projects Releases Wiki Activity

Output additional Information (Pickup-/Delivery-Date) after shipment creation

Browse Source
This commit is contained in:
Andreas Palm 2025-02-04 22:06:19 +01:00
parent 7bde3b8415
commit fb454c9f98
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
classes/Modules/ShippingMethod/Model/CreateShipmentResult.php
View File

@ -16,4 +16,5 @@ class CreateShipmentResult
public ?string $ExportDocuments; public ?string $ExportDocuments;
public ?string $TrackingNumber; public ?string $TrackingNumber;
public ?string $TrackingUrl; public ?string $TrackingUrl;
public ?string $AdditionalInfo;
} }

2
www/lib/class.versanddienstleister.php
View File

@ -445,6 +445,8 @@ abstract class Versanddienstleister
$this->app->printer->Drucken($this->documentPrinterId, $filefullpath); $this->app->printer->Drucken($this->documentPrinterId, $filefullpath);
} }
$ret['messages'][] = ['class' => 'info', 'text' => "Paketmarke wurde erfolgreich erstellt: $result->TrackingNumber"]; $ret['messages'][] = ['class' => 'info', 'text' => "Paketmarke wurde erfolgreich erstellt: $result->TrackingNumber"];
if ($result->AdditionalInfo != null)
$ret['messages'][] = ['class' => 'info', 'text' => $result->AdditionalInfo];
} else { } else {
$ret['messages'] = array_map(fn(string $item) => ['class' => 'error', 'text' => $item], array_unique($result->Errors)); $ret['messages'] = array_map(fn(string $item) => ['class' => 'error', 'text' => $item], array_unique($result->Errors));
} }

1
www/lib/versandarten/go.php
View File

@ -128,6 +128,7 @@ class Versandart_go extends Versanddienstleister
$ret->TrackingNumber = $result->hwbNumber; $ret->TrackingNumber = $result->hwbNumber;
$ret->TrackingUrl = 'https://www.general-overnight.com/deu_de/versenden/sendungsverfolgung.html?reference='.$result->hwbNumber; $ret->TrackingUrl = 'https://www.general-overnight.com/deu_de/versenden/sendungsverfolgung.html?reference='.$result->hwbNumber;
$ret->Label = base64_decode($result->hwbOrPackageLabel); $ret->Label = base64_decode($result->hwbOrPackageLabel);
$ret->AdditionalInfo = "Abholtag: ".$result->pickupDate->format('d.m.Y')." / Zustelltag: ".$result->deliveryDate->format('d.m.Y');
} else { } else {
$ret->Errors[] = $result; $ret->Errors[] = $result;
} }