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

Merge pull request #166 from exciler/go

Browse Source 
GO: Add setting "defaultContent"
This commit is contained in:
OpenXE-ERP 2025-01-14 08:43:12 +01:00 committed by GitHub
commit d8ecb497da
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,6 +61,7 @@ class Versandart_go extends Versanddienstleister
'consignorEmail' => ['typ' => 'text', 'bezeichnung' => 'Absender Email:'], 'consignorEmail' => ['typ' => 'text', 'bezeichnung' => 'Absender Email:'],
'defaultPickupFrom' => ['typ' => 'text', 'bezeichnung' => 'Standard Abholzeit von:'], 'defaultPickupFrom' => ['typ' => 'text', 'bezeichnung' => 'Standard Abholzeit von:'],
'defaultPickupTill' => ['typ' => 'text', 'bezeichnung' => 'Standard Abholzeit bis:'], '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->orderStatus = $this->settings->orderAsDraft ? OrderStatus::New : OrderStatus::Released;
$order->shipment->SetService($json->product); $order->shipment->SetService($json->product);
$order->shipment->customerReference = $json->order_number; $order->shipment->customerReference = $json->order_number;
$order->shipment->content = $this->settings->defaultContent ?? '';
$order->shipment->weight = floatval($json->weight); $order->shipment->weight = floatval($json->weight);
$order->shipment->pickup->dateFrom = new DateTime($this->settings->defaultPickupFrom); $order->shipment->pickup->dateFrom = new DateTime($this->settings->defaultPickupFrom);
if ($order->shipment->pickup->dateFrom < new DateTime('now')) if ($order->shipment->pickup->dateFrom < new DateTime('now'))
@ -124,7 +126,7 @@ class Versandart_go extends Versanddienstleister
if ($result instanceof CreateOrderResponse) { if ($result instanceof CreateOrderResponse) {
$ret->Success = true; $ret->Success = true;
$ret->TrackingNumber = $result->hwbNumber; $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); $ret->Label = base64_decode($result->hwbOrPackageLabel);
} else { } else {
$ret->Errors[] = $result; $ret->Errors[] = $result;