diff --git a/classes/Carrier/Dhl/Data/Bank.php b/classes/Carrier/Dhl/Data/Bank.php
new file mode 100644
index 00000000..e213e7a1
--- /dev/null
+++ b/classes/Carrier/Dhl/Data/Bank.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Xentral\Carrier\Dhl\Data;
+
+class Bank
+{
+  public string $accountOwner;
+  public string $bankName;
+  public string $iban;
+  public string $note1;
+  public string $note2;
+  public ?string $bic;
+  public ?string $accountreference;
+}
\ No newline at end of file
diff --git a/classes/Carrier/Dhl/Data/Communication.php b/classes/Carrier/Dhl/Data/Communication.php
new file mode 100644
index 00000000..95381b0f
--- /dev/null
+++ b/classes/Carrier/Dhl/Data/Communication.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Xentral\Carrier\Dhl\Data;
+
+class Communication
+{
+  public ?string $phone;
+  public ?string $email;
+  public ?string $contactPerson;
+}
\ No newline at end of file
diff --git a/classes/Carrier/Dhl/Data/Contact.php b/classes/Carrier/Dhl/Data/Contact.php
new file mode 100644
index 00000000..cf87c989
--- /dev/null
+++ b/classes/Carrier/Dhl/Data/Contact.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Xentral\Carrier\Dhl\Data;
+
+class Contact
+{
+  public ?Communication $Communication;
+  public ?NativeAddress $Address;
+  public ?Name $Name;
+}
\ No newline at end of file
diff --git a/classes/Carrier/Dhl/Data/Country.php b/classes/Carrier/Dhl/Data/Country.php
new file mode 100644
index 00000000..b762f0c3
--- /dev/null
+++ b/classes/Carrier/Dhl/Data/Country.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Xentral\Carrier\Dhl\Data;
+
+class Country
+{
+  public ?string $country;
+  public string $countryISOCode;
+  public ?string $state;
+
+  public static function Create(string $isoCode, ?string $state = null):Country {
+    $obj = new Country();
+    $obj->countryISOCode = $isoCode;
+    $obj->state = $state;
+    return $obj;
+  }
+
+}
\ No newline at end of file
diff --git a/classes/Carrier/Dhl/Data/CreateShipmentOrderRequest.php b/classes/Carrier/Dhl/Data/CreateShipmentOrderRequest.php
new file mode 100644
index 00000000..7c2f39a4
--- /dev/null
+++ b/classes/Carrier/Dhl/Data/CreateShipmentOrderRequest.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Xentral\Carrier\Dhl\Data;
+
+class CreateShipmentOrderRequest
+{
+  public Version $Version;
+  public ShipmentOrder $ShipmentOrder;
+  public ?string $labelResponseType;
+  public ?string $groupProfileName;
+  public ?string $labelFormat;
+  public ?string $labelFormatRetoure;
+  public ?string $combinedPrinting;
+}
\ No newline at end of file
diff --git a/classes/Carrier/Dhl/Data/CreateShipmentOrderResponse.php b/classes/Carrier/Dhl/Data/CreateShipmentOrderResponse.php
new file mode 100644
index 00000000..57496db4
--- /dev/null
+++ b/classes/Carrier/Dhl/Data/CreateShipmentOrderResponse.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Xentral\Carrier\Dhl\Data;
+
+class CreateShipmentOrderResponse
+{
+  public Version $Version;
+  public Statusinformation $Status;
+  public ?CreationState $CreationState;
+}
\ No newline at end of file
diff --git a/classes/Carrier/Dhl/Data/CreationState.php b/classes/Carrier/Dhl/Data/CreationState.php
new file mode 100644
index 00000000..aca178ae
--- /dev/null
+++ b/classes/Carrier/Dhl/Data/CreationState.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Xentral\Carrier\Dhl\Data;
+
+class CreationState
+{
+    public string $sequenceNumber;
+    public ?string $shipmentNumber;
+    public ?string $returnShipmentNumber;
+    public LabelData $LabelData;
+}
\ No newline at end of file
diff --git a/classes/Carrier/Dhl/Data/Customer.php b/classes/Carrier/Dhl/Data/Customer.php
new file mode 100644
index 00000000..d901fb9c
--- /dev/null
+++ b/classes/Carrier/Dhl/Data/Customer.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Xentral\Carrier\Dhl\Data;
+
+class Customer
+{
+  public Name $Name;
+  public ?string $vatID;
+  public string $EKP;
+  public NativeAddress $Address;
+  public Contact $Contact;
+  public ?Bank $Bank;
+  public ?string $note;
+}
\ No newline at end of file
diff --git a/classes/Carrier/Dhl/Data/DeleteShipmentOrderRequest.php b/classes/Carrier/Dhl/Data/DeleteShipmentOrderRequest.php
new file mode 100644
index 00000000..929faa68
--- /dev/null
+++ b/classes/Carrier/Dhl/Data/DeleteShipmentOrderRequest.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Xentral\Carrier\Dhl\Data;
+
+class DeleteShipmentOrderRequest
+{
+  public Version $Version;
+  public string $shipmentNumber;
+}
\ No newline at end of file
diff --git a/classes/Carrier/Dhl/Data/DeleteShipmentOrderResponse.php b/classes/Carrier/Dhl/Data/DeleteShipmentOrderResponse.php
new file mode 100644
index 00000000..53da3704
--- /dev/null
+++ b/classes/Carrier/Dhl/Data/DeleteShipmentOrderResponse.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Xentral\Carrier\Dhl\Data;
+
+class DeleteShipmentOrderResponse
+{
+  public Version $Version;
+  public Statusinformation $Status;
+  public ?DeletionState $DeletionState;
+}
\ No newline at end of file
diff --git a/classes/Carrier/Dhl/Data/DeletionState.php b/classes/Carrier/Dhl/Data/DeletionState.php
new file mode 100644
index 00000000..6fc891ae
--- /dev/null
+++ b/classes/Carrier/Dhl/Data/DeletionState.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Xentral\Carrier\Dhl\Data;
+
+class DeletionState
+{
+  public string $shipmentNumber;
+  public Statusinformation $Status;
+}
\ No newline at end of file
diff --git a/classes/Carrier/Dhl/Data/DeliveryAddress.php b/classes/Carrier/Dhl/Data/DeliveryAddress.php
new file mode 100644
index 00000000..1a7c956e
--- /dev/null
+++ b/classes/Carrier/Dhl/Data/DeliveryAddress.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Xentral\Carrier\Dhl\Data;
+
+class DeliveryAddress
+{
+  public ?NativeAddress $NativeAddress;
+  public ?Postfiliale $PostOffice;
+  public ?PackStation $PackStation;
+  public ?string $streetNameCode;
+  public ?string $streetNumberCode;
+}
\ No newline at end of file
diff --git a/classes/Carrier/Dhl/Data/Dimension.php b/classes/Carrier/Dhl/Data/Dimension.php
new file mode 100644
index 00000000..32560c02
--- /dev/null
+++ b/classes/Carrier/Dhl/Data/Dimension.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Xentral\Carrier\Dhl\Data;
+
+class Dimension
+{
+  public int $length;
+  public int $width;
+  public int $height;
+  public ?string $unit;
+}
\ No newline at end of file
diff --git a/classes/Carrier/Dhl/Data/ExportDocPosition.php b/classes/Carrier/Dhl/Data/ExportDocPosition.php
new file mode 100644
index 00000000..4de17a31
--- /dev/null
+++ b/classes/Carrier/Dhl/Data/ExportDocPosition.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Xentral\Carrier\Dhl\Data;
+
+class ExportDocPosition
+{
+  public string $description;
+  public string $countryCodeOrigin;
+  public string $customsTariffNumber;
+  public int $amount;
+  public float $netWeightInKG;
+  public float $customsValue;
+}
\ No newline at end of file
diff --git a/classes/Carrier/Dhl/Data/ExportDocument.php b/classes/Carrier/Dhl/Data/ExportDocument.php
new file mode 100644
index 00000000..9be911b9
--- /dev/null
+++ b/classes/Carrier/Dhl/Data/ExportDocument.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Xentral\Carrier\Dhl\Data;
+
+class ExportDocument
+{
+  const TYPE_PRESENT = 'PRESENT';
+  const TYPE_DOCUMENT = 'DOCUMENT';
+  const TYPE_COMMERCIAL_GOODS = 'COMMERCIAL_GOODS';
+  const TYPE_COMMERCIAL_SAMPLE = 'COMMERCIAL_SAMPLE';
+  const TYPE_RETURN_OF_GOODS= 'RETURN_OF_GOODS';
+  const TYPE_OTHER = 'OTHER';
+
+  const TERMS_DDP = 'DDP';
+  const TERMS_DXV = 'DXV';
+  const TERMS_DAP = 'DAP';
+  const TERMS_DDX = 'DDX';
+  const TERMS_CPT = 'CPT';
+
+  public ?string $invoiceNumber;
+  public string $exportType;
+  public ?string $exportTypeDescription;
+  public ?string $termsOfTrade;
+  public string $placeOfCommital;
+  public ?float $additionalFee;
+  public ?string $customsCurrency;
+  public ?string $permitNumber;
+  public ?string $attestationNumber;
+  public ?string $addresseesCustomsReference;
+  public ?string $sendersCustomsReference;
+  public ?bool $WithElectronicExportNtfctn;
+  /** @var ExportDocPosition[] $ExportDocPosition */
+  public array $ExportDocPosition;
+}
\ No newline at end of file
diff --git a/classes/Carrier/Dhl/Data/LabelData.php b/classes/Carrier/Dhl/Data/LabelData.php
new file mode 100644
index 00000000..0213540d
--- /dev/null
+++ b/classes/Carrier/Dhl/Data/LabelData.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Xentral\Carrier\Dhl\Data;
+
+class LabelData
+{
+  public Statusinformation $Status;
+  public ?string $shipmentNumber;
+  public ?string $labelUrl;
+  public ?string $labelData;
+  public ?string $returnLabelUrl;
+  public ?string $returnLabelData;
+  public ?string $exportLabelUrl;
+  public ?string $exportLabelData;
+  public ?string $codLabelUrl;
+  public ?string $codLabelData;
+}
\ No newline at end of file
diff --git a/classes/Carrier/Dhl/Data/Name.php b/classes/Carrier/Dhl/Data/Name.php
new file mode 100644
index 00000000..3c242714
--- /dev/null
+++ b/classes/Carrier/Dhl/Data/Name.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Xentral\Carrier\Dhl\Data;
+
+class Name
+{
+  public string $name1;
+  public ?string $name2;
+  public ?string $name3;
+}
\ No newline at end of file
diff --git a/classes/Carrier/Dhl/Data/NativeAddress.php b/classes/Carrier/Dhl/Data/NativeAddress.php
new file mode 100644
index 00000000..44ca39c7
--- /dev/null
+++ b/classes/Carrier/Dhl/Data/NativeAddress.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Xentral\Carrier\Dhl\Data;
+
+class NativeAddress
+{
+  public string $streetName;
+  public ?string $streetNumber;
+
+  /**
+   * @var string[]
+   */
+  public array $addressAddition;
+  public ?string $dispatchingInformation;
+  public string $zip;
+  public string $city;
+  public ?string $province;
+  public ?Country $Origin;
+}
\ No newline at end of file
diff --git a/classes/Carrier/Dhl/Data/NativeAddressNew.php b/classes/Carrier/Dhl/Data/NativeAddressNew.php
new file mode 100644
index 00000000..73588edd
--- /dev/null
+++ b/classes/Carrier/Dhl/Data/NativeAddressNew.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Xentral\Carrier\Dhl\Data;
+
+class NativeAddressNew
+{
+  public string $streetName;
+  public ?string $streetNumber;
+  public string $zip;
+  public string $city;
+  public ?Country $Origin;
+}
\ No newline at end of file
diff --git a/classes/Carrier/Dhl/Data/PackStation.php b/classes/Carrier/Dhl/Data/PackStation.php
new file mode 100644
index 00000000..19ad30a8
--- /dev/null
+++ b/classes/Carrier/Dhl/Data/PackStation.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Xentral\Carrier\Dhl\Data;
+
+class PackStation
+{
+  public string $postNumber;
+  public string $packstationNumber;
+  public string $zip;
+  public string $city;
+  public ?string $province;
+  public ?Country $Origin;
+}
\ No newline at end of file
diff --git a/classes/Carrier/Dhl/Data/Postfiliale.php b/classes/Carrier/Dhl/Data/Postfiliale.php
new file mode 100644
index 00000000..50871a70
--- /dev/null
+++ b/classes/Carrier/Dhl/Data/Postfiliale.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Xentral\Carrier\Dhl\Data;
+
+class Postfiliale
+{
+  public string $postfilialeNumber;
+  public string $postNumber;
+  public string $zip;
+  public string $city;
+  public ?Country $Origin;
+}
\ No newline at end of file
diff --git a/classes/Carrier/Dhl/Data/Receiver.php b/classes/Carrier/Dhl/Data/Receiver.php
new file mode 100644
index 00000000..82353c1b
--- /dev/null
+++ b/classes/Carrier/Dhl/Data/Receiver.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Xentral\Carrier\Dhl\Data;
+
+class Receiver
+{
+  public string $name1;
+  public ?NativeAddress $Address;
+  public ?PackStation $Packstation;
+  public ?Postfiliale $Postfiliale;
+  public ?Communication $Communication;
+}
\ No newline at end of file
diff --git a/classes/Carrier/Dhl/Data/Shipment.php b/classes/Carrier/Dhl/Data/Shipment.php
new file mode 100644
index 00000000..6c4a3578
--- /dev/null
+++ b/classes/Carrier/Dhl/Data/Shipment.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Xentral\Carrier\Dhl\Data;
+
+class Shipment
+{
+  public ShipmentDetails $ShipmentDetails;
+  public Shipper $Shipper;
+  public string $ShipperReference;
+  public Receiver $Receiver;
+  public ?Shipper $ReturnReceiver;
+  public ?ExportDocument $ExportDocument;
+  public ?string $feederSystem;
+
+  public function __construct()
+  {
+    $this->ShipmentDetails = new ShipmentDetails();
+    $this->Shipper = new Shipper();
+    $this->ShipperReference = '';
+    $this->Receiver = new Receiver();
+  }
+}
\ No newline at end of file
diff --git a/classes/Carrier/Dhl/Data/ShipmentDetails.php b/classes/Carrier/Dhl/Data/ShipmentDetails.php
new file mode 100644
index 00000000..d322793e
--- /dev/null
+++ b/classes/Carrier/Dhl/Data/ShipmentDetails.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Xentral\Carrier\Dhl\Data;
+
+use DateTimeImmutable;
+
+class ShipmentDetails
+{
+  public string $product;
+  public string $accountNumber;
+  public string $customerReference;
+  private string $shipmentDate;
+  public string $costCentre;
+  public string $returnShipmentAccountNumber;
+  public string $returnShipmentReference;
+  public ShipmentItem $ShipmentItem;
+  public ShipmentService $Service;
+  public ShipmentNotification $Notification;
+  public Bank $BankData;
+
+  public function SetShipmentDate(DateTimeImmutable $date): void {
+    $this->shipmentDate = $date->format('Y-m-d');
+  }
+
+  public function GetShipmentDate(): DateTimeImmutable {
+    return DateTimeImmutable::createFromFormat('Y-m-d', $this->shipmentDate);
+  }
+}
\ No newline at end of file
diff --git a/classes/Carrier/Dhl/Data/ShipmentItem.php b/classes/Carrier/Dhl/Data/ShipmentItem.php
new file mode 100644
index 00000000..258a10d4
--- /dev/null
+++ b/classes/Carrier/Dhl/Data/ShipmentItem.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Xentral\Carrier\Dhl\Data;
+
+class ShipmentItem
+{
+  public float $weightInKG;
+  public ?int $lengthInCM;
+  public ?int $widthInCM;
+  public ?int $heightInCM;
+}
\ No newline at end of file
diff --git a/classes/Carrier/Dhl/Data/ShipmentNotification.php b/classes/Carrier/Dhl/Data/ShipmentNotification.php
new file mode 100644
index 00000000..ec6c3f0e
--- /dev/null
+++ b/classes/Carrier/Dhl/Data/ShipmentNotification.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Xentral\Carrier\Dhl\Data;
+
+class ShipmentNotification
+{
+  public string $recipientEmailAddress;
+  public ?string $templateId;
+}
\ No newline at end of file
diff --git a/classes/Carrier/Dhl/Data/ShipmentOrder.php b/classes/Carrier/Dhl/Data/ShipmentOrder.php
new file mode 100644
index 00000000..72905b1e
--- /dev/null
+++ b/classes/Carrier/Dhl/Data/ShipmentOrder.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Xentral\Carrier\Dhl\Data;
+
+class ShipmentOrder
+{
+  public string $sequenceNumber;
+  public Shipment $Shipment;
+  public ?Serviceconfiguration $PrintOnlyIfCodeable;
+}
\ No newline at end of file
diff --git a/classes/Carrier/Dhl/Data/ShipmentService.php b/classes/Carrier/Dhl/Data/ShipmentService.php
new file mode 100644
index 00000000..6747a5f9
--- /dev/null
+++ b/classes/Carrier/Dhl/Data/ShipmentService.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Xentral\Carrier\Dhl\Data;
+
+class ShipmentService
+{
+}
\ No newline at end of file
diff --git a/classes/Carrier/Dhl/Data/Shipper.php b/classes/Carrier/Dhl/Data/Shipper.php
new file mode 100644
index 00000000..2f66ee51
--- /dev/null
+++ b/classes/Carrier/Dhl/Data/Shipper.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Xentral\Carrier\Dhl\Data;
+
+class Shipper
+{
+  public Name $Name;
+  public NativeAddressNew $Address;
+  public ?Communication $Communication;
+
+  public function __construct()
+  {
+    $this->Name = new Name();
+    $this->Address = new NativeAddressNew();
+  }
+}
\ No newline at end of file
diff --git a/classes/Carrier/Dhl/Data/Status.php b/classes/Carrier/Dhl/Data/Status.php
new file mode 100644
index 00000000..b3f4667f
--- /dev/null
+++ b/classes/Carrier/Dhl/Data/Status.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Xentral\Carrier\Dhl\Data;
+
+class Status
+{
+  public string $statuscode;
+  public string $statusDescription;
+}
\ No newline at end of file
diff --git a/classes/Carrier/Dhl/Data/StatusElement.php b/classes/Carrier/Dhl/Data/StatusElement.php
new file mode 100644
index 00000000..23a8b83a
--- /dev/null
+++ b/classes/Carrier/Dhl/Data/StatusElement.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Xentral\Carrier\Dhl\Data;
+
+class StatusElement
+{
+  public string $statusElement;
+  public string $statusMessage;
+}
\ No newline at end of file
diff --git a/classes/Carrier/Dhl/Data/Statusinformation.php b/classes/Carrier/Dhl/Data/Statusinformation.php
new file mode 100644
index 00000000..e36a7291
--- /dev/null
+++ b/classes/Carrier/Dhl/Data/Statusinformation.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Xentral\Carrier\Dhl\Data;
+
+class Statusinformation
+{
+  public int $statusCode;
+  public string $statusText;
+  public array|string $statusMessage;
+  public string $statusType;
+  public StatusElement $errorMessage;
+  public StatusElement $warningMessage;
+}
\ No newline at end of file
diff --git a/classes/Carrier/Dhl/Data/Version.php b/classes/Carrier/Dhl/Data/Version.php
new file mode 100644
index 00000000..80c4ac21
--- /dev/null
+++ b/classes/Carrier/Dhl/Data/Version.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Xentral\Carrier\Dhl\Data;
+
+class Version
+{
+  public string $majorRelease;
+  public string $minorRelease;
+  public ?string $build;
+}
\ No newline at end of file
diff --git a/classes/Carrier/Dhl/DhlApi.php b/classes/Carrier/Dhl/DhlApi.php
new file mode 100644
index 00000000..6faef164
--- /dev/null
+++ b/classes/Carrier/Dhl/DhlApi.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Xentral\Carrier\Dhl;
+
+use SoapClient;
+use SoapHeader;
+use Xentral\Carrier\Dhl\Data\CreateShipmentOrderRequest;
+use Xentral\Carrier\Dhl\Data\CreateShipmentOrderResponse;
+use Xentral\Carrier\Dhl\Data\CreationState;
+use Xentral\Carrier\Dhl\Data\LabelData;
+use Xentral\Carrier\Dhl\Data\Shipment;
+use Xentral\Carrier\Dhl\Data\ShipmentOrder;
+use Xentral\Carrier\Dhl\Data\Statusinformation;
+use Xentral\Carrier\Dhl\Data\Version;
+
+class DhlApi
+{
+  private SoapClient $soapClient;
+
+  private const SANDBOX_URL = 'https://cig.dhl.de/services/sandbox/soap';
+  private const PRODUCTION_URL = 'https://cig.dhl.de/services/production/soap';
+  private const NAMESPACE_CIS = 'http://dhl.de/webservice/cisbase';
+
+  public function __construct(string $user, string $signature)
+  {
+    $this->soapClient = new SoapClient(__DIR__ . '/Wsdl/geschaeftskundenversand-api-3.4.0.wsdl', [
+      'login' => 'ewsp',
+      'password' => 'rZ*twrzJ5@wr&$',
+      'location' => self::SANDBOX_URL,
+      'trace' => 1,
+      'connection_timeout' => 30,
+      'classmap' => [
+        'CreateShipmentOrderResponse' => CreateShipmentOrderResponse::class,
+        'CreationState' => CreationState::class,
+        'LabelData' => LabelData::class,
+        'Statusinformation' => Statusinformation::class,
+        'Version' => Version::class,
+      ]
+    ]);
+
+    $authHeader = new SoapHeader(self::NAMESPACE_CIS, 'Authentification', [
+        'user' => $user,
+        'signature' => $signature
+    ]);
+    $this->soapClient->__setSoapHeaders($authHeader);
+  }
+
+  public function CreateShipment(Shipment $shipment): CreateShipmentOrderResponse|string
+  {
+    $request = new CreateShipmentOrderRequest();
+    $request->Version = $this->getVersion();
+    $request->ShipmentOrder = new ShipmentOrder();
+    $request->ShipmentOrder->Shipment = $shipment;
+    $request->ShipmentOrder->sequenceNumber = '1';
+    $request->labelResponseType = "B64";
+    try {
+      $response = $this->soapClient->createShipmentOrder($request);
+      return $response;
+    } catch (\SoapFault $e) {
+      return $e->getMessage();
+    }
+  }
+
+  private function getVersion() {
+    $version = new Version();
+    $version->majorRelease = '3';
+    $version->minorRelease = '4';
+    return $version;
+  }
+}
\ No newline at end of file
diff --git a/classes/Modules/ShippingMethod/Model/CreateShipmentResult.php b/classes/Modules/ShippingMethod/Model/CreateShipmentResult.php
new file mode 100644
index 00000000..12ef0414
--- /dev/null
+++ b/classes/Modules/ShippingMethod/Model/CreateShipmentResult.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Xentral\Modules\ShippingMethod\Model;
+
+class CreateShipmentResult
+{
+  public bool $Success = false;
+  public array $Errors = [];
+  public ?string $Label;
+  public ?string $ExportDocuments;
+  public ?string $TrackingNumber;
+  public ?string $TrackingUrl;
+}
\ No newline at end of file
diff --git a/classes/Modules/ShippingMethod/Model/CustomsInfo.php b/classes/Modules/ShippingMethod/Model/CustomsInfo.php
new file mode 100644
index 00000000..f8a83184
--- /dev/null
+++ b/classes/Modules/ShippingMethod/Model/CustomsInfo.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Xentral\Modules\ShippingMethod\Model;
+
+class CustomsInfo
+{
+  const CUSTOMS_TYPE_GIFT = 0;
+  const CUSTOMS_TYPE_DOCUMENTS = 1;
+  const CUSTOMS_TYPE_GOODS = 2;
+  const CUSTOMS_TYPE_SAMPLE = 3;
+  const CUSTOMS_TYPE_RETURN = 4;
+
+}
\ No newline at end of file
diff --git a/classes/Modules/ShippingMethod/Model/Product.php b/classes/Modules/ShippingMethod/Model/Product.php
new file mode 100644
index 00000000..d65fc6b3
--- /dev/null
+++ b/classes/Modules/ShippingMethod/Model/Product.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Xentral\Modules\ShippingMethod\Model;
+
+class Product
+{
+  const SERVICE_COD = 'cod';
+  const SERVICE_PREMIUM = 'premium';
+
+  public string $Id;
+  public string $Name;
+  public float $LengthMin = 0;
+  public float $LengthMax = 500;
+  public float $WidthMin = 0;
+  public float $WidthMax = 500;
+  public float $HeightMin = 0;
+  public float $HeightMax = 500;
+  public float $WeightMin = 0;
+  public float $WeightMax = 100;
+  public array $AvailableServices = [];
+
+  public static function Create(string $id, string $name):Product {
+    $obj = new Product();
+    $obj->Id = $id;
+    $obj->Name = $name;
+    return $obj;
+  }
+
+  public function WithLength(float $min, float $max): Product {
+    $this->LengthMin = $min;
+    $this->LengthMax = $max;
+    return $this;
+  }
+
+  public function WithWidth(float $min, float $max): Product {
+    $this->WidthMin = $min;
+    $this->WidthMax = $max;
+    return $this;
+  }
+
+  public function WithHeight(float $min, float $max): Product {
+    $this->HeightMin = $min;
+    $this->HeightMax = $max;
+    return $this;
+  }
+
+  public function WithWeight(float $min, float $max): Product {
+    $this->WeightMin = $min;
+    $this->WeightMax = $max;
+    return $this;
+  }
+
+  public function WithServices(array $services): Product {
+    $this->AvailableServices = $services;
+    return $this;
+  }
+}
\ No newline at end of file
diff --git a/www/lib/class.versanddienstleister.php b/www/lib/class.versanddienstleister.php
index 0de6e944..46219164 100644
--- a/www/lib/class.versanddienstleister.php
+++ b/www/lib/class.versanddienstleister.php
@@ -1,5 +1,11 @@
-<?php 
-abstract class Versanddienstleister {
+<?php
+
+use Xentral\Modules\ShippingMethod\Model\CreateShipmentResult;
+use Xentral\Modules\ShippingMethod\Model\CustomsInfo;
+use Xentral\Modules\ShippingMethod\Model\Product;
+
+abstract class Versanddienstleister
+{
   protected int $id;
   protected Application $app;
   protected string $type;
@@ -26,91 +32,83 @@ abstract class Versanddienstleister {
     $this->settings = json_decode($row['einstellungen_json']);
   }
 
-  public function isEtikettenDrucker(): bool {
+  public function isEtikettenDrucker(): bool
+  {
     return false;
   }
 
-  public function GetAdressdaten($id, $sid)
+  public abstract function GetName(): string;
+
+  public function GetAdressdaten($id, $sid): array
   {
     $auftragId = $lieferscheinId = $rechnungId = $versandId = 0;
-    if($sid==='rechnung')
+    if ($sid === 'rechnung')
       $rechnungId = $id;
-    if($sid==='lieferschein') {
+    if ($sid === 'lieferschein') {
       $lieferscheinId = $id;
       $auftragId = $this->app->DB->Select("SELECT auftragid FROM lieferschein WHERE id=$lieferscheinId LIMIT 1");
       $rechnungId = $this->app->DB->Select("SELECT id FROM rechnung WHERE lieferschein = '$lieferscheinId' LIMIT 1");
-      if($rechnungId <= 0)
+      if ($rechnungId <= 0)
         $rechnungId = $this->app->DB->Select("SELECT rechnungid FROM lieferschein WHERE id='$lieferscheinId' LIMIT 1");
     }
-    if($sid==='versand')
-    {
+    if ($sid === 'versand') {
       $versandId = $id;
       $lieferscheinId = $this->app->DB->Select("SELECT lieferschein FROM versand WHERE id='$versandId' LIMIT 1");
-      $rechnungId  = $this->app->DB->Select("SELECT rechnung FROM versand WHERE id='$versandId' LIMIT 1");
+      $rechnungId = $this->app->DB->Select("SELECT rechnung FROM versand WHERE id='$versandId' LIMIT 1");
       $sid = 'lieferschein';
     }
 
     if ($auftragId <= 0 && $rechnungId > 0)
       $auftragId = $this->app->DB->Select("SELECT auftragid FROM rechnung WHERE id=$rechnungId LIMIT 1");
 
-    if($sid==='rechnung' || $sid==='lieferschein' || $sid==='adresse')
-    {
+    if ($sid === 'rechnung' || $sid === 'lieferschein' || $sid === 'adresse') {
       $docArr = $this->app->DB->SelectRow("SELECT * FROM `$sid` WHERE id = $id LIMIT 1");
+      $ret['addressId'] = $docArr['adresse'];
+      $ret['auftragId'] = $auftragId;
+      $ret['rechnungId'] = $rechnungId;
+      $ret['lieferscheinId'] = $lieferscheinId;
 
       $addressfields = ['name', 'adresszusatz', 'abteilung', 'ansprechpartner', 'unterabteilung', 'ort', 'plz',
-          'strasse', 'land', 'telefon', 'email'];
-      $ret = array_filter($docArr, fn($key)=>in_array($key, $addressfields), ARRAY_FILTER_USE_KEY);
+          'strasse', 'land'];
+      $ret['original'] = array_filter($docArr, fn($key) => in_array($key, $addressfields), ARRAY_FILTER_USE_KEY);
 
-      $name2 = trim($docArr['adresszusatz']);
-      $abt = 0;
-      if($name2==='')
-      {
-        $name2 = trim($docArr['abteilung']);
-        $abt=1;
-      }
-      $name3 = trim($docArr['ansprechpartner']);
-      if($name3==='' && $abt!==1){
-        $name3 = trim($docArr['abteilung']);
-      }
+      $ret['name'] = empty(trim($docArr['ansprechpartner'])) ? trim($docArr['name']) : trim($docArr['ansprechpartner']);
+      $ret['companyname'] = !empty(trim($docArr['ansprechpartner'])) ? trim($docArr['name']) : '';
+      $ret['address2'] = join(';', array_filter([
+          $docArr['abteilung'],
+          $docArr['unterabteilung'],
+          $docArr['adresszusatz']
+      ], fn(string $item) => !empty(trim($item))));
 
-      //unterabteilung versuchen einzublenden
-      if($name2==='') {
-        $name2 = trim($docArr['unterabteilung']);
-      } else if ($name3==='') {
-        $name3 = trim($docArr['unterabteilung']);
-      }
 
-      if($name3!=='' && $name2==='') {
-        $name2=$name3;
-        $name3='';
-      }
-      $ret['name2'] = $name2;
-      $ret['name3'] = $name3;
+      $ret['city'] = $docArr['ort'];
+      $ret['zip'] = $docArr['plz'];
+      $ret['country'] = $docArr['land'];
+      $ret['phone'] = $docArr['telefon'];
+      $ret['email'] = $docArr['email'];
 
       $strasse = trim($docArr['strasse']);
       $ret['streetwithnumber'] = $strasse;
       $hausnummer = trim($this->app->erp->ExtractStreetnumber($strasse));
-      $strasse = trim(str_replace($hausnummer,'',$strasse));
-      $strasse = str_replace('.','',$strasse);
+      $strasse = trim(str_replace($hausnummer, '', $strasse));
+      $strasse = str_replace('.', '', $strasse);
 
-      if($strasse=='')
-      {
+      if ($strasse == '') {
         $strasse = trim($hausnummer);
         $hausnummer = '';
       }
-      $ret['strasse'] = $strasse;
-      $ret['hausnummer'] = $hausnummer;
+      $ret['street'] = $strasse;
+      $ret['streetnumber'] = $hausnummer;
     }
 
     // wenn rechnung im spiel entweder durch versand oder direkt rechnung
-    if($rechnungId >0)
-    {
-      $invoice_data =  $this->app->DB->SelectRow("SELECT zahlungsweise, soll, belegnr FROM rechnung WHERE id='$rechnungId' LIMIT 1");
+    if ($rechnungId > 0) {
+      $invoice_data = $this->app->DB->SelectRow("SELECT zahlungsweise, soll, belegnr FROM rechnung WHERE id='$rechnungId' LIMIT 1");
       $ret['zahlungsweise'] = $invoice_data['zahlungsweise'];
       $ret['betrag'] = $invoice_data['soll'];
       $ret['invoice_number'] = $invoice_data['belegnr'];
 
-      if($invoice_data['zahlungsweise']==='nachnahme'){
+      if ($invoice_data['zahlungsweise'] === 'nachnahme') {
         $ret['nachnahme'] = true;
       }
     }
@@ -118,10 +116,10 @@ abstract class Versanddienstleister {
     $sql = "SELECT
         lp.bezeichnung,
         lp.menge,
-        coalesce(nullif(lp.zolltarifnummer, ''), nullif(rp.zolltarifnummer, ''), nullif(a.zolltarifnummer, '')) zolltarifnummer,
-        coalesce(nullif(lp.herkunftsland, ''), nullif(rp.herkunftsland, ''), nullif(a.herkunftsland, '')) herkunftsland,
-        coalesce(nullif(lp.zolleinzelwert, '0'), rp.preis *(1-rp.rabatt/100)) zolleinzelwert,
-        coalesce(nullif(lp.zolleinzelgewicht, 0), a.gewicht) zolleinzelgewicht,
+        coalesce(nullif(lp.zolltarifnummer, ''), nullif(rp.zolltarifnummer, ''), nullif(a.zolltarifnummer, '')) as zolltarifnummer,
+        coalesce(nullif(lp.herkunftsland, ''), nullif(rp.herkunftsland, ''), nullif(a.herkunftsland, '')) as herkunftsland,
+        coalesce(nullif(lp.zolleinzelwert, '0'), rp.preis *(1-rp.rabatt/100)) as zolleinzelwert,
+        coalesce(nullif(lp.zolleinzelgewicht, 0), a.gewicht) as zolleinzelgewicht,
         lp.zollwaehrung
       FROM lieferschein_position lp
       JOIN artikel a on lp.artikel = a.id
@@ -131,10 +129,9 @@ abstract class Versanddienstleister {
       ORDER BY lp.sort";
     $ret['positions'] = $this->app->DB->SelectArr($sql);
 
-    if($sid==="lieferschein"){
+    if ($sid === "lieferschein") {
       $standardkg = $this->app->erp->VersandartMindestgewicht($lieferscheinId);
-    }
-    else{
+    } else {
       $standardkg = $this->app->erp->VersandartMindestgewicht();
     }
     $ret['weight'] = $standardkg;
@@ -155,7 +152,8 @@ abstract class Versanddienstleister {
    *
    * @return array
    */
-  public function AdditionalSettings(): array {
+  public function AdditionalSettings(): array
+  {
     return [];
   }
 
@@ -168,73 +166,60 @@ abstract class Versanddienstleister {
   public function RenderAdditionalSettings(string $target, array $form): void
   {
     $fields = $this->AdditionalSettings();
-    if($this->app->Secure->GetPOST('speichern'))
-    {
-      $json = $this->app->DB->Select("SELECT einstellungen_json FROM versandarten WHERE id = '".$this->id."' LIMIT 1");
-      $modul = $this->app->DB->Select("SELECT modul FROM versandarten WHERE id = '".$this->id."' LIMIT 1");
-      if(!empty($json))
-      {
+    if ($this->app->Secure->GetPOST('speichern')) {
+      $json = $this->app->DB->Select("SELECT einstellungen_json FROM versandarten WHERE id = '" . $this->id . "' LIMIT 1");
+      $modul = $this->app->DB->Select("SELECT modul FROM versandarten WHERE id = '" . $this->id . "' LIMIT 1");
+      if (!empty($json)) {
         $json = @json_decode($json, true);
-      }else{
+      } else {
         $json = array();
-        foreach($fields as $name => $val)
-        {
-          if(isset($val['default']))
-          {
+        foreach ($fields as $name => $val) {
+          if (isset($val['default'])) {
             $json[$name] = $val['default'];
           }
         }
       }
-      if(empty($json))
-      {
+      if (empty($json)) {
         $json = null;
       }
-      foreach($fields as $name => $val)
-      {
+      foreach ($fields as $name => $val) {
 
-        if($modul === $this->app->Secure->GetPOST('modul_name'))
-        {
-          $json[$name] = $this->app->Secure->GetPOST($name, '','', 1);
+        if ($modul === $this->app->Secure->GetPOST('modul_name')) {
+          $json[$name] = $this->app->Secure->GetPOST($name, '', '', 1);
         }
-       
-        if(isset($val['replace']))
-        {
-          switch($val['replace'])
-          {
+
+        if (isset($val['replace'])) {
+          switch ($val['replace']) {
             case 'lieferantennummer':
-              $json[$name] = $this->app->erp->ReplaceLieferantennummer(1,$json[$name],1);
-            break;
+              $json[$name] = $this->app->erp->ReplaceLieferantennummer(1, $json[$name], 1);
+              break;
           }
         }
       }
       $json_str = $this->app->DB->real_escape_string(json_encode($json));
-      $this->app->DB->Update("UPDATE versandarten SET einstellungen_json = '$json_str' WHERE id = '".$this->id."' LIMIT 1");
+      $this->app->DB->Update("UPDATE versandarten SET einstellungen_json = '$json_str' WHERE id = '" . $this->id . "' LIMIT 1");
     }
     $html = '';
-   
-    foreach($fields as $name => $val) // set missing default values
+
+    foreach ($fields as $name => $val) // set missing default values
     {
-      if(isset($val['default']) && !isset($form[$name]))
-      {
+      if (isset($val['default']) && !isset($form[$name])) {
         $form[$name] = $val['default'];
       }
     }
-    foreach($fields as $name => $val)
-    {
-      if(isset($val['heading']))
-        $html .= '<tr><td colspan="2"><b>'.html_entity_decode($val['heading']).'</b></td></tr>';
+    foreach ($fields as $name => $val) {
+      if (isset($val['heading']))
+        $html .= '<tr><td colspan="2"><b>' . html_entity_decode($val['heading']) . '</b></td></tr>';
 
-      $html .= '<tr><td>'.($val['bezeichnung'] ?? $name).'</td><td>';
-      if(isset($val['replace']))
-      {
-        switch($val['replace'])
-        {
+      $html .= '<tr><td>' . ($val['bezeichnung'] ?? $name) . '</td><td>';
+      if (isset($val['replace'])) {
+        switch ($val['replace']) {
           case 'lieferantennummer':
-            $form[$name] = $this->app->erp->ReplaceLieferantennummer(0,$form[$name],0);
+            $form[$name] = $this->app->erp->ReplaceLieferantennummer(0, $form[$name], 0);
             $this->app->YUI->AutoComplete($name, 'lieferant', 1);
             break;
           case 'shop':
-            $form[$name] .= ($form[$name]?' '.$this->app->DB->Select("SELECT bezeichnung FROM shopexport WHERE id = '".(int)$form[$name]."'"):'');
+            $form[$name] .= ($form[$name] ? ' ' . $this->app->DB->Select("SELECT bezeichnung FROM shopexport WHERE id = '" . (int)$form[$name] . "'") : '');
             $this->app->YUI->AutoComplete($name, 'shopnameid');
             break;
           case 'etiketten':
@@ -242,41 +227,38 @@ abstract class Versanddienstleister {
             break;
         }
       }
-      switch($val['typ'] ?? 'text')
-      {
+      switch ($val['typ'] ?? 'text') {
         case 'textarea':
-          $html .= '<textarea name="'.$name.'" id="'.$name.'">'.($form[$name] ?? '').'</textarea>';
+          $html .= '<textarea name="' . $name . '" id="' . $name . '">' . ($form[$name] ?? '') . '</textarea>';
           break;
         case 'checkbox':
-          $html .= '<input type="checkbox" name="'.$name.'" id="'.$name.'" value="1" '.($form[$name] ?? false ? ' checked="checked" ':'').' />';
+          $html .= '<input type="checkbox" name="' . $name . '" id="' . $name . '" value="1" ' . ($form[$name] ?? false ? ' checked="checked" ' : '') . ' />';
           break;
         case 'select':
           $html .= $this->app->Tpl->addSelect('return', $name, $name, $val['optionen'], $form[$name]);
           break;
         case 'submit':
-          if(isset($val['text']))
-            $html .= '<form method="POST"><input type="submit" name="'.$name.'" value="'.$val['text'].'"></form>';
+          if (isset($val['text']))
+            $html .= '<form method="POST"><input type="submit" name="' . $name . '" value="' . $val['text'] . '"></form>';
           break;
         case 'custom':
-          if(isset($val['function']))
-          {
+          if (isset($val['function'])) {
             $tmpfunction = $val['function'];
-            if(method_exists($this, $tmpfunction))
-            {
+            if (method_exists($this, $tmpfunction)) {
               $html .= $this->$tmpfunction();
             }
           }
           break;
         default:
           $html .= '<input type="text"'
-              .(!empty($val['size'])?' size="'.$val['size'].'"':'')
-              .(!empty($val['placeholder'])?' placeholder="'.$val['placeholder'].'"':'')
-              .' name="'.$name.'" id="'.$name.'" value="'.(isset($form[$name])?htmlspecialchars($form[$name]):'').'" />';
-        break;
+              . (!empty($val['size']) ? ' size="' . $val['size'] . '"' : '')
+              . (!empty($val['placeholder']) ? ' placeholder="' . $val['placeholder'] . '"' : '')
+              . ' name="' . $name . '" id="' . $name . '" value="' . (isset($form[$name]) ? htmlspecialchars($form[$name]) : '') . '" />';
+          break;
       }
-      if(isset($val['info']) && $val['info'])
-        $html .= ' <i>'.$val['info'].'</i>';
-      
+      if (isset($val['info']) && $val['info'])
+        $html .= ' <i>' . $val['info'] . '</i>';
+
       $html .= '</td></tr>';
     }
     $this->app->Tpl->Add($target, $html);
@@ -290,21 +272,20 @@ abstract class Versanddienstleister {
    */
   public function ValidateSettings(array &$form): array
   {
-      return [];
+    return [];
   }
 
 
-
   /**
    * @param string $tracking
-   * @param int    $versand
-   * @param int    $lieferschein
+   * @param int $versand
+   * @param int $lieferschein
    */
-  public function SetTracking($tracking,$versand=0,$lieferschein=0, $trackingLink = '')
+  public function SetTracking($tracking, $versand = 0, $lieferschein = 0, $trackingLink = '')
   {
     //if($versand > 0) $this->app->DB->Update("UPDATE versand SET tracking=CONCAT(tracking,if(tracking!='',';',''),'".$tracking."') WHERE id='$versand' LIMIT 1");
-    $this->app->User->SetParameter('versand_lasttracking',$tracking);
-    $this->app->User->SetParameter('versand_lasttracking_link',$trackingLink);
+    $this->app->User->SetParameter('versand_lasttracking', $tracking);
+    $this->app->User->SetParameter('versand_lasttracking_link', $trackingLink);
     $this->app->User->SetParameter('versand_lasttracking_versand', $versand);
     $this->app->User->SetParameter('versand_lasttracking_lieferschein', $lieferschein);
   }
@@ -314,17 +295,17 @@ abstract class Versanddienstleister {
    */
   public function deleteTrackingFromUserdata($tracking)
   {
-    if(empty($tracking)) {
+    if (empty($tracking)) {
       return;
     }
-    $trackingUser = !empty($this->app->User) && method_exists($this->app->User,'GetParameter')?
-      $this->app->User->GetParameter('versand_lasttracking'):'';
-    if(empty($trackingUser) || $trackingUser !== $tracking) {
+    $trackingUser = !empty($this->app->User) && method_exists($this->app->User, 'GetParameter') ?
+        $this->app->User->GetParameter('versand_lasttracking') : '';
+    if (empty($trackingUser) || $trackingUser !== $tracking) {
       return;
     }
 
-    $this->app->User->SetParameter('versand_lasttracking','');
-    $this->app->User->SetParameter('versand_lasttracking_link','');
+    $this->app->User->SetParameter('versand_lasttracking', '');
+    $this->app->User->SetParameter('versand_lasttracking_link', '');
     $this->app->User->SetParameter('versand_lasttracking_versand', '');
     $this->app->User->SetParameter('versand_lasttracking_lieferschein', '');
   }
@@ -341,21 +322,84 @@ abstract class Versanddienstleister {
 
   /**
    * @param string $tracking
-   * @param int    $notsend
+   * @param int $notsend
    * @param string $link
    * @param string $rawlink
    *
    * @return bool
    */
-  public function Trackinglink($tracking, &$notsend, &$link, &$rawlink)  {
+  public function Trackinglink($tracking, &$notsend, &$link, &$rawlink)
+  {
     $notsend = 0;
     $rawlink = '';
     $link = '';
     return true;
   }
 
-  public function Paketmarke(string $target, string $docType, int $docId): void {
+  public function Paketmarke(string $target, string $docType, int $docId): void
+  {
+    $address = $this->GetAdressdaten($docId, $docType);
+    if (isset($_SERVER['HTTP_CONTENT_TYPE']) && ($_SERVER['HTTP_CONTENT_TYPE'] === 'application/json')) {
+      $json = json_decode(file_get_contents('php://input'));
+      $ret = [];
+      if ($json->submit == 'print') {
+        $result = $this->CreateShipment($json, $address);
+        if ($result->Success) {
+          $sql = "INSERT INTO versand 
+          (adresse, lieferschein, versandunternehmen, gewicht, tracking, tracking_link, anzahlpakete) 
+          VALUES 
+          ({$address['addressId']}, {$address['lieferscheinId']}, '$this->type',
+           '$json->weight', '$result->TrackingNumber', '$result->TrackingUrl', 1)";
+          print_r($sql);
+          $this->app->DB->Insert($sql);
 
+          $filename = $this->app->erp->GetTMP() . join('_', [$this->type, 'Label', $result->TrackingNumber]) . '.pdf';
+          file_put_contents($filename, $result->Label);
+          $this->app->printer->Drucken($this->labelPrinterId, $filename);
+
+          if (isset($result->ExportDocuments)) {
+            $filename = $this->app->erp->GetTMP() . join('_', [$this->type, 'ExportDoc', $result->TrackingNumber]) . '.pdf';
+            file_put_contents($filename, $result->ExportDocuments);
+            $this->app->printer->Drucken($this->documentPrinterId, $filename);
+          }
+          $ret['messages'][] = ['class' => 'info', 'text' => "Paketmarke wurde erfolgreich erstellt: $result->TrackingNumber"];
+        } else {
+          $ret['messages'] = array_map(fn(string $item) => ['class' => 'error', 'text' => $item], array_unique($result->Errors));
+        }
+      }
+      header('Content-Type: application/json');
+      echo json_encode($ret);
+      $this->app->ExitXentral();
+    }
+
+    $address['sendungsart'] = CustomsInfo::CUSTOMS_TYPE_GOODS;
+    $products = $this->GetShippingProducts();
+    $products = array_combine(array_column($products, 'Id'), $products);
+    $address['product'] = $products[0]->Id ?? '';
+
+    $json['form'] = $address;
+    $json['countries'] = $this->app->erp->GetSelectLaenderliste();
+    $json['products'] = $products;
+    $json['customs_shipment_types'] = [
+        CustomsInfo::CUSTOMS_TYPE_GIFT => 'Geschenk',
+        CustomsInfo::CUSTOMS_TYPE_DOCUMENTS => 'Dokumente',
+        CustomsInfo::CUSTOMS_TYPE_GOODS => 'Handelswaren',
+        CustomsInfo::CUSTOMS_TYPE_SAMPLE => 'Erprobungswaren',
+        CustomsInfo::CUSTOMS_TYPE_RETURN => 'Rücksendung'
+    ];
+    $json['messages'] = [];
+    $json['form']['services'] = [
+        Product::SERVICE_PREMIUM => false
+    ];
+    $this->app->Tpl->Set('JSON', json_encode($json));
+    $this->app->Tpl->Set('CARRIERNAME', $this->GetName());
+    $this->app->Tpl->Parse($target, 'createshipment.tpl');
   }
-  
+
+  public abstract function CreateShipment(object $json, array $address): CreateShipmentResult;
+
+  /**
+   * @return Product[]
+   */
+  public abstract function GetShippingProducts(): array;
 }
diff --git a/www/lib/intraship.php b/www/lib/intraship.php
deleted file mode 100644
index 65fc5837..00000000
--- a/www/lib/intraship.php
+++ /dev/null
@@ -1,1501 +0,0 @@
-<?php
-// thx to  Tobias Redmann
-
-
-
-/**
- * 
- */
-require_once(dirname(__DIR__).'/class.versanddienstleister.php');
-class Versandart_intraship extends Versanddienstleister{
-  
-  const API_URL = 'https://cig.dhl.de/cig-wsdls/com/dpdhl/wsdl/geschaeftskundenversand-api/1.0/geschaeftskundenversand-api-1.0.wsdl';
-  const API_URL2 = 'https://cig.dhl.de/cig-wsdls/com/dpdhl/wsdl/geschaeftskundenversand-api/1.1/geschaeftskundenversand-api-1.1.wsdl';
-  const API_URL22 = 'https://cig.dhl.de/cig-wsdls/com/dpdhl/wsdl/geschaeftskundenversand-api/2.2/geschaeftskundenversand-api-2.2.wsdl';
-  const SANDBOX_URL = 'https://cig.dhl.de/services/sandbox/soap';
-  const PRODUCTION_URL = 'https://cig.dhl.de/services/production/soap';
-
-  private $einstellungen;
-
-  private $info;
-
-  private $client;
-  
-  public $paketmarke_drucker;
-  public $export_drucker;
-
-  public $errors;
-
-  /**
-   * Constructor for Shipment SDK
-   * 
-   * @param type $api_einstellungen
-   * @param type $customer_info
-   */
-   
-  function __construct(&$app, $id) {
-    $this->id = $id;
-    $this->app = &$app;
-    $einstellungen_json = $this->app->DB->Select("SELECT einstellungen_json FROM versandarten WHERE id = '$id' LIMIT 1");
-    $this->paketmarke_drucker = $this->app->DB->Select("SELECT paketmarke_drucker FROM versandarten WHERE id = '$id' LIMIT 1");
-    $this->export_drucker = $this->app->DB->Select("SELECT export_drucker FROM versandarten WHERE id = '$id' LIMIT 1");
-    if($einstellungen_json)
-    {
-      $this->einstellungen = json_decode($einstellungen_json,true);
-    }else{
-      $this->einstellungen = array();
-    } 
-    $this->einstellungen = $this->einstellungen;
-    if(isset($this->einstellungen['intraship_partnerid']) && $this->einstellungen['intraship_partnerid'] )$this->einstellungen['partnerid'] = $this->einstellungen['intraship_partnerid'];
-    if(!isset($this->einstellungen['partnerid']))
-    {
-      $this->einstellungen['partnerid'] = '01';      
-    }
-    if(!isset($this->einstellungen['partnerid']) || $this->einstellungen['partnerid']=="")
-    {
-      $this->einstellungen['partnerid'] = '01';
-    }
-
-    $this->errors = array();
-    $data = $this->einstellungen;
-    $this->info = array(
-            'company_name'    => $data['intraship_company_name'],
-            'street_name'     => $data['intraship_street_name'],
-            'street_number'   => $data['intraship_street_number'],
-            'zip'             => $data['intraship_zip'],
-            'country'         => $data['intraship_country'],
-            'city'            => $data['intraship_city'],
-            'email'           => $data['intraship_email'],
-            'phone'           => $data['intraship_phone'],
-            'internet'        => $data['intraship_internet'],
-            'contact_person'  => $data['intraship_contact_person'],
-            'export_reason'  => $data['intraship_exportgrund']
-            );
-  //function __construct($api_einstellungen, $customer_info) {
-
-
-
-        if($land!=$this->app->erp->Firmendaten("land"))
-        {
-          if(!empty($data['intraship_partnerid_welt']) && !empty($data['intraship_partnerid_welt']))$einstellungen['partnerid'] = $data['intraship_partnerid_welt'];
-        }
-
-        if(isset($data['intraship_retourenaccount']) && $data['intraship_retourenaccount'])$einstellungen['intraship_retourenaccount'] = $data['intraship_retourenaccount'];
-
-  
-    /*
-  
-    $this->einstellungen = $api_einstellungen;
-    $this->info = $customer_info;
-
-    if($this->einstellungen['partnerid']=="") $this->einstellungen['partnerid'] = '01';
-
-    $this->errors = array();
-    */
-  }
-  
-  public function GetBezeichnung()
-  {
-    return 'DHL Instrahship';
-  }
-  
-  function AdditionalSettings()
-  {
-    return array(
-    
-    
-    'user' => array('typ'=>'text','bezeichnung'=>'Benutzer:','info'=>'geschaeftskunden_api (Versenden/Intraship-Benutzername)'),
-    'signature' => array('typ'=>'text','bezeichnung'=>'Signature:','info'=>'Dhl_ep_test1 (Versenden/IntrashipPasswort)'),
-    'ekp' => array('typ'=>'text','bezeichnung'=>'EKP','info'=>'5000000000 (gültige DHL Kundennummer)'),
-    'partnerid' => array('typ'=>'text','bezeichnung'=>'Partner ID Inland:','info'=>'meist 01, manchmal 02, 03 etc.'),
-    'partnerid_welt' => array('typ'=>'text','bezeichnung'=>'Partner ID Welt:','info'=>'falls leer wird die inländische Partner ID verwendet.'),
-    'api_user' => array('typ'=>'text','bezeichnung'=>'API User:','info'=>'Bitte anfragen beim Support'),
-    'api_password' => array('typ'=>'text','bezeichnung'=>'API Passwort:','info'=>'Bitte anfragen beim Support'),
-    'intraship_retourenaccount' => array('typ'=>'text','bezeichnung'=>'Retouren Account:','info'=>'14 Stellige DHL-Retoure Abrechnungsnummer'),
-    'intraship_retourenlabel'=>array('typ'=>'checkbox','bezeichnung'=>'Vorauswahl Retourenlabel:','info'=>'Druckt Retourenlabel mit'),
-    
-    'intraship_company_name' => array('typ'=>'text','bezeichnung'=>'Versender Firma:'),
-    'intraship_street_name' => array('typ'=>'text','bezeichnung'=>'Versender Strasse:'),
-    'intraship_street_number' => array('typ'=>'text','bezeichnung'=>'Versender Strasse Nr.:'),
-    //'intraship_name' => array('typ'=>'text','bezeichnung'=>'Versender Ansprechpartner:'),
-    'intraship_zip' => array('typ'=>'text','bezeichnung'=>'Versender PLZ:'),
-    'intraship_city' => array('typ'=>'text','bezeichnung'=>'Versender Stadt:'),
-    'intraship_country' => array('typ'=>'text','bezeichnung'=>'Versender Land:','info'=>'germany'),
-    'intraship_email' => array('typ'=>'text','bezeichnung'=>'Versender E-Mail:'),
-    'intraship_phone' => array('typ'=>'text','bezeichnung'=>'Versender Telefon:'),
-    'intraship_internet' => array('typ'=>'text','bezeichnung'=>'Versender Web:'),
-    'intraship_contact_person' => array('typ'=>'text','bezeichnung'=>'Versender Ansprechpartner:'),
-    
-
-    'intraship_account_owner' => array('typ'=>'text','bezeichnung'=>'Nachnahme Bank Inhaber:'),
-    'intraship_account_number' => array('typ'=>'text','bezeichnung'=>'Nachnahme Kontonummer:'),
-    'intraship_code' => array('typ'=>'text','bezeichnung'=>'Nachnahme BLZ:'),
-    'intraship_bank_name' => array('typ'=>'text','bezeichnung'=>'Nachnahme Bank Name:'),
-    'intraship_iban' => array('typ'=>'text','bezeichnung'=>'Nachnahme IBAN:'),
-
-    'intraship_bic' => array('typ'=>'text','bezeichnung'=>'Nachnahme BIC:'),
-    
-    'intraship_exportgrund' => array('typ'=>'text','bezeichnung'=>'Export:','info'=>'z.B. Computer Zubehör'),
-    
-    'intraship_WeightInKG' => array('typ'=>'text','bezeichnung'=>'Standard Gewicht:','info'=>'in KG'),
-    'intraship_LengthInCM' => array('typ'=>'text','bezeichnung'=>'Standard Länge:','info'=>'in cm'),
-    'intraship_WidthInCM' => array('typ'=>'text','bezeichnung'=>'Standard Breite:','info'=>'in cm'),
-    'intraship_HeightInCM' => array('typ'=>'text','bezeichnung'=>'Standard Höhe:','info'=>'in cm'),
-    'intraship_PackageType' => array('typ'=>'text','bezeichnung'=>'Standard Paket:','info'=>'z.B. PL'),    
-    
-    'log'=>array('typ'=>'checkbox','bezeichnung'=>'Logging')
-    );
-    
-  }
-  
- 
-  public function Paketmarke($doctyp, $docid, $target = '', $error = false)
-  {
-    $id = $docid;
-    $drucken = $this->app->Secure->GetPOST("drucken");
-    $anders = $this->app->Secure->GetPOST("anders");
-    $land = $this->app->Secure->GetPOST("land");
-    $tracking_again = $this->app->Secure->GetGET("tracking_again");
-
-
-    $versandmit= $this->app->Secure->GetPOST("versandmit");
-    $trackingsubmit= $this->app->Secure->GetPOST("trackingsubmit");
-    $versandmitbutton = $this->app->Secure->GetPOST("versandmitbutton");
-    $tracking= $this->app->Secure->GetPOST("tracking");
-    $trackingsubmitcancel= $this->app->Secure->GetPOST("trackingsubmitcancel");
-    $retourenlabel = $this->app->Secure->GetPOST("retourenlabel");    
-    
-    $kg= $this->app->Secure->GetPOST("kg1");
-    $name= $this->app->Secure->GetPOST("name");
-    $name2= $this->app->Secure->GetPOST("name2");
-    $name3= $this->app->Secure->GetPOST("name3");
-    $strasse= $this->app->Secure->GetPOST("strasse");
-    $hausnummer= $this->app->Secure->GetPOST("hausnummer");
-    $plz= $this->app->Secure->GetPOST("plz");
-    $ort= $this->app->Secure->GetPOST("ort");
-    $email= $this->app->Secure->GetPOST("email");
-    $phone= $this->app->Secure->GetPOST("phone");
-    $nummeraufbeleg= $this->app->Secure->GetPOST("nummeraufbeleg");
-
-    if($sid=="")
-      $sid= $this->app->Secure->GetGET("sid");
-
-    if($zusatz=="express")
-      $this->app->Tpl->Set('ZUSATZ',"Express");
-
-    if($zusatz=="export")
-      $this->app->Tpl->Set('ZUSATZ',"Export");
-
-    $id = $this->app->Secure->GetGET("id");
-    $drucken = $this->app->Secure->GetPOST("drucken");
-    $anders = $this->app->Secure->GetPOST("anders");
-    $land = $this->app->Secure->GetGET("land");
-    if($land=="") $land = $this->app->Secure->GetPOST("land");
-    $tracking_again = $this->app->Secure->GetGET("tracking_again");
-
-
-    $versandmit= $this->app->Secure->GetPOST("versandmit");
-    $trackingsubmit= $this->app->Secure->GetPOST("trackingsubmit");
-    $versandmitbutton = $this->app->Secure->GetPOST("versandmitbutton");
-  $tracking= $this->app->Secure->GetPOST("tracking");
-  $trackingsubmitcancel= $this->app->Secure->GetPOST("trackingsubmitcancel");
-  $retourenlabel = $this->app->Secure->GetPOST("retourenlabel");
-  if($typ=="DHL" || $typ=="dhl")
-    $versand = "dhl";
-  else if($typ=="Intraship")
-    $versand = "intraship";
-  else $versand = $typ;
-
-  if($sid == "versand")
-  {
-    $projekt = $this->app->DB->Select("SELECT projekt FROM versand WHERE id='$id' LIMIT 1");
-  }else{
-    $projekt = $this->app->DB->Select("SELECT projekt FROM lieferschein WHERE id='$id' LIMIT 1");
-  }
-  $intraship_weightinkg = $this->app->DB->Select("SELECT intraship_weightinkg FROM projekt WHERE id='$projekt' LIMIT 1");
-
-
-  if($trackingsubmit!="" || $trackingsubmitcancel!="")
-  {
-
-    if($sid=="versand")
-    {
-      // falche tracingnummer bei DHL da wir in der Funktion PaketmarkeDHLEmbedded sind
-      if((strlen($tracking) < 12 || strlen($tracking) > 20) && $trackingsubmitcancel=="" && ($typ=="DHL" || $typ=="Intraship"))
-      {
-        header("Location: index.php?module=versanderzeugen&action=frankieren&id=$id&land=$land&tracking_again=1");
-        exit;
-      }
-      else
-      {
-        $this->app->DB->Update("UPDATE versand SET versandunternehmen='$versand', tracking='$tracking',
-            versendet_am=NOW(),versendet_am_zeitstempel=NOW(), abgeschlossen='1',logdatei=NOW() WHERE id='$id' LIMIT 1");
-
-        $this->app->erp->VersandAbschluss($id);
-        //versand mail an kunden
-        $this->app->erp->Versandmail($id);
-
-        $weiterespaket=$this->app->Secure->GetPOST("weiterespaket");
-        $lieferscheinkopie=$this->app->Secure->GetPOST("lieferscheinkopie");
-        if($weiterespaket=="1")
-        {
-          if($lieferscheinkopie=="1") $lieferscheinkopie=0; else $lieferscheinkopie=1;
-          //$this->app->erp->LogFile("Lieferscheinkopie $lieferscheinkopie");
-          $all = $this->app->DB->SelectArr("SELECT * FROM versand WHERE id='$id' LIMIT 1");
-          $this->app->DB->Insert("INSERT INTO versand (id,adresse,rechnung,lieferschein,versandart,projekt,bearbeiter,versender,versandunternehmen,firma,
-            keinetrackingmail,gelesen,paketmarkegedruckt,papieregedruckt,weitererlieferschein)
-              VALUES ('','{$all[0]['adresse']}','{$all[0]['rechnung']}','{$all[0]['lieferschein']}','{$all[0]['versandart']}','{$all[0]['projekt']}',
-                '{$all[0]['bearbeiter']}','{$all[0]['versender']}','{$all[0]['versandunternehmen']}',
-                '{$all[0]['firma']}','{$all[0]['keinetrackingmail']}','{$all[0]['gelesen']}',0,$lieferscheinkopie,1)");
-
-          $newid = $this->app->DB->GetInsertID();
-          header("Location: index.php?module=versanderzeugen&action=einzel&id=$newid");
-        } else {
-          header("Location: index.php?module=versanderzeugen&action=offene");
-        }
-      }
-      exit;
-    } else {
-      //direkt aus dem Lieferschein
-      if($id > 0)
-      {
-        $adresse = $this->app->DB->Select("SELECT adresse FROM lieferschein WHERE id='$id' LIMIT 1");
-        $projekt = $this->app->DB->Select("SELECT projekt FROM lieferschein WHERE id='$id' LIMIT 1");
-        $kg = $this->app->Secure->GetPOST("kg1");
-        if($kg=="") {
-          $kg = $this->app->erp->VersandartMindestgewicht($id);
-        }
-        $auftrag = $this->app->DB->Select("SELECT auftragid FROM lieferschein WHERE id = '$id'");
-        $this->app->DB->Insert("INSERT INTO versand (id,versandunternehmen, tracking,
-          versendet_am,abgeschlossen,lieferschein,
-          freigegeben,firma,adresse,projekt,gewicht,paketmarkegedruckt,anzahlpakete)
-            VALUES ('','$versand','$tracking',NOW(),1,'$id',1,'".$this->app->User->GetFirma()."',
-            '$adresse','$projekt','$kg','1','1') ");
-        $versandId = $this->app->DB->GetInsertID();
-        $shop = $this->app->DB->Select("SELECT shop FROM auftrag WHERE id = '$auftrag' LIMIT 1");
-        $auftragabgleich=$this->app->DB->Select("SELECT auftragabgleich FROM shopexport WHERE id='$shop' LIMIT 1");
-
-        if($shop > 0 && $auftragabgleich=="1")
-        {
-          //$this->LogFile("Tracking gescannt");
-          $this->app->remote->RemoteUpdateAuftrag($shop,$auftrag);
-        }
-        $this->app->erp->sendPaymentStatus($versandId);
-        $this->app->Location->execute('index.php?module=lieferschein&action=paketmarke&id='.$id);
-      }
-    }
-  }
-
-
-  if($versandmitbutton!="")
-  {
-
-    if($sid=="versand")
-    {
-      $this->app->DB->Update("UPDATE versand SET versandunternehmen='$versandmit',
-          versendet_am=NOW(),versendet_am_zeitstempel=NOW(),abgeschlossen='1' WHERE id='$id' LIMIT 1");
-
-      $this->VersandAbschluss($id);
-      //versand mail an kunden
-      $this->Versandmail($id);
-
-      header("Location: index.php?module=versanderzeugen&action=offene");
-      exit;
-    }
-  }
-
-  if($sid=="versand")
-  {
-    // wenn paketmarke bereits gedruckt nur tracking scannen
-    $paketmarkegedruckt = $this->app->DB->Select("SELECT paketmarkegedruckt FROM versand WHERE id='$id' LIMIT 1");
-
-    if($paketmarkegedruckt>=1)
-      $tracking_again=1;
-  }
-    
-    if($anders!="")
-    {
-      
-    }
-    else  if(($drucken!="" || $tracking_again=="1") && !$error)
-    {
-
-
-
-      if($tracking_again!="1")
-      {
-        $kg = (float)str_replace(',','.',$kg);
-
-        $abholdatum = $this->app->Secure->GetPOST("abholdatum");
-        $retourenlabel= $this->app->Secure->GetPOST("retourenlabel");
-        if($retourenlabel)
-        {
-          $this->app->Tpl->Set('RETOURENLABEL', ' checked="checked" ');
-          $zusaetzlich['retourenlabel'] = 1;
-        }
-        if($abholdatum){
-          $this->app->Tpl->Set('ABHOLDATUM',$abholdatum);
-          $zusaetzlich['abholdatum'] = date('Y-m-d', strtotime($abholdatum));
-          $this->app->User->SetParameter("paketmarke_abholdatum",$zusaetzlich['abholdatum']);
-        }
-
-        $kg = (float)(str_replace(',','.',$kg));
-        $kg = round($kg,2);
-        $name = substr($this->app->erp->ReadyForPDF($name),0,30);
-        $name2 = $this->app->erp->ReadyForPDF($name2);
-        $name3 = $this->app->erp->ReadyForPDF($name3);
-        $strasse = $this->app->erp->ReadyForPDF($strasse);
-        $hausnummer = $this->app->erp->ReadyForPDF($hausnummer);
-        $plz = $this->app->erp->ReadyForPDF($plz);
-        $ort = $this->app->erp->ReadyForPDF(html_entity_decode($ort));
-        $land = $this->app->erp->ReadyForPDF($land);
-
-        //SetKonfigurationValue($name,$value)
-
-        $module = $this->app->Secure->GetGET("module");
-        //TODO Workarrond fuer lieferschein
-        if($module=="lieferschein")
-        {
-          $lieferschein = $id;
-        }
-        else {
-          $lieferschein = $this->app->DB->Select("SELECT lieferschein FROM versand WHERE id='$id' LIMIT 1");
-          if($lieferschein <=0) $lieferschein=$id;
-        }
-
-        $projekt = $this->app->DB->Select("SELECT projekt FROM lieferschein WHERE id='$lieferschein' LIMIT 1");
-        $lieferscheinnummer = "LS".$this->app->DB->Select("SELECT belegnr FROM lieferschein WHERE id='$lieferschein' LIMIT 1");
-
-        //pruefe ob es auftragsnummer gibt dann nehmen diese
-        $auftragid = $this->app->DB->Select("SELECT auftragid FROM lieferschein WHERE id='$lieferschein' LIMIT 1");
-        if($auftragid > 0)
-        {
-          $nummeraufbeleg = "AB".$this->app->DB->Select("SELECT belegnr FROM auftrag WHERE id='$auftragid' LIMIT 1");
-        } else {
-          $nummeraufbeleg = $lieferscheinnummer;
-        }
-
-        $rechnung = $this->app->DB->Select("SELECT id FROM rechnung WHERE lieferschein='$lieferschein' LIMIT 1");
-
-        $rechnung_data = $this->app->DB->SelectArr("SELECT * FROM rechnung WHERE id='$rechnung' LIMIT 1");
-
-        // fuer export
-        $email = $rechnung_data[0]['email']; //XXX
-        $phone = $rechnung_data[0]['telefon']; //XXX
-        $rechnungssumme = $rechnung_data[0]['soll']; //XXX
-
-        if($rechnung){
-          $artikel_positionen = $this->app->DB->SelectArr("SELECT * FROM rechnung_position WHERE rechnung='$rechnung'");
-        } else {
-          $artikel_positionen = $this->app->DB->SelectArr("SELECT * FROM lieferschein_position WHERE lieferschein='$lieferschein'");
-
-        }
-        $altersfreigabe = 0;
-        for($i=0;$i<(!empty($artikel_positionen)?count($artikel_positionen):0);$i++)
-        {
-          $artikelaltersfreigabe = (int)$this->app->DB->Select("SELECT altersfreigabe FROM artikel WHERE id = '".$artikel_positionen[$i]['artikel']."' LIMIT 1");
-          if($artikelaltersfreigabe > $altersfreigabe)$altersfreigabe = $artikelaltersfreigabe;
-          //$lagerartikel = $this->app->DB->Select("SELECT lagerartikel FROM artikel WHERE id='".$artikel_positionen[$i]['artikel']."' LIMIT 1");
-
-          //if($lagerartikel=="1")
-          {
-            if($artikel_positionen[$i]['waehrung']=="") {
-              $artikel_positionen[$i]['waehrung']="EUR";
-            }
-            $gewicht = $this->app->DB->Select("SELECT gewicht FROM artikel WHERE id='".$artikel_positionen[$i]['artikel']."' LIMIT 1");
-            $porto = $this->app->DB->Select("SELECT porto FROM artikel WHERE id='".$artikel_positionen[$i]['artikel']."' LIMIT 1");
-
-            if($gewicht <=0) $gewicht=0;
-
-            //if($gewicht > 0) $gewicht = $artikel_positionen[$i]['menge']*$gewicht;
-            //else $gewicht = 1.1*$artikel_positionen[$i]['menge'];
-
-            if($porto!="1")
-            {
-              $artikel[] = array( 'description'=>substr($artikel_positionen[$i]['bezeichnung'],0,40),
-                'countrycode'=>'DE',
-                'commodity_code'=>'95061110', // zoll nummer?
-                'amount'=>round($artikel_positionen[$i]['menge']),
-                'netweightinkg'=>$gewicht,
-                'grossweightinkg'=>$gewicht,
-                'value'=>$artikel_positionen[$i]['preis'],
-                'currency'=>$artikel_positionen[$i]['waehrung']);
-            }
-          }
-        }
-
-        $data = $this->einstellungen;
-
-        if($phone=="") $phone=$data['intraship_phone'];
-
-
-
-        if($land!=$this->app->erp->Firmendaten("land"))
-        {
-          if(!empty($data['partnerid_welt']) && !empty($data['partnerid_welt']))$this->einstellungen['partnerid'] = $data['partnerid_welt'];
-        }
-
-        if(isset($data['intraship_retourenaccount']) && $data['intraship_retourenaccount'])$einstellungen['intraship_retourenaccount'] = $data['intraship_retourenaccount'];
-
-        // your company info
-        $info = array(
-            'company_name'    => $data['intraship_company_name'],
-            'street_name'     => $data['intraship_street_name'],
-            'street_number'   => $data['intraship_street_number'],
-            'zip'             => $data['intraship_zip'],
-            'country'         => $data['intraship_country'],
-            'city'            => $data['intraship_city'],
-            'email'           => $data['intraship_email'],
-            'phone'           => $data['intraship_phone'],
-            'internet'        => $data['intraship_internet'],
-            'contact_person'  => $data['intraship_contact_person'],
-            'export_reason'  => $data['intraship_exportgrund']
-            );
-
-        // receiver details
-        $customer_details = array(
-            'name1'    => $name,
-            'name2'     => $name2,
-            'c/o'           => $name3,
-            'name3'           => $name3,
-            'street_name'   => $strasse,
-            'street_number' => $hausnummer,
-            //    'country'       => 'germany',
-            'country_code'       => $land,
-            'zip'           => $plz,
-            'city'          => $ort,
-            'email'          => $email,
-            'phone'          => $phone,
-            'ordernumber'   => $nummeraufbeleg,
-            'weight'        => $kg,
-            'amount'        => str_replace(",",".",$rechnungssumme),
-            'currency'        => 'EUR'
-            );
-        if(!is_null($zusatz) && isset($zusatz['abholdatum']))$customer_details['abholdatum'] = $zusatz['abholdatum'];
-        if(!is_null($zusatz) && isset($zusatz['retourenlabel']))$customer_details['intraship_retourenlabel'] = $zusatz['retourenlabel'];
-        if($altersfreigabe > 0)$customer_details['altersfreigabe'] = $altersfreigabe;
-        //$dhl = new DHLBusinessShipment($einstellungen, $info);
-
-        $shipment_details['WeightInKG'] = $data['intraship_WeightInKG'];
-        $shipment_details['LengthInCM'] = $data['intraship_LengthInCM'];
-        $shipment_details['WidthInCM'] = $data['intraship_WidthInCM'];
-        $shipment_details['HeightInCM'] = $data['intraship_HeightInCM'];
-        $shipment_details['PackageType'] = $data['intraship_PackageType'];
-
-        if($data['intraship_note']=="") $data['intraship_note'] = $rechnungsnummer;
-
-        if($land==$this->app->erp->Firmendaten("land"))
-        {
-          if($nachnahme && $betrag > 0)
-          {
-            $bank_details = array(
-                'account_owner' => $data['intraship_account_owner'],
-                'account_number' => $data['intraship_account_number'],
-                'bank_code' => $data['intraship_bank_code'],
-                'bank_name' => $data['intraship_bank_name'],
-                'note' => $data['intraship_note'],
-                'iban' => $data['intraship_iban'],
-                'bic' => $data['intraship_bic']
-                );
-
-            $cod_details = array(
-                'amount'=>str_replace(",",".",$betrag),
-                'currency'=>'EUR'
-                );
-
-            $response = $this->createNationalShipment($customer_details,$shipment_details,$bank_details,$cod_details,$rechnungsnummer);
-          } else {
-            //$customer_details['ordernumber']="";
-            $response = $this->createNationalShipment($customer_details,$shipment_details);
-          }
-        } else {
-          $customer_details['EU'] = $this->app->erp->IstEU($land)?1:0;
-          $response = $this->createWeltShipment($customer_details,null,$bank_details,$cod_details,$artikel);
-          if($response)
-          {
-          // Zoll Papiere
-            //$dhl = new DHLBusinessShipment($einstellungen, $info);
-            $response_export = $this->GetExportDocDD($response['shipment_number']);
-          }else{
-            $dump = $this->app->erp->VarAsString($this->errors);
-            $this->app->erp->Protokoll("Fehler Intraship API beim Erstellen Label fuer Versand $id LS $lieferschein",$dump);
-          }
-        }
-  
-        $data['intraship_drucker'] = $this->paketmarke_drucker;
-        $data['druckerlogistikstufe2'] = $this->export_drucker;
-        
-        if(!$data['intraship_drucker'])
-        {
-          if($this->app->erp->GetStandardPaketmarkendrucker()>0)
-            $data['intraship_drucker'] = $this->app->erp->GetStandardPaketmarkendrucker();
-        }
-
-        if(!$data['druckerlogistikstufe2'])
-        {
-          if($this->app->erp->GetInstrashipExport($projekt)>0)
-            $data['druckerlogistikstufe2'] = $this->app->erp->GetInstrashipExport($projekt);
-        }
-
-
-
-        if($response)
-        {
-          //$response['label_url']
-          //$response['shipment_number']
-          $tmppdf = $this->app->erp->DownloadFile($response['label_url'],"Intraship_Versand_".$id."_","pdf");
-          $this->app->erp->Protokoll("Erfolg Paketmarke Drucker ".$data['intraship_drucker']," Datei: $tmppdf URL: ".$response['label_url']);
-          $this->app->printer->Drucken($data['intraship_drucker'],$tmppdf);
-          unlink($tmppdf);
-        } else {
-          $dump = $this->app->erp->VarAsString($this->errors);
-          $this->app->erp->Protokoll("Fehler Intraship API beim Erstellen Label fuer Versand $id LS $lieferschein",$dump);
-        }
-
-        if($response_export)
-        {
-          $tmppdf = $this->app->erp->DownloadFile($response_export['export_url'],"Export_Intraship_Versand_".$id."_");
-          $this->app->erp->Protokoll("Erfolg Export Dokumente Drucker ".$data['druckerlogistikstufe2']," Datei: $tmppdf URL: ".$response_export['export_url']);
-          $this->app->printer->Drucken($data['druckerlogistikstufe2'],$tmppdf);
-          unlink($tmppdf);
-        } else {
-          $dump = $this->app->erp->VarAsString($this->errors);
-          $this->app->erp->Protokoll("Fehler Intraship Export Dokument API beim Erstellen fuer Versand $id LS $lieferschein",$dump);
-        }
-        
-        if($response)return false;
-        return $this->errors;
-        
-      }
-      
-      
-      if($this->app->Secure->GetPOST('drucken') || $this->app->Secure->GetPOST('anders'))
-      {
-        
-        
-      }else{
-        if(empty($this->Eintellungen['retourenaccount']) || !$this->Eintellungen['retourenaccount'])            
-        {
-          $this->app->Tpl->Add('VORRETOURENLABEL', '<!--');
-          $this->app->Tpl->Add('NACHRETOURENLABEL', '-->');
-        }
-        if(isset($this->Eintellungen['retourenlabel']) && $this->Eintellungen['retourenlabel'])$this->app->Tpl->Add('RETOURENLABEL',' checked="checked" '); 
-      }
-    }
-   
-    //$this->info = $customer_info;
-    if($target)$this->app->Tpl->Parse($target,'versandarten_intraship.tpl');
-  }
-  
-  public function Export($daten)
-  {
-    
-  }
-  
-  function Trackinglink($tracking, &$notsend, &$link, &$rawlink)
-  {
-    $notsend = 0;
-    $rawlink = 'http://nolp.dhl.de/nextt-online-public/set_identcodes.do?lang=de&idc='.$tracking;
-    $link = 'DHL Versand: '.$tracking.' ('.$rawlink.')';
-    return true;
-  }
-
-  private function log($message) {
-
-    if (isset($this->einstellungen['log'])) {
-
-      if (is_array($message) || is_object($message)) {
-
-        error_log(print_r($message, true));
-
-      } else {
-
-        error_log($message);
-
-      }
-
-    }
-
-  }
-
-  function buildClient($retoure, $altersfreigabe = false) {
-
-    $header = $this->buildAuthHeader();
-
-    $location = self::PRODUCTION_URL;
-    //$location = self::SANDBOX_URL;
-
-    $auth_params = array(
-        'login' => $this->einstellungen['api_user'],
-        'password' => $this->einstellungen['api_password'],
-        'location'  => $location,
-        'trace' => 1,
-        'connection_timeout' => 30
-        );
-
-    $this->log($auth_params);
-    try {
-      $this->client = new SoapClient($altersfreigabe?self::API_URL22:($retoure?self::API_URL2:self::API_URL), $auth_params);
-    } catch(SoapFault $exception)
-    {
-      die("Verbindungsfehler: ".$exception->getMessage());
-      $this->errors[] = "Verbindungsfehler: ".$exception->getMessage();
-      return;
-    }
-    try {
-      $this->client->__setSoapHeaders($header);
-    } catch(SoapFault $exception)
-    {
-      die("Verbindungsfehler: ".$exception->getMessage());
-      $this->errors[] = "Verbindungsfehler: ".$exception->getMessage();
-      return;
-    }
-
-    $this->log($this->client);
-
-  }
-
-  function createNationalShipment($customer_details, $shipment_details = null, $bank_details = null, $cod_details = null) {  
-    $api2 = false;
-    $api22 = isset($customer_details['altersfreigabe']) && $customer_details['altersfreigabe'];
-    if(isset($customer_details['intraship_retourenlabel']) && $customer_details['intraship_retourenlabel'] && isset($this->einstellungen['intraship_retourenaccount']) && $this->einstellungen['intraship_retourenaccount'])$api2 = true;
-
-    if(isset($this->einstellungen['leitcodierung']) && $this->einstellungen['leitcodierung'])$api22 = true;
-    
-    $this->buildClient($api2, $api22);
-
-    $shipment = array();
-
-    // Version
-    $shipment['Version']  = array('majorRelease' => '1', 'minorRelease' => '0');
-    if(isset($customer_details['intraship_retourenlabel']) && $customer_details['intraship_retourenlabel'] && isset($this->einstellungen['intraship_retourenaccount']) && $this->einstellungen['intraship_retourenaccount'])
-    {
-      $shipment['Version']['minorRelease'] = '1';
-    }
-    if($api22)
-    {
-      $shipment['Version']  = array('majorRelease' => '2', 'minorRelease' => '0');
-    }
-
-    if($customer_details['country_code']=="" || $customer_details['country_code']=="DE") 
-    { 
-      $customer_details['country_code']="DE";
-      $customer_details['country_zip']="germany";
-    } else if ($customer_details['country_code']=="UK"){
-      $customer_details['country_zip']="england";
-    } else {
-      $customer_details['country_zip']="other";
-    }
-
-    // Order
-    $shipment['ShipmentOrder'] = array();
-
-    // Fixme
-    if($api22)
-    {
-      $shipment['ShipmentOrder']['sequenceNumber']  = '01';
-    }else{
-      $shipment['ShipmentOrder']['SequenceNumber']  = '1';
-    }
-    // Shipment
-    $s = array();
-    if($api22)
-    {
-      $s['product'] = "V01PAK";
-    }else{
-      $s['ProductCode']               = 'EPN';
-    }
-    if(isset($customer_details['intraship_retourenlabel']) && $customer_details['intraship_retourenlabel'] && isset($this->einstellungen['intraship_retourenaccount']) && $this->einstellungen['intraship_retourenaccount'])
-    {
-      $s['ReturnShipmentBillingNumber'] = $this->einstellungen['intraship_retourenaccount'];
-    }
-
-    if($api22)
-    {
-      if(!empty($customer_details['abholdatum']) && $customer_details['abholdatum']!="0000-00-00")
-        $s['shipmentDate']              = $customer_details['abholdatum'];
-      else
-        $s['shipmentDate']              = date('Y-m-d');
-    }else{    
-      if(!empty($customer_details['abholdatum']) && $customer_details['abholdatum']!="0000-00-00")
-        $s['ShipmentDate']              = $customer_details['abholdatum'];
-      else
-        $s['ShipmentDate']              = date('Y-m-d');
-    }
-
-    if($api22)
-    {
-      $s['accountNumber'] = $this->einstellungen['ekp'].(strlen($this->einstellungen['partnerid'] <= 2)?$this->einstellungen['partnerid']."01":$this->einstellungen['partnerid']);
-      if ($shipment_details == null) {
-        $s['ShipmentItem']  = array();
-        $s['ShipmentItem']['weightInKG'] = '5';
-        $s['ShipmentItem']['lengthInCM'] = '50';
-        $s['ShipmentItem']['widthInCM']  = '50';
-        $s['ShipmentItem']['heightInCM'] = '50';
-      } else {
-        $s['ShipmentItem']  = array();
-        $s['ShipmentItem']['weightInKG'] = $shipment_details['WeightInKG'];
-        $s['ShipmentItem']['lengthInCM'] = $shipment_details['LengthInCM'];
-        $s['ShipmentItem']['widthInCM']  = $shipment_details['WidthInCM'];
-        $s['ShipmentItem']['heightInCM'] = $shipment_details['HeightInCM'];
-      }
-   
-      // Falls ein Gewicht angegeben worden ist
-      if($customer_details['weight']!="")
-        $s['ShipmentItem']['weightInKG'] = $customer_details['weight'];
-    
-    
-    }else{
-      $s['EKP']                       = $this->einstellungen['ekp'];
-
-      $s['Attendance']                = array();
-      $s['Attendance']['partnerID']   = substr($this->einstellungen['partnerid'],0,2);
-      
-      
-      if ($shipment_details == null) {
-        $s['ShipmentItem']  = array();
-        $s['ShipmentItem']['WeightInKG'] = '5';
-        $s['ShipmentItem']['LengthInCM'] = '50';
-        $s['ShipmentItem']['WidthInCM']  = '50';
-        $s['ShipmentItem']['HeightInCM'] = '50';
-        // FIXME: What is this
-        $s['ShipmentItem']['PackageType'] = 'PL';
-      } else {
-        $s['ShipmentItem']  = array();
-        $s['ShipmentItem']['WeightInKG'] = $shipment_details['WeightInKG'];
-        $s['ShipmentItem']['LengthInCM'] = $shipment_details['LengthInCM'];
-        $s['ShipmentItem']['WidthInCM']  = $shipment_details['WidthInCM'];
-        $s['ShipmentItem']['HeightInCM'] = $shipment_details['HeightInCM'];
-        // FIXME: What is this
-        $s['ShipmentItem']['PackageType'] = $shipment_details['PackageType'];
-      }
-   
-      // Falls ein Gewicht angegeben worden ist
-      if($customer_details['weight']!="")
-        $s['ShipmentItem']['WeightInKG'] = $customer_details['weight'];
-
-    }
-
-
-    if($bank_details != null)
-    {
-      $s['BankData']  = array();
-      $s['BankData']['accountOwner'] = $bank_details['account_owner'];
-      $s['BankData']['accountNumber'] = $bank_details['account_number'];
-      $s['BankData']['bankCode'] = $bank_details['bank_code'];
-      $s['BankData']['bankName'] = $bank_details['bank_name'];
-      $s['BankData']['iban'] = $bank_details['iban'];
-      $s['BankData']['bic'] = $bank_details['bic'];
-      $s['BankData']['note'] = $bank_details['note'];
-    } 
-
-    if($cod_details != null)
-    {
-      //$s['Service']  = array();
-      //$s['Service']['ServiceGroupOther']  = array();
-      $s['Service']['ServiceGroupOther']['COD']  = array();
-      $s['Service']['ServiceGroupOther']['COD']['CODAmount'] = $cod_details['amount'];
-      $s['Service']['ServiceGroupOther']['COD']['CODCurrency'] = $cod_details['currency'];
-    }
-
-    // Auftragnummer auf Label
-    if($api22)
-    {
-      $s['customerReference']=$customer_details['ordernumber'];
-      if($customer_details['altersfreigabe'] >= 16)
-      {
-        $s['Service']['VisualCheckOfAge'] = array();
-        $s['Service']['VisualCheckOfAge']['active'] = 1;
-        $s['Service']['VisualCheckOfAge']['type'] = $customer_details['altersfreigabe'] > 16?'A18':'A16';
-      }
-      
-    }else{
-      $s['CustomerReference']=$customer_details['ordernumber'];
-    }
-
-    $shipment['ShipmentOrder']['Shipment']['ShipmentDetails'] = $s;
-
-    //$shipment['ShipmentOrder']['Shipment']['ShipmentDetails'] = $s;
-    $shipper = array();
-    if($api22)
-    {
-      $shipper['Name'] = array();
-      $shipper['Name']['name1'] = $this->info['company_name'];
-    }else{
-      $shipper['Company'] = array();
-      $shipper['Company']['Company'] = array();
-      $shipper['Company']['Company']['name1'] = $this->info['company_name'];
-    }
-    $shipper['Address'] = array();
-    $shipper['Address']['streetName']     = $this->info['street_name'];
-    $shipper['Address']['streetNumber']   = $this->info['street_number'];
-    if($api22)
-    {
-      $shipper['Address']['zip']            = $this->info['zip'];
-    }else{
-      $shipper['Address']['Zip']            = array();
-      $shipper['Address']['Zip'][strtolower($this->info['country'])]  = $this->info['zip'];
-    }
-    $shipper['Address']['city']           = $this->info['city'];
-
-    $shipper['Address']['Origin'] = array('countryISOCode' => 'DE');
-
-    $shipper['Communication']                   = array();
-    if (preg_match("/^( [a-zA-Z0-9] )+( [a-zA-Z0-9._-] )*@( [a-zA-Z0-9_-] )+( [a-zA-Z0-9._-] +)+$/" , $this->info['email'])) {
-      $shipper['Communication']['email']          = $this->info['email'];
-    }
-    $shipper['Communication']['phone']          = $this->info['phone'];
-    $shipper['Communication']['internet']       = $this->info['internet'];
-    $shipper['Communication']['contactPerson']  = $this->info['contact_person'];
-
-
-    $shipment['ShipmentOrder']['Shipment']['Shipper'] = $shipper;
-
-    if($api22)
-    {
-      $receiver = array();
-      $receiver['name1'] = $customer_details['name1'];
-      if($customer_details['name2']!="")
-        $receiver['name2'] = $customer_details['name2'];
-      if($customer_details['name3']!="")
-        $receiver['name3'] = $customer_details['name3'];
-
-
-
-
-      $receiver['Address'] = array();
-      if($customer_details['name2']!="")
-        $receiver['Address']['addressAddition'] = $customer_details['name2'];
-      $receiver['Address']['streetName']     = $customer_details['street_name'];
-      $receiver['Address']['streetNumber']   = $customer_details['street_number'];
-      $receiver['Address']['zip']            = $customer_details['zip'];
-      $receiver['Address']['city']           = $customer_details['city'];
-      $receiver['Communication']                   = array();
-
-      if($customer_details['c/o']!="")
-        $receiver['Communication']['contactPerson']  = $customer_details['c/o'];
-
-      $receiver['Address']['Origin'] = array('countryISOCode' => $customer_details['country_code']);
-
-      $shipment['ShipmentOrder']['Shipment']['Receiver'] = $receiver;
-        
-      
-    }else{
-      $receiver = array();
-
-      $receiver['Company'] = array();
-
-      /*
-         $receiver['Company']['Person']  = array();
-         $receiver['Company']['Person']['firstname'] = $customer_details['first_name'];
-         $receiver['Company']['Person']['lastname'] = $customer_details['last_name'];
-       */
-
-      $receiver['Company']['Company']  = array();
-      $receiver['Company']['Company']['name1'] = $customer_details['name1'];
-      $receiver['Company']['Company']['name2'] = $customer_details['name2'];
-
-
-      $receiver['Address'] = array();
-      $receiver['Address']['streetName']     = $customer_details['street_name'];
-      $receiver['Address']['streetNumber']   = $customer_details['street_number'];
-      $receiver['Address']['Zip']            = array();
-      $receiver['Address']['Zip'][strtolower($customer_details['country_zip'])]  = $customer_details['zip'];
-      $receiver['Address']['city']           = $customer_details['city'];
-      $receiver['Communication']                   = array();
-      $receiver['Communication']['contactPerson']  = $customer_details['c/o'];
-
-      $receiver['Address']['Origin'] = array('countryISOCode' => $customer_details['country_code']);
-
-
-      $shipment['ShipmentOrder']['Shipment']['Receiver'] = $receiver;
-    }
-    if(isset($customer_details['intraship_retourenlabel']) && $customer_details['intraship_retourenlabel'] && isset($this->einstellungen['intraship_retourenaccount']) && $this->einstellungen['intraship_retourenaccount'])
-    {
-      $ReturnReceiver = array();
-      $ReturnReceiver['Company'] = array();
-      $ReturnReceiver['Company']['Company'] = array();
-      $ReturnReceiver['Company']['Company']['name1'] = $this->info['company_name'];
-
-      $ReturnReceiver['Address'] = array();
-      $ReturnReceiver['Address']['streetName']     = $this->info['street_name'];
-      $ReturnReceiver['Address']['streetNumber']   = $this->info['street_number'];
-      if($api22)
-      {
-        $ReturnReceiver['Address']['zip']            = $this->info['zip'];
-      }else{
-        $ReturnReceiver['Address']['Zip']            = array();
-        $ReturnReceiver['Address']['Zip'][strtolower($this->info['country'])]  = $this->info['zip'];
-      }
-      $ReturnReceiver['Address']['city']           = $this->info['city'];
-
-      $ReturnReceiver['Address']['Origin'] = array('countryISOCode' => 'DE');
-
-      $ReturnReceiver['Communication']                   = array();
-      if (preg_match("/^( [a-zA-Z0-9] )+( [a-zA-Z0-9._-] )*@( [a-zA-Z0-9_-] )+( [a-zA-Z0-9._-] +)+$/" , $this->info['email'])) {
-        $shipper['Communication']['email']          = $this->info['email'];
-      }
-      $ReturnReceiver['Communication']['phone']          = $this->info['phone'];
-      $ReturnReceiver['Communication']['internet']       = $this->info['internet'];
-      $ReturnReceiver['Communication']['contactPerson']  = $this->info['contact_person'];
-
-
-      $shipment['ShipmentOrder']['Shipment']['ReturnReceiver'] = $ReturnReceiver;
-    }
-    try {      
-      if($api22)
-      {
-        $response = $this->client->createShipmentOrder($shipment);
-      }
-      else{
-        $response = $this->client->CreateShipmentDD($shipment);
-      }
-     
-    } catch(SoapFault $exception)
-    {
-      if(trim($exception->getMessage()) == 'Authorization Required')
-      {
-        $this->errors[] = 'Fehlerhafte Intraship Zugangsdaten';
-        return false;
-      }
-      $this->errors[] = "Fehler von Intraship: ".$exception->getMessage();
-      return;
-    }
-    if (is_soap_fault($response) || (isset($response->status) && $response->status->StatusCode != 0 || isset($response->Status) && $response->Status->statusCode != 0)) {
-      $this->errors[] = "<b>Fehlermeldung von DHL:</b>";
-
-      if (is_soap_fault($response)) {
-
-        $this->errors[] = $response->faultstring;
-
-      } else {
-
-        $this->errors[] = isset($response->status)?$response->status->StatusMessage:$response->Status->statusMessage;
-
-      }
-      if($response->CreationState->StatusMessage)
-      {
-        foreach($response->CreationState->StatusMessage as $v)
-        {
-          $found = false;
-          if($this->errors && is_array($this->errors))
-          {
-            foreach($this->errors as $err)
-            {
-              if($err == $v)$found = true;
-            }
-          }
-          if(!$found)$this->errors[] = $v;
-        }
-      }
-      return false;
-    } else {
-      $r = array();
-      if($api22)
-      {
-        $r['shipment_number']   = (String) $response->CreationState->LabelData->shipmentNumber;
-        $r['piece_number']      = (String) $response->CreationState->LabelData->licensePlate;
-        $r['label_url']         = (String) $response->CreationState->LabelData->labelUrl;
-        $r['gesamt'] = $response;
-      }else{      
-        $r['shipment_number']   = (String) $response->CreationState->ShipmentNumber->shipmentNumber;
-        $r['piece_number']      = (String) $response->CreationState->PieceInformation->PieceNumber->licensePlate;
-        $r['label_url']         = (String) $response->CreationState->Labelurl;
-      }
-      return $r;
-    }
-
-  }
-
-
-  function createWeltShipment($customer_details, $shipment_details = null, $bank_details = null, $cod_details = null,$artikel=null) {
-    $api2 = false;
-    $api22 = isset($customer_details['altersfreigabe']) && $customer_details['altersfreigabe'];
-    //if(isset($customer_details['intraship_retourenlabel']) && $customer_details['intraship_retourenlabel'] && isset($this->einstellungen['intraship_retourenaccount']) && $this->einstellungen['intraship_retourenaccount'])$api2 = true;
-    $api22 = false;
-    $this->buildClient($api2);
-
-    $shipment = array();
-
-    if($customer_details['country_code']=="DE")
-    {
-      $customer_details['country']="germany";
-    } else if ($customer_details['country_code']=="UK")
-    {                      
-      $customer_details['country']="england";
-    } else {
-      $customer_details['country']="other";
-    } 
-
-    // Version
-    if($api22)
-    {
-      $shipment['Version']  = array('majorRelease' => '2', 'minorRelease' => '0');
-    }else{
-      $shipment['Version']  = array('majorRelease' => '1', 'minorRelease' => '0');
-      if(isset($customer_details['intraship_retourenlabel']) && $customer_details['intraship_retourenlabel'] && isset($this->einstellungen['intraship_retourenaccount']) && $this->einstellungen['intraship_retourenaccount'])
-      {
-        $shipment['Version']['minorRelease'] = '1';
-      }
-    }
-
-    // Order
-    $shipment['ShipmentOrder'] = array();
-    $s = array();
-    // Fixme
-    if($api22)
-    {
-      $shipment['ShipmentOrder']['sequenceNumber']  = '01';
-      if(!empty($customer_details['abholdatum']) && $customer_details['abholdatum']!="0000-00-00")
-        $s['shipmentDate']              = $customer_details['abholdatum'];
-      else
-        $s['shipmentDate']              = date('Y-m-d');
-      $s['product'] = isset($customer_details['EU'])&&$customer_details['EU']?"V54EPAK": "V53WPAK";
-      $s['accountNumber'] =$this->einstellungen['ekp'].$this->einstellungen['partnerid']."01";
-    }else{
-      $shipment['ShipmentOrder']['SequenceNumber']  = '1';
-      $s['ProductCode']               = 'BPI';
-      if(!empty($customer_details['abholdatum']) && $customer_details['abholdatum']!="0000-00-00")
-        $s['ShipmentDate']              = $customer_details['abholdatum'];
-      else
-        $s['ShipmentDate']              = date('Y-m-d');
-      $s['EKP']                       = $this->einstellungen['ekp'];
-
-      $s['Attendance']                = array();
-      $s['Attendance']['partnerID']   = $this->einstellungen['partnerid'];
-    }
-    
-
-
-    if(isset($customer_details['intraship_retourenlabel']) && $customer_details['intraship_retourenlabel'] && isset($this->einstellungen['intraship_retourenaccount']) && $this->einstellungen['intraship_retourenaccount'])
-    {
-      $s['ReturnShipmentBillingNumber'] = $this->einstellungen['intraship_retourenaccount'];
-    }
-    
-    if($api22)
-    {
-      if ($shipment_details == null) {
-        $s['ShipmentItem']  = array();
-        $s['ShipmentItem']['weightInKG'] = '3';
-        $s['ShipmentItem']['lengthInCM'] = '50';
-        $s['ShipmentItem']['widthInCM']  = '30';
-        $s['ShipmentItem']['heightInCM'] = '15';
-      }      
-    }else{
-      if ($shipment_details == null) {
-        $s['ShipmentItem']  = array();
-        $s['ShipmentItem']['WeightInKG'] = '3';
-        $s['ShipmentItem']['LengthInCM'] = '50';
-        $s['ShipmentItem']['WidthInCM']  = '30';
-        $s['ShipmentItem']['HeightInCM'] = '15';
-        // FIXME: What is this
-        $s['ShipmentItem']['PackageType'] = 'PK';
-      }
-
-      // Falls ein Gewicht angegeben worden ist
-      if($customer_details['weight']!="")
-        $s['ShipmentItem']['WeightInKG'] = $customer_details['weight'];
-    }
-    //$s['Service']['ServiceGroupBusinessPackInternational']['Economy'] = 'true';
-    $s['Service']['ServiceGroupBusinessPackInternational']['Premium'] = 'true';
-
-    if($bank_details != null)
-    {
-      $s['BankData']  = array();
-      $s['BankData']['accountOwner'] = $bank_details['account_owner'];
-      $s['BankData']['accountNumber'] = $bank_details['account_number'];
-      $s['BankData']['bankCode'] = $bank_details['bank_code'];
-      $s['BankData']['bankName'] = $bank_details['bank_name'];
-      $s['BankData']['iban'] = $bank_details['iban'];
-      $s['BankData']['bic'] = $bank_details['bic'];
-      $s['BankData']['note'] = $bank_details['note'];
-    }
-
-
-
-    if($cod_details != null)
-    {
-      //$s['Service']  = array();
-      //$s['Service']['ServiceGroupOther']  = array();
-      $s['Service']['ServiceGroupOther']['COD']  = array();
-      $s['Service']['ServiceGroupOther']['COD']['CODAmount'] = $cod_details['amount'];
-      $s['Service']['ServiceGroupOther']['COD']['CODCurrency'] = $cod_details['currency'];
-    }
-
-    // Auftragnummer auf Label
-    if($api22)
-    {
-      $s['customerReference']=$customer_details['ordernumber'];
-      if($customer_details['altersfreigabe'] >= 16)
-      {
-        $s['Service']['VisualCheckOfAge'] = array();
-        $s['Service']['VisualCheckOfAge']['active'] = 1;
-        $s['Service']['VisualCheckOfAge']['type'] = $customer_details['altersfreigabe'] > 16?'A18':'A16';
-      }     
-    }else{
-      $s['CustomerReference']=$customer_details['ordernumber'];
-    }
-    $shipment['ShipmentOrder']['Shipment']['ShipmentDetails'] = $s;
-
-    //$shipment['ShipmentOrder']['Shipment']['ShipmentDetails'] = $s;
-
-
-    $shipper = array();
-    $shipper['Company'] = array();
-    $shipper['Company']['Company'] = array();
-    $shipper['Company']['Company']['name1'] = $this->info['company_name'];
-
-    $shipper['Address'] = array();
-    $shipper['Address']['streetName']     = $this->info['street_name'];
-    $shipper['Address']['streetNumber']   = $this->info['street_number'];
-    if($api22)
-    {
-      $shipper['Address']['zip']            = $this->info['zip'];
-    }else{
-      $shipper['Address']['Zip']            = array();
-
-      $shipper['Address']['Zip'][strtolower($this->info['country'])]  = $this->info['zip'];
-    }
-    $shipper['Address']['city']           = $this->info['city'];
-
-    $shipper['Address']['Origin'] = array('countryISOCode' => 'DE');
-
-
-
-    $shipper['Communication']                   = array();
-    if (preg_match("/^( [a-zA-Z0-9] )+( [a-zA-Z0-9._-] )*@( [a-zA-Z0-9_-] )+( [a-zA-Z0-9._-] +)+$/" , $this->info['email'])) {
-      $shipper['Communication']['email']          = $this->info['email'];
-    }
-    if(empty($this->info['phone']))$this->info['phone'] = '0';
-    $this->info['phone'] = str_replace('+','00',trim($this->info['phone']));
-    $this->info['phone'] = preg_replace('![^0-9]!', '', $this->info['phone']); 
-    if(empty($this->info['phone']))$this->info['phone'] = '0';
-    
-    $shipper['Communication']['phone']          = $this->info['phone'];
-    $shipper['Communication']['internet']       = $this->info['internet'];
-
-    $shipper['Communication']['contactPerson']  = $this->info['contact_person'];
-
-
-    $shipment['ShipmentOrder']['Shipment']['Shipper'] = $shipper;
-
-    $receiver = array();
-
-
-
-    $receiver['Company']['Company']  = array();
-    $receiver['Company']['Company']['name1'] = $customer_details['name1'];
-    if($customer_details['name2'])$receiver['Company']['Company']['name2'] = $customer_details['name2'];
-
-    if($customer_details['name2']!="")
-      $tmp_name = explode(' ',$customer_details['name2'],2);
-    else
-      $tmp_name = explode(' ',$customer_details['name1'],2);
-
-    if(isset($tmp_name[2]) && $tmp_name[2]){
-      $receiver['Company']['Person']  = array();
-      $receiver['Company']['Person']['firstname'] = $tmp_name[0];
-      $receiver['Company']['Person']['lastname'] = $tmp_name[1];
-    }
-    /*
-       $receiver['Company'] = array();
-       $receiver['Company']['Person']  = array();
-       $receiver['Company']['Person']['firstname'] = $customer_details['first_name'];
-       $receiver['Company']['Person']['lastname'] = $customer_details['last_name'];
-     */
-    $receiver['Address'] = array();
-    $receiver['Address']['streetName']     = $customer_details['street_name'];
-    $receiver['Address']['streetNumber']   = $customer_details['street_number'];
-    if($api22)
-    {
-      $receiver['Address']['zip']            = $customer_details['zip'];
-    }else{
-      $receiver['Address']['Zip']            = array();
-      $receiver['Address']['Zip'][strtolower($customer_details['country'])]  = $customer_details['zip'];
-    }
-    $receiver['Address']['city']           = $customer_details['city'];
-    $receiver['Communication']                   = array();
-    if (preg_match("/^( [a-zA-Z0-9] )+( [a-zA-Z0-9._-] )*@( [a-zA-Z0-9_-] )+( [a-zA-Z0-9._-] +)+$/" , $customer_details['email'])) {
-      $receiver['Communication']['email']          = $customer_details['email'];
-    }
-    
-    if(empty($customer_details['phone']))$customer_details['phone'] = '0';
-    $customer_details['phone'] = str_replace('+','00',trim($customer_details['phone']));
-    $customer_details['phone'] = preg_replace('![^0-9]!', '', $customer_details['phone']); 
-    if(empty($customer_details['phone']))$customer_details['phone'] = '0';
-    $receiver['Communication']['phone']          = $customer_details['phone'];
-
-    if($customer_details['c/o']=="") $customer_details['c/o'] = $customer_details['name2'];
-    if($customer_details['c/o']=="") $customer_details['c/o'] = $customer_details['name1'];
-    $receiver['Communication']['contactPerson']  = $customer_details['c/o'];
-
-    $receiver['Address']['Origin'] = array('countryISOCode' => $customer_details['country_code']);
-
-    $shipment['ShipmentOrder']['Shipment']['Receiver'] = $receiver;
-
-    
-    if(isset($customer_details['intraship_retourenlabel']) && $customer_details['intraship_retourenlabel'] && isset($this->einstellungen['intraship_retourenaccount']) && $this->einstellungen['intraship_retourenaccount'])
-    {
-      $ReturnReceiver = array();
-      $ReturnReceiver['Company'] = array();
-      $ReturnReceiver['Company']['Company'] = array();
-      $ReturnReceiver['Company']['Company']['name1'] = $this->info['company_name'];
-
-      $ReturnReceiver['Address'] = array();
-      $ReturnReceiver['Address']['streetName']     = $this->info['street_name'];
-      $ReturnReceiver['Address']['streetNumber']   = $this->info['street_number'];
-      if($api22)
-      {
-        $ReturnReceiver['Address']['zip']            = $this->info['zip'];
-      }else{
-        $ReturnReceiver['Address']['Zip']            = array();
-        $ReturnReceiver['Address']['Zip'][strtolower($this->info['country'])]  = $this->info['zip'];
-      }
-      $ReturnReceiver['Address']['city']           = $this->info['city'];
-
-      $ReturnReceiver['Address']['Origin'] = array('countryISOCode' => $customer_details['country_code']);
-
-      $ReturnReceiver['Communication']                   = array();
-      if (preg_match("/^( [a-zA-Z0-9] )+( [a-zA-Z0-9._-] )*@( [a-zA-Z0-9_-] )+( [a-zA-Z0-9._-] +)+$/" , $this->info['email'])) {
-        $shipper['Communication']['email']          = $this->info['email'];
-      }
-      $ReturnReceiver['Communication']['phone']          = $this->info['phone'];
-      $ReturnReceiver['Communication']['internet']       = $this->info['internet'];
-      $ReturnReceiver['Communication']['contactPerson']  = $this->info['contact_person'];
-
-
-      $shipment['ShipmentOrder']['Shipment']['ReturnReceiver'] = $ReturnReceiver;
-    }
-
-    if($api22)
-    {
-      //$export['invoiceType'] = "commercial";
-      //$export['invoiceDate'] = date('Y-m-d');
-      $export['invoiceNumber'] = $customer_details['ordernumber'];
-      $export['exportType'] = 0;
-      $export['exportTypeDescription'] = $this->info['export_reason'];
-      $export['commodityCode'] = "";
-      $export['termsOfTrade'] = "DDP";
-      $export['amount'] = (!empty($artikel)?count($artikel):0);
-      //$export['Description'] = $this->info['export_reason'];
-      //$export['CountryCodeOrigin'] = "DE";
-      $export['additionalFee'] = "10";
-      $export['customsValue'] = number_format($customer_details['amount'],2,".","");
-      $export['customsCurrency'] = $customer_details['currency'];
-      //$export['permitNumber'] = "";
-
-    }else{
-      $export['InvoiceType'] = "commercial";
-      $export['InvoiceDate'] = date('Y-m-d');
-      $export['InvoiceNumber'] = $customer_details['ordernumber'];
-      $export['ExportType'] = 0;
-      $export['ExportTypeDescription'] = $this->info['export_reason'];
-      $export['CommodityCode'] = "";
-      $export['TermsOfTrade'] = "DDP";
-      $export['Amount'] = (!empty($artikel)?count($artikel):0);
-      $export['Description'] = $this->info['export_reason'];
-      $export['CountryCodeOrigin'] = "DE";
-      $export['AdditionalFee'] = "10";
-      $export['CustomsValue'] = number_format($customer_details['amount'],2,".","");
-      $export['CustomsCurrency'] = $customer_details['currency'];
-      $export['PermitNumber'] = "";
-    }
-
-    $p=0;
-    for($i=0;$i<(!empty($artikel)?count($artikel):0);$i++)
-    {
-      if($p>4 && (($export['ExportDocPosition'][4]['CustomsValue'] + $artikel[$i]['value']*$artikel[$i]['amount']) > 0)) {
-        if($artikel[$i]['currency']=="") $artikel[$i]['currency']="EUR";
-        if($api22)
-        {
-          $export['ExportDocPosition'][4]['description'] = "Additional Positions";
-          $export['ExportDocPosition'][4]['countryCodeOrigin'] = $artikel[$i]['countrycode'];
-          $export['ExportDocPosition'][4]['commodityCode'] = $artikel[$i]['commodity_code'];
-          $export['ExportDocPosition'][4]['amount'] += $artikel[$i]['amount'];
-          $export['ExportDocPosition'][4]['netWeightInKG'] += $artikel[$i]['netweightinkg'];
-          $export['ExportDocPosition'][4]['grossWeightInKG'] += $artikel[$i]['grossweightinkg'];
-          $export['ExportDocPosition'][4]['customsValue'] += number_format($artikel[$i]['value']*$artikel[$i]['amount'],2,".","");
-          $export['ExportDocPosition'][4]['customsCurrency'] = $artikel[$i]['currency'];
-          
-        }else{
-          $export['ExportDocPosition'][4]['Description'] = "Additional Positions";
-          $export['ExportDocPosition'][4]['CountryCodeOrigin'] = $artikel[$i]['countrycode'];
-          $export['ExportDocPosition'][4]['CommodityCode'] = $artikel[$i]['commodity_code'];
-          $export['ExportDocPosition'][4]['Amount'] += $artikel[$i]['amount'];
-          $export['ExportDocPosition'][4]['NetWeightInKG'] += $artikel[$i]['netweightinkg'];
-          $export['ExportDocPosition'][4]['GrossWeightInKG'] += $artikel[$i]['grossweightinkg'];
-          $export['ExportDocPosition'][4]['CustomsValue'] += number_format($artikel[$i]['value']*$artikel[$i]['amount'],2,".","");
-          $export['ExportDocPosition'][4]['CustomsCurrency'] = $artikel[$i]['currency'];
-        }
-      } else {
-
-        if($artikel[$i]['value']*$artikel[$i]['amount'] > 0)
-        {
-          if($artikel[$i]['currency']=="") $artikel[$i]['currency']="EUR";
-          if($api22)
-          {
-            $export['ExportDocPosition'][$p]['description'] = preg_replace("/[^a-z0-9-.\ \]\[\)\(]/i",'',str_replace(array('ä','Ä','ö','Ö','ü','Ü','ß'),array('ae','Ae','oe','Oe','ue','Ue','ss'),$artikel[$i]['description']));
-            $export['ExportDocPosition'][$p]['countryCodeOrigin'] = $artikel[$i]['countrycode'];
-            $export['ExportDocPosition'][$p]['commodityCode'] = $artikel[$i]['commodity_code'];
-            $export['ExportDocPosition'][$p]['amount'] = round($artikel[$i]['amount']);
-            $export['ExportDocPosition'][$p]['netWeightInKG'] = $artikel[$i]['netweightinkg'];
-            $export['ExportDocPosition'][$p]['grossWeightInKG'] = $artikel[$i]['grossweightinkg'];
-            
-          }else{
-            $export['ExportDocPosition'][$p]['Description'] = preg_replace("/[^a-z0-9-.\ \]\[\)\(]/i",'',str_replace(array('ä','Ä','ö','Ö','ü','Ü','ß'),array('ae','Ae','oe','Oe','ue','Ue','ss'),$artikel[$i]['description']));
-            $export['ExportDocPosition'][$p]['CountryCodeOrigin'] = $artikel[$i]['countrycode'];
-            $export['ExportDocPosition'][$p]['CommodityCode'] = $artikel[$i]['commodity_code'];
-            $export['ExportDocPosition'][$p]['Amount'] = round($artikel[$i]['amount']);
-            $export['ExportDocPosition'][$p]['NetWeightInKG'] = $artikel[$i]['netweightinkg'];
-            $export['ExportDocPosition'][$p]['GrossWeightInKG'] = $artikel[$i]['grossweightinkg'];
-          }
-
-          if($artikel[$i]['value']*$artikel[$i]['amount'] > 0)
-            $export['ExportDocPosition'][$p]['CustomsValue'] = number_format($artikel[$i]['value']*$artikel[$i]['amount'],2,".","");
-          $export['ExportDocPosition'][$p]['CustomsCurrency'] = $artikel[$i]['currency'];
-          $p++;
-        }
-      }
-    }
-
-    $shipment['ShipmentOrder']['Shipment']['ExportDocument'] = $export;
-    try {
-      
-      if($api22)
-      {
-        $response = $this->client->createShipmentOrder($shipment);
-      }else{
-        $response = $this->client->CreateShipmentDD($shipment);
-      }
-    } catch(SoapFault $exception)
-    {
-      if(trim($exception->getMessage()) == 'Authorization Required')
-      {
-        $this->errors[] = 'Fehlerhafte Intraship Zugangsdaten';
-        return false;
-      }
-      $this->errors[] = "Fehler von Intraship: ".$exception->getMessage();
-      return;
-    }
-
-    
-
-    
-    file_put_contents("request.xml",$this->client->__getLastRequest());
-    file_put_contents("response.xml",$this->client->__getLastResponse());
-
-    if (is_soap_fault($response) || (isset($response->status) && $response->status->StatusCode != 0 || isset($response->Status) && $response->Status->statusCode != 0)) {
-      $this->errors[] = "<b>Fehlermeldung von DHL:</b>";
-
-      if (is_soap_fault($response)) {
-
-        $this->errors[] = $response->faultstring;
-      } else {
-
-        $this->errors[] = isset($response->status)?$response->status->StatusMessage:$response->Status->statusMessage;
-
-      }
-      if($response->CreationState->StatusMessage)
-      {
-        foreach($response->CreationState->StatusMessage as $v)
-        {
-          $found = false;
-          if($this->errors && is_array($this->errors))
-          {
-            foreach($this->errors as $err)
-            {
-              if($err == $v)$found = true;
-            }
-          }
-          if(!$found)$this->errors[] = $v;
-        }
-      }
-
-      return false;
-
-    } else {
-
-      $r = array();
-      $r['shipment_number']   = (String) $response->CreationState->ShipmentNumber->shipmentNumber;
-      $r['piece_number']      = (String) $response->CreationState->PieceInformation->PieceNumber->licensePlate;
-      $r['label_url']         = (String) $response->CreationState->Labelurl;
-      return $r;
-    }
-  }
-
-  function GetExportDocDD($shippment_number, $api22 = false) {
-
-    $this->buildClient();
-
-    $shipment = array();
-
-    // Version
-    if($api22)
-    {
-      $shipment['Version']  = array('majorRelease' => '2', 'minorRelease' => '0');
-    }else{
-      $shipment['Version']  = array('majorRelease' => '1', 'minorRelease' => '0');
-    }
-
-    // Order
-    $shipment['ShipmentNumber'] = array('shipmentNumber'=>$shippment_number);
-    //$shipment['DocType'] = 'PDF';
-    $shipment['DocType'] = 'URL';
-
-    // Fixme
-    try {
-      $response = $this->client->GetExportDocDD($shipment);
-    } catch(SoapFault $exception)
-    {
-      if(trim($exception->getMessage()) == 'Authorization Required')
-      {
-        $this->errors[] = 'Fehlerhafte Intraship Zugangsdaten';
-        return false;
-      }
-      
-      $this->errors[] = "Fehler von Intraship: ".$exception->getMessage();
-      return false;
-    }
-    
-    if (is_soap_fault($response) || (isset($response->status) && $response->status->StatusCode != 0 || isset($response->Status) && $response->Status->statusCode != 0)) {
-      $this->errors[] = "<b>Fehlermeldung von DHL:</b>";
-      if (is_soap_fault($response)) {
-        $this->errors[] = $response->faultstring;
-      } else {
-        $this->errors[] = isset($response->status)?$response->status->StatusMessage:$response->Status->statusMessage;
-      }
-      return false;
-    } else {
-      $r = array();
-      $r['export_pdf']   = (String) $response->ExportDocData->ExportDocPDFData;
-      $r['export_url']   = (String) $response->ExportDocData->ExportDocURL;
-      return $r;
-    }
-  }
-
-  private function buildAuthHeader() {
-
-    $head = $this->einstellungen;
-
-    $auth_params = array(
-        'user' => $this->einstellungen['user'],
-        'signature' => $this->einstellungen['signature'],
-        'type'  => 0
-
-        );
-    try{
-      $erg = new SoapHeader('http://dhl.de/webservice/cisbase','Authentification', $auth_params);
-    } catch(SoapFault $exception)
-    {
-      $erg = false;
-      $this->errors[] = "Authentifizierungsfehler: ".$exception->getMessage();
-    }
-    return $erg;
-
-
-  }
-
-
-}
-
-?>
diff --git a/www/lib/versandarten/content/versandarten_sendcloud.tpl b/www/lib/versandarten/content/createshipment.tpl
similarity index 72%
rename from www/lib/versandarten/content/versandarten_sendcloud.tpl
rename to www/lib/versandarten/content/createshipment.tpl
index 6ca8a33f..f1dd436e 100644
--- a/www/lib/versandarten/content/versandarten_sendcloud.tpl
+++ b/www/lib/versandarten/content/createshipment.tpl
@@ -1,57 +1,57 @@
-<div class="container-fluid" id="sendcloudapp">
+<div class="container-fluid" id="createshipmentapp">
     <form action="" method="post" v-on:submit.prevent="submit">
         <div class="row">
             <div v-for="msg in messages" :class="msg.class">{{msg.text}}</div>
             <div>
-                <h1>{|Paketmarken Drucker f&uuml;r|} SendCloud</h1>
+                <h1>{|Paketmarken Drucker f&uuml;r|} [CARRIERNAME]</h1>
             </div>
             <div class="col-md-4">
                 <h2>{|Empf&auml;nger|}</h2>
                 <table>
                     <tr>
                         <td>{|Name|}:</td>
-                        <td><input type="text" size="36" v-model="form.l_name"></td>
+                        <td><input type="text" size="36" v-model.trim="form.name"></td>
                     </tr>
                     <tr>
                         <td>{|Firmenname|}:</td>
-                        <td><input type="text" size="36" v-model="form.l_companyname"></td>
+                        <td><input type="text" size="36" v-model.trim="form.companyname"></td>
                     </tr>
                     <tr>
                         <td>{|Strasse/Hausnummer|}:</td>
                         <td>
-                            <input type="text" size="30" v-model="form.strasse">
-                            <input type="text" size="5" v-model="form.hausnummer">
+                            <input type="text" size="30" v-model.trim="form.street">
+                            <input type="text" size="5" v-model.trim="form.streetnumber">
                         </td>
                     </tr>
                     <tr>
                         <td>{|Adresszeile 2|}:</td>
-                        <td><input type="text" size="36" v-model="form.l_address2"></td>
+                        <td><input type="text" size="36" v-model.trim="form.address2"></td>
                     </tr>
                     <tr>
                         <td>{|PLZ/Ort|}:</td>
-                        <td><input type="text" size="5" v-model="form.plz">
-                            <input type="text" size="30" v-model="form.ort">
+                        <td><input type="text" size="5" v-model.trim="form.zip">
+                            <input type="text" size="30" v-model.trim="form.city">
                         </td>
                     </tr>
                     <tr>
                         <td>{|Bundesland|}:</td>
-                        <td><input type="text" size="36" v-model="form.bundesland"></td>
+                        <td><input type="text" size="36" v-model.trim="form.state"></td>
                     </tr>
                     <tr>
                         <td>{|Land|}:</td>
                         <td>
-                            <select v-model="form.land">
+                            <select v-model="form.country" required>
                                 <option v-for="(value, key) in countries" :value="key">{{value}}</option>
                             </select>
                         </td>
                     </tr>
                     <tr>
                         <td>{|E-Mail|}:</td>
-                        <td><input type="text" size="36" v-model="form.email"></td>
+                        <td><input type="text" size="36" v-model.trim="form.email"></td>
                     </tr>
                     <tr>
                         <td>{|Telefon|}:</td>
-                        <td><input type="text" size="36" v-model="form.telefon"></td>
+                        <td><input type="text" size="36" v-model.trim="form.phone"></td>
                     </tr>
 
                 </table>
@@ -61,39 +61,39 @@
                 <table>
                     <tr>
                         <td>{|Name|}</td>
-                        <td>{{form.name}}</td>
+                        <td>{{form.original.name}}</td>
                     </tr>
                     <tr>
                         <td>{|Ansprechpartner|}</td>
-                        <td>{{form.ansprechpartner}}</td>
+                        <td>{{form.original.ansprechpartner}}</td>
                     </tr>
                     <tr>
                         <td>{|Abteilung|}</td>
-                        <td>{{form.abteilung}}</td>
+                        <td>{{form.original.abteilung}}</td>
                     </tr>
                     <tr>
                         <td>{|Unterabteilung|}</td>
-                        <td>{{form.unterabteilung}}</td>
+                        <td>{{form.original.unterabteilung}}</td>
                     </tr>
                     <tr>
                         <td>{|Adresszusatz|}</td>
-                        <td>{{form.adresszusatz}}</td>
+                        <td>{{form.original.adresszusatz}}</td>
                     </tr>
                     <tr>
                         <td>{|Strasse|}</td>
-                        <td>{{form.streetwithnumber}}</td>
+                        <td>{{form.original.strasse}}</td>
                     </tr>
                     <tr>
                         <td>{|PLZ/Ort|}</td>
-                        <td>{{form.plz}} {{form.ort}}</td>
+                        <td>{{form.original.plz}} {{form.original.ort}}</td>
                     </tr>
                     <tr>
                         <td>{|Bundesland|}</td>
-                        <td>{{form.bundesland}}</td>
+                        <td>{{form.original.bundesland}}</td>
                     </tr>
                     <tr>
                         <td>{|Land|}</td>
-                        <td>{{form.land}}</td>
+                        <td>{{form.original.land}}</td>
                     </tr>
                 </table>
             </div>
@@ -102,28 +102,32 @@
                 <table>
                     <tr>
                         <td>{|Gewicht (in kg)|}:</td>
-                        <td><input type="text" v-model="form.weight"></td>
+                        <td><input type="text" v-model.number="form.weight"></td>
                     </tr>
                     <tr>
                         <td>{|H&ouml;he (in cm)|}:</td>
-                        <td><input type="text" size="10" v-model="form.height"></td>
+                        <td><input type="text" size="10" v-model.number="form.height"></td>
                     </tr>
                     <tr>
                         <td>{|Breite (in cm)|}:</td>
-                        <td><input type="text" size="10" v-model="form.width"></td>
+                        <td><input type="text" size="10" v-model.number="form.width"></td>
                     </tr>
                     <tr>
                         <td>{|L&auml;nge (in cm)|}:</td>
-                        <td><input type="text" size="10" v-model="form.length"></td>
+                        <td><input type="text" size="10" v-model.number="form.length"></td>
                     </tr>
                     <tr>
                         <td>{|Produkt|}:</td>
                         <td>
-                            <select v-model="form.method">
-                                <option v-for="(value, key, index) in methods" :value="key">{{value}}</option>
+                            <select v-model="form.product">
+                                <option v-for="prod in products" :value="prod.Id">{{prod.Name}}</option>
                             </select>
                         </td>
                     </tr>
+                    <tr v-if="serviceAvailable('premium')">
+                        <td>{|Premium|}:</td>
+                        <td><input type="checkbox" v-model="form.services.premium"></td>
+                    </tr>
                 </table>
             </div>
             <div class="clearfix"></div>
@@ -161,25 +165,23 @@
                         <th>{|Herkunftsland|}</th>
                         <th>{|Einzelwert|}</th>
                         <th>{|Einzelgewicht|}</th>
-                        <th>{|Währung|}</th>
                         <th>{|Gesamtwert|}</th>
                         <th>{|Gesamtgewicht|}</th>
                         <th><a v-on:click="addPosition"><img src="themes/new/images/add.png"></a></</th>
                     </tr>
                     <tr v-for="(pos, index) in form.positions">
-                        <td><input type="text" v-model="pos.bezeichnung" required></td>
-                        <td><input type="text" v-model="pos.menge" required></td>
-                        <td><input type="text" v-model="pos.zolltarifnummer" required></td>
-                        <td><input type="text" v-model="pos.herkunftsland" required></td>
-                        <td><input type="text" v-model="pos.zolleinzelwert" required></td>
-                        <td><input type="text" v-model="pos.zolleinzelgewicht" required></td>
-                        <td><input type="text" v-model="pos.zollwaehrung" required></td>
+                        <td><input type="text" v-model.trim="pos.bezeichnung" required></td>
+                        <td><input type="text" v-model.number="pos.menge" required></td>
+                        <td><input type="text" v-model.trim="pos.zolltarifnummer" required></td>
+                        <td><input type="text" v-model.trim="pos.herkunftsland" required></td>
+                        <td><input type="text" v-model.number="pos.zolleinzelwert" required></td>
+                        <td><input type="text" v-model.number="pos.zolleinzelgewicht" required></td>
                         <td>{{Number(pos.menge*pos.zolleinzelwert || 0).toFixed(2)}}</td>
                         <td>{{Number(pos.menge*pos.zolleinzelgewicht || 0).toFixed(3)}}</td>
                         <td><a v-on:click="deletePosition(index)"><img src="themes/new/images/delete.svg"></a></td>
                     </tr>
                     <tr>
-                        <td colspan="7"></td>
+                        <td colspan="6"></td>
                         <td>{{total_value.toFixed(2)}}</td>
                         <td>{{total_weight.toFixed(3)}}</td>
                     </tr>
@@ -187,33 +189,27 @@
             </div>
             <div>
                 <input class="btnGreen" type="submit" value="{|Paketmarke drucken|}" name="drucken">&nbsp;
-                <input type="button" value="{|Andere Versandart auswählen|}" name="anders">&nbsp;
+                <!--<input type="button" value="{|Andere Versandart auswählen|}" name="anders">&nbsp;-->
             </div>
         </div>
     </form>
 </div>
 <script type="text/javascript">
-    const sendcloudApp = new Vue({
-        el: '#sendcloudapp',
-        data: {
-            form: [JSON],
-            countries: [JSON_COUNTRIES],
-            methods: [JSON_METHODS],
-            customs_shipment_types: [JSON_CUSTOMS_SHIPMENT_TYPES],
-            messages: []
-        },
+    const createshipmentapp = new Vue({
+        el: '#createshipmentapp',
+        data: [JSON],
         computed: {
             total_value() {
                 let sum = 0;
                 for(const pos of this.form.positions) {
-                    sum += pos.menge * pos.zolleinzelwert;
+                    sum += (pos.menge * pos.zolleinzelwert) || 0;
                 }
                 return sum;
             },
             total_weight() {
                 let sum = 0;
                 for(const pos of this.form.positions) {
-                    sum += pos.menge * pos.zolleinzelgewicht;
+                    sum += (pos.menge * pos.zolleinzelgewicht) || 0;
                 }
                 return sum;
             }
@@ -235,6 +231,11 @@
             },
             deletePosition: function(index) {
                 this.form.positions.splice(index, 1);
+            },
+            serviceAvailable: function(service) {
+                if (!this.products.hasOwnProperty(this.form.product))
+                    return false;
+                return this.products[this.form.product].AvailableServices.indexOf(service) >= 0;
             }
         }
     })
diff --git a/www/lib/versandarten/dhl.php b/www/lib/versandarten/dhl.php
new file mode 100644
index 00000000..02b1b7a8
--- /dev/null
+++ b/www/lib/versandarten/dhl.php
@@ -0,0 +1,169 @@
+<?php
+
+/**
+ * 
+ */
+
+use Xentral\Carrier\Dhl\Data\Communication;
+use Xentral\Carrier\Dhl\Data\Country;
+use Xentral\Carrier\Dhl\Data\CreateShipmentOrderResponse;
+use Xentral\Carrier\Dhl\Data\NativeAddress;
+use Xentral\Carrier\Dhl\Data\Shipment;
+use Xentral\Carrier\Dhl\Data\ShipmentItem;
+use Xentral\Carrier\Dhl\DhlApi;
+use Xentral\Modules\ShippingMethod\Model\CreateShipmentResult;
+use Xentral\Modules\ShippingMethod\Model\Product;
+
+require_once(dirname(__DIR__).'/class.versanddienstleister.php');
+class Versandart_dhl extends Versanddienstleister{
+
+  public function GetName():string
+  {
+    return 'DHL';
+  }
+
+  public function AdditionalSettings(): array
+  {
+    return [
+        'user' => array('typ' => 'text', 'bezeichnung' => 'Benutzer:', 'info' => 'geschaeftskunden_api (Versenden/Intraship-Benutzername)'),
+        'signature' => array('typ' => 'text', 'bezeichnung' => 'Signature:', 'info' => 'Dhl_ep_test1 (Versenden/IntrashipPasswort)'),
+        'ekp' => array('typ' => 'text', 'bezeichnung' => 'EKP', 'info' => '5000000000 (gültige DHL Kundennummer)'),
+        'accountnumber' => array('typ' => 'text', 'bezeichnung' => 'Abrechnungsnummer Paket:'),
+        'accountnumber_int' => array('typ' => 'text', 'bezeichnung' => 'Abrechnungsnummer Paket International:'),
+        'accountnumber_euro' => array('typ' => 'text', 'bezeichnung' => 'Abrechnungsnummer Europaket:'),
+        'accountnumber_connect' => array('typ' => 'text', 'bezeichnung' => 'Abrechnungsnummer Paket Connect:'),
+        'accountnumber_wp' => array('typ' => 'text', 'bezeichnung' => 'Abrechnungsnummer Warenpost:'),
+        'accountnumber_wpint' => array('typ' => 'text', 'bezeichnung' => 'Abrechnungsnummer Warenpost International:'),
+//        'intraship_retourenaccount' => array('typ' => 'text', 'bezeichnung' => 'Retouren Account:', 'info' => '14 Stellige DHL-Retoure Abrechnungsnummer'),
+//        'intraship_retourenlabel' => array('typ' => 'checkbox', 'bezeichnung' => 'Vorauswahl Retourenlabel:', 'info' => 'Druckt Retourenlabel mit'),
+
+        'sender_name1' => array('typ' => 'text', 'bezeichnung' => 'Versender Firma:'),
+        'sender_street' => array('typ' => 'text', 'bezeichnung' => 'Versender Strasse:'),
+        'sender_streetnumber' => array('typ' => 'text', 'bezeichnung' => 'Versender Strasse Nr.:'),
+        'sender_zip' => array('typ' => 'text', 'bezeichnung' => 'Versender PLZ:'),
+        'sender_city' => array('typ' => 'text', 'bezeichnung' => 'Versender Stadt:'),
+        'sender_country' => array('typ' => 'text', 'bezeichnung' => 'Versender ISO Code:', 'info' => 'DE'),
+        'sender_email' => array('typ' => 'text', 'bezeichnung' => 'Versender E-Mail:'),
+        'sender_phone' => array('typ' => 'text', 'bezeichnung' => 'Versender Telefon:'),
+        'sender_web' => array('typ' => 'text', 'bezeichnung' => 'Versender Web:'),
+        'sender_contact_person' => array('typ' => 'text', 'bezeichnung' => 'Versender Ansprechpartner:'),
+
+        'cod_account_owner' => array('typ' => 'text', 'bezeichnung' => 'Nachnahme Kontoinhaber:'),
+        'cod_bank_name' => array('typ' => 'text', 'bezeichnung' => 'Nachnahme Bank Name:'),
+        'cod_account_iban' => array('typ' => 'text', 'bezeichnung' => 'Nachnahme IBAN:'),
+        'cod_account_bic' => array('typ' => 'text', 'bezeichnung' => 'Nachnahme BIC:'),
+        'cod_extra_fee' => array('typ' => 'text', 'bezeichnung' => 'Nachnahme Gebühr:', 'info' => 'z.B. 2,00 wird auf Rechnungsbetrag addiert, da DHL dies als extra Gebühr für sich behält'),
+
+        'weight' => array('typ' => 'text', 'bezeichnung' => 'Standard Gewicht:', 'info' => 'in KG'),
+        'length' => array('typ' => 'text', 'bezeichnung' => 'Standard Länge:', 'info' => 'in cm'),
+        'width' => array('typ' => 'text', 'bezeichnung' => 'Standard Breite:', 'info' => 'in cm'),
+        'height' => array('typ' => 'text', 'bezeichnung' => 'Standard Höhe:', 'info' => 'in cm'),
+
+        'product' => array('typ' => 'text', 'bezeichnung' => 'Standard Produkt:', 'info' => 'z.B. in DE: V01PAK oder AT: V86PARCEL'),
+        'use_premium' => array('typ' => 'checkbox', 'bezeichnung' => 'Premiumversand verwenden:'),
+/*
+        'intraship_vorausverfuegung' => array('typ' => 'select', 'bezeichnung' => 'Vorausverf&uuml;gung: ', 'optionen' => array('-' => 'keine Vorausverf&uuml;gung', 'IMMEDIATE' => 'Sofortige R&uuml;cksendung an den Absender', 'AFTER_DEADLINE' => 'R&uuml;cksenden an den Absender nach Ablauf der Frist', 'ABANDONMENT' => 'Preisgabe des Pakets durch den Absender (entgeltfrei)')),
+
+        'sperrgut' => array('typ' => 'checkbox', 'bezeichnung' => 'Sperrgut:'),
+        'keineversicherung' => array('typ' => 'checkbox', 'bezeichnung' => 'Extra Versicherung ausschalten:', 'info' => 'Option muss von Hand im Paketmarkendialog gesetzt werden.'),
+        'leitcodierung' => array('typ' => 'checkbox', 'bezeichnung' => 'Leitcodierung aktivieren:'),
+        'use_shipping_article_from_order_on_export' => ['typ' => 'checkbox', 'bezeichnung' => 'Bei Export Porto aus Auftrag senden:'],
+        'autotracking' => array('typ' => 'checkbox', 'bezeichnung' => 'Tracking übernehmen:'),
+        'log' => array('typ' => 'checkbox', 'bezeichnung' => 'Logging')*/
+    ];
+  }
+
+  public function CreateShipment(object $json, array $address): CreateShipmentResult
+  {
+    $shipment = new Shipment();
+    $shipment->ShipmentDetails->product = $json->product;
+    $shipment->ShipmentDetails->accountNumber = '22222222220101';
+    $shipment->ShipmentDetails->SetShipmentDate(new DateTimeImmutable('today'));
+    $shipment->ShipmentDetails->ShipmentItem = new ShipmentItem();
+    $shipment->ShipmentDetails->ShipmentItem->weightInKG = $json->weight ?? 0;
+    $shipment->ShipmentDetails->ShipmentItem->lengthInCM = $json->length;
+    $shipment->ShipmentDetails->ShipmentItem->widthInCM = $json->width;
+    $shipment->ShipmentDetails->ShipmentItem->heightInCM = $json->height;
+    $shipment->Shipper->Name->name1 = $this->settings->sender_name1 ?? '';
+    $shipment->Shipper->Address->streetName = $this->settings->sender_street ?? '';
+    $shipment->Shipper->Address->streetNumber = $this->settings->sender_streetnumber;
+    $shipment->Shipper->Address->zip = $this->settings->sender_zip ?? '';
+    $shipment->Shipper->Address->city = $this->settings->sender_city ?? '';
+    $shipment->Shipper->Address->Origin = Country::Create($this->settings->sender_country ?? 'DE');
+    $shipment->Shipper->Communication = new Communication();
+    $shipment->Shipper->Communication->phone = $this->settings->sender_phone;
+    $shipment->Shipper->Communication->email = $this->settings->sender_email;
+    $shipment->Shipper->Communication->contactPerson = $this->settings->sender_contact_person;
+    $shipment->Receiver->name1 = $json->name;
+    $shipment->Receiver->Address = new NativeAddress();
+    $shipment->Receiver->Address->streetName = $json->street ?? '';
+    $shipment->Receiver->Address->streetNumber = $json->streetnumber ?? '';
+    $shipment->Receiver->Address->city = $json->city ?? '';
+    $shipment->Receiver->Address->zip = $json->zip ?? '';
+    $shipment->Receiver->Address->Origin = Country::Create($json->country ?? 'DE', $json->state);
+    $shipment->Receiver->Communication = new Communication();
+    $shipment->Receiver->Communication->email = $json->email;
+    $shipment->Receiver->Communication->phone = $json->phone;
+    $api = new DhlApi($this->settings->user, $this->settings->signature);
+
+    $ret = new CreateShipmentResult();
+    $result = $api->CreateShipment($shipment);
+    if (!$result instanceof CreateShipmentOrderResponse) {
+      $ret->Errors[] = $result;
+      return $ret;
+    }
+    if ($result->Status->statusCode === 0) {
+      $ret->Success = true;
+      $ret->TrackingNumber = $result->CreationState->shipmentNumber;
+      $ret->TrackingUrl = sprintf('https://www.dhl.de/de/privatkunden/pakete-empfangen/verfolgen.html?piececode=%s', $ret->TrackingNumber);
+      if (isset($result->CreationState->LabelData->labelData))
+        $ret->Label = base64_decode($result->CreationState->LabelData->labelData);
+      if (isset($result->CreationState->LabelData->exportLabelData))
+        $ret->ExportDocuments = base64_decode($result->CreationState->LabelData->exportLabelData);
+    } else {
+      if (is_array($result->CreationState->LabelData->Status->statusMessage))
+        $ret->Errors = $result->CreationState->LabelData->Status->statusMessage;
+      else
+        $ret->Errors[] = $result->CreationState->LabelData->Status->statusMessage;
+    }
+    return $ret;
+  }
+
+  public function GetShippingProducts(): array
+  {
+    $result = [];
+    $result[] = Product::Create('V01PAK', 'DHL Paket')
+        ->WithLength(15, 120)
+        ->WithWidth(11, 60)
+        ->WithHeight(1, 60)
+        ->WithWeight(0.01, 31.5);
+    $result[] = Product::Create('V53WPAK', 'DHL Paket International')
+        ->WithLength(15, 120)
+        ->WithWidth(11, 60)
+        ->WithHeight(1, 60)
+        ->WithWeight(0.01, 31.5)
+        ->WithServices([Product::SERVICE_PREMIUM]);
+    $result[] = Product::Create('V54EPAK', 'DHL Europaket')
+        ->WithLength(15, 120)
+        ->WithWidth(11, 60)
+        ->WithHeight(3.5, 60)
+        ->WithWeight(0.01, 31.5);
+    $result[] = Product::Create('V55PAK', 'DHL Paket Connect')
+        ->WithLength(15, 120)
+        ->WithWidth(11, 60)
+        ->WithHeight(3.5, 60)
+        ->WithWeight(0.01, 31.5);
+    $result[] = Product::Create('V62WP', 'DHL Warenpost')
+        ->WithLength(10, 35)
+        ->WithWidth(7, 25)
+        ->WithHeight(0.1, 5)
+        ->WithWeight(0.01, 1);
+    $result[] = Product::Create('V66WPI', 'DHL Warenpost International')
+        ->WithLength(10, 35)
+        ->WithWidth(7, 25)
+        ->WithHeight(0.1, 10)
+        ->WithWeight(0.01, 1)
+        ->WithServices([Product::SERVICE_PREMIUM]);
+    return $result;
+  }
+}
diff --git a/www/lib/versandarten/dhlversenden.php_ b/www/lib/versandarten/dhlversenden.php_
deleted file mode 100644
index 540b0aca..00000000
--- a/www/lib/versandarten/dhlversenden.php_
+++ /dev/null
@@ -1,2423 +0,0 @@
-<?php
-
-/**
- * 
- */
-
-use Xentral\Components\Logger\Logger;
-
-require_once(dirname(__DIR__).'/class.versanddienstleister.php');
-class Versandart_dhlversenden extends Versanddienstleister{
-
-  const API_URL = 'https://cig.dhl.de/cig-wsdls/com/dpdhl/wsdl/geschaeftskundenversand-api/1.0/geschaeftskundenversand-api-1.0.wsdl';
-  const API_URL2 = 'https://cig.dhl.de/cig-wsdls/com/dpdhl/wsdl/geschaeftskundenversand-api/1.1/geschaeftskundenversand-api-1.1.wsdl';
-  const API_URL22 = 'https://cig.dhl.de/cig-wsdls/com/dpdhl/wsdl/geschaeftskundenversand-api/2.2/geschaeftskundenversand-api-2.2.wsdl';
-  const SANDBOX_URL = 'https://cig.dhl.de/services/sandbox/soap';
-  const PRODUCTION_URL = 'https://cig.dhl.de/services/production/soap';
-
-  private $einstellungen;
-
-  private $info;
-
-  private $client;
-  
-  public $paketmarke_drucker;
-  public $export_drucker;
-
-  public $errors;
-
-  public $name;
-
-  /** @var Logger */
-  private $logger;
-
-  /**
-   * Constructor for Shipment SDK
-   * 
-   * @param type $api_einstellungen
-   * @param type $customer_info
-   */
-   
-  function __construct($app, $id) {
-    $land = '';
-    $this->id = $id;
-    $this->app = $app;
-    $einstellungenArr = $this->app->DB->SelectRow("SELECT einstellungen_json,paketmarke_drucker,export_drucker FROM versandarten WHERE id = '$id' LIMIT 1");
-    $einstellungen_json = $einstellungenArr['einstellungen_json'];
-    $this->paketmarke_drucker = $einstellungenArr['paketmarke_drucker'];
-    $this->export_drucker = $einstellungenArr['export_drucker'];
-    $this->name="DHL Versenden";
-
-    $this->logger = $app->Container->get('Logger');
-
-    if($einstellungen_json)
-    {
-      $this->einstellungen = json_decode($einstellungen_json,true);
-    }else{
-      $this->einstellungen = array();
-    } 
-    $this->einstellungen = $this->einstellungen;
-    if(isset($this->einstellungen['intraship_partnerid']) && $this->einstellungen['intraship_partnerid'] )$this->einstellungen['partnerid'] = $this->einstellungen['intraship_partnerid'];
-    if(!isset($this->einstellungen['partnerid']))
-    {
-      $this->einstellungen['partnerid'] = '01';      
-    }
-    if(!isset($this->einstellungen['partnerid']) || $this->einstellungen['partnerid']=="")
-    {
-      $this->einstellungen['partnerid'] = '01';
-    }
-
-    if($this->einstellungen['intraship_countryISOCode']=="") $this->einstellungen['intraship_countryISOCode'] = "DE";
-
-    $this->errors = array();
-    $data = $this->einstellungen;
-    $this->info = array(
-            'company_name'    => $data['intraship_company_name'],
-            'street_name'     => $data['intraship_street_name'],
-            'street_number'   => $data['intraship_street_number'],
-            'zip'             => $data['intraship_zip'],
-            'country'         => $data['intraship_country'],
-            'countryISOCode'  => $data['intraship_countryISOCode'],
-            'city'            => $data['intraship_city'],
-            'email'           => trim($data['intraship_email']),
-            'phone'           => $data['intraship_phone'],
-            'internet'        => $data['intraship_internet'],
-            'contact_person'  => $data['intraship_contact_person'],
-            'export_reason'  => $data['intraship_exportgrund']
-            );
-
-
-
-        if($land!=$this->einstellungen['intraship_countryISOCode'])
-        {
-          if(!empty($data['intraship_partnerid_welt']) && !empty($data['intraship_partnerid_welt']))$einstellungen['partnerid'] = $data['intraship_partnerid_welt'];
-        }
-
-        if(isset($data['intraship_retourenaccount']) && $data['intraship_retourenaccount'])$einstellungen['intraship_retourenaccount'] = $data['intraship_retourenaccount'];
-
-  
-    /*
-  
-    $this->einstellungen = $api_einstellungen;
-    $this->info = $customer_info;
-
-    if($this->einstellungen['partnerid']=="") $this->einstellungen['partnerid'] = '01';
-
-    $this->errors = array();
-    */
-  }
-  
-  public function GetBezeichnung()
-  {
-    return 'DHL Instrahship';
-  }
-  
-  function EinstellungenStruktur()
-  {
-    return array(
-    
-    
-    'user' => array('typ'=>'text','bezeichnung'=>'Benutzer:','info'=>'geschaeftskunden_api (Versenden/Intraship-Benutzername)'),
-    'signature' => array('typ'=>'text','bezeichnung'=>'Signature:','info'=>'Dhl_ep_test1 (Versenden/IntrashipPasswort)'),
-    'ekp' => array('typ'=>'text','bezeichnung'=>'EKP','info'=>'5000000000 (gültige DHL Kundennummer)'),
-    'partnerid' => array('typ'=>'text','bezeichnung'=>'Partner ID Inland:','info'=>'meist 01, manchmal 02, 03 etc. bzw. wenn vier- und drittletzte Stelle anders hier 4-stellig angeben z.B. 8601'),
-    'partnerid_welt' => array('typ'=>'text','bezeichnung'=>'Partner ID Welt:','info'=>'Versand Welt (vierstellig meist 5301)'),
-    'partnerid_connect' => array('typ'=>'text','bezeichnung'=>'Partner ID EU oder Connect:','info'=>'Versand von DE nach EU oder von AT in ausgewählte Länder Europas (Komplette EKP mit Endung 5401 in DE oder 8701 in AT)'),
-    'euistwelt'=>array('typ'=>'checkbox','bezeichnung'=>'Bei EU immer Welt verwenden:'),
-    'premiumversand'=>array('typ'=>'checkbox','bezeichnung'=>'Premiumversand verwenden:'),
-    'intraship_retourenaccount' => array('typ'=>'text','bezeichnung'=>'Retouren Account:','info'=>'14 Stellige DHL-Retoure Abrechnungsnummer'),
-    'intraship_retourenlabel'=>array('typ'=>'checkbox','bezeichnung'=>'Vorauswahl Retourenlabel:','info'=>'Druckt Retourenlabel mit'),
-    
-    'intraship_company_name' => array('typ'=>'text','bezeichnung'=>'Versender Firma:'),
-    'intraship_street_name' => array('typ'=>'text','bezeichnung'=>'Versender Strasse:'),
-    'intraship_street_number' => array('typ'=>'text','bezeichnung'=>'Versender Strasse Nr.:'),
-    //'intraship_name' => array('typ'=>'text','bezeichnung'=>'Versender Ansprechpartner:'),
-    'intraship_zip' => array('typ'=>'text','bezeichnung'=>'Versender PLZ:'),
-    'intraship_city' => array('typ'=>'text','bezeichnung'=>'Versender Stadt:'),
-    'intraship_country' => array('typ'=>'text','bezeichnung'=>'Versender Land:','info'=>'germany'),
-    'intraship_countryISOCode' => array('typ'=>'text','bezeichnung'=>'Versender ISO Code:','info'=>'DE'),
-    'intraship_email' => array('typ'=>'text','bezeichnung'=>'Versender E-Mail:'),
-    'intraship_phone' => array('typ'=>'text','bezeichnung'=>'Versender Telefon:'),
-    'intraship_internet' => array('typ'=>'text','bezeichnung'=>'Versender Web:'),
-    'intraship_contact_person' => array('typ'=>'text','bezeichnung'=>'Versender Ansprechpartner:'),
-    
-
-    'intraship_account_owner' => array('typ'=>'text','bezeichnung'=>'Nachnahme Bank Inhaber:'),
-    'intraship_account_number' => array('typ'=>'text','bezeichnung'=>'Nachnahme Kontonummer:'),
-    'intraship_code' => array('typ'=>'text','bezeichnung'=>'Nachnahme BLZ:'),
-    'intraship_bank_name' => array('typ'=>'text','bezeichnung'=>'Nachnahme Bank Name:'),
-    'intraship_iban' => array('typ'=>'text','bezeichnung'=>'Nachnahme IBAN:'),
-
-    'intraship_bic' => array('typ'=>'text','bezeichnung'=>'Nachnahme BIC:'),
-    'nachnahmeextra' => array('typ'=>'checkbox','bezeichnung'=>'Nachnahme Gebühr aktivieren:'),    
-    'nachnahmegebuehr' => array('typ'=>'text','bezeichnung'=>'Nachnahme Gebühr:','info'=>'z.B. 2,00 wird auf Rechnungsbetrag addiert, da DHL dies als extra Gebühr für sich behält'),    
-    
-    'intraship_exportgrund' => array('typ'=>'text','bezeichnung'=>'Export bzw. Sonstiges:','info'=>'z.B. Computer Zubehör'),
-    
-    'intraship_WeightInKG' => array('typ'=>'text','bezeichnung'=>'Standard Gewicht:','info'=>'in KG'),
-    'runden' => array('typ'=>'checkbox','bezeichnung'=>'Gewicht runden auf Ganzzahl:'),    
-    'intraship_LengthInCM' => array('typ'=>'text','bezeichnung'=>'Standard Länge:','info'=>'in cm'),
-    'intraship_WidthInCM' => array('typ'=>'text','bezeichnung'=>'Standard Breite:','info'=>'in cm'),
-    'intraship_HeightInCM' => array('typ'=>'text','bezeichnung'=>'Standard Höhe:','info'=>'in cm'),
-    'intraship_PackageType' => array('typ'=>'text','bezeichnung'=>'Standard Paket:','info'=>'z.B. PL'),    
-
-    'intraship_Product' => array('typ'=>'text','bezeichnung'=>'Standard Produkt:','info'=>'z.B. in DE: V01PAK oder AT: V86PARCEL'),
-
-    'intraship_vorausverfuegung'=>array('typ'=>'select','bezeichnung'=>'Vorausverf&uuml;gung: ', 'optionen' => array('-' => 'keine Vorausverf&uuml;gung', 'IMMEDIATE' => 'Sofortige R&uuml;cksendung an den Absender', 'AFTER_DEADLINE' => 'R&uuml;cksenden an den Absender nach Ablauf der Frist', 'ABANDONMENT' => 'Preisgabe des Pakets durch den Absender (entgeltfrei)')),
-
-    'sperrgut' => array('typ'=>'checkbox','bezeichnung'=>'Sperrgut:'),
-    'keineversicherung' => array('typ'=>'checkbox','bezeichnung'=>'Extra Versicherung ausschalten:','info'=>'Option muss von Hand im Paketmarkendialog gesetzt werden.'),
-    'leitcodierung' => array('typ'=>'checkbox','bezeichnung'=>'Leitcodierung aktivieren:'),
-    'use_shipping_article_from_order_on_export' => ['typ' => 'checkbox', 'bezeichnung' => 'Bei Export Porto aus Auftrag senden:'],
-    'autotracking'=>array('typ'=>'checkbox','bezeichnung'=>'Tracking übernehmen:'), 
-    'log'=>array('typ'=>'checkbox','bezeichnung'=>'Logging')
-    );
-    
-  }
-  
-  public function VersandartMindestgewicht()
-  {
-    if(!isset($this->einstellungen['intraship_WeightInKG']))return 2;
-    if($this->einstellungen['intraship_WeightInKG'] === '')return 2;
-    return str_replace(',','.',$this->einstellungen['intraship_WeightInKG']);
-  }
-
-  public function PaketmarkeDrucken($id, $sid)
-  {
-    $adressdaten = $this->GetAdressdaten($id, $sid);
-    $ret = $this->Paketmarke($sid, $id, '', false, $adressdaten);
-    if($sid === 'lieferschein'){
-      $deliverNoteRow = $this->app->DB->SelectRow(
-        sprintf('SELECT adresse, projekt, versandart FROM lieferschein WHERE id = %d LIMIT 1',
-          (int)$id
-        )
-      ); 
-      $adresse = $deliverNoteRow['adresse'];
-      $projekt = $deliverNoteRow['projekt'];
-      $versandart = $deliverNoteRow['versandart'];
-      $adressvalidation = 2;
-      if($ret) {
-        $adressvalidation = 1;
-      }
-      $tracking = '';
-      if(isset($adressdaten['tracking'])) {
-        $tracking = $adressdaten['tracking'];
-      }
-      if(!isset($adressdaten['versandid'])) {
-        $adressdaten['versandid'] = $this->app->DB->Select("SELECT id FROM versand WHERE abgeschlossen = 0 AND tracking = '' AND lieferschein = '$id' LIMIT 1");
-      }
-
-      if(method_exists($this,'deleteTrackingFromUserdata')) {
-        $this->deleteTrackingFromUserdata($tracking);
-      }
-
-      if(!isset($adressdaten['versandid']))
-      {
-        $this->app->DB->Insert("INSERT INTO versand (versandunternehmen, tracking,
-              versendet_am,abgeschlossen,lieferschein,freigegeben,firma,adresse,projekt,paketmarkegedruckt,adressvalidation)
-              VALUES ('$versandart','$tracking',NOW(),1,'$id',1,'1','$adresse','$projekt',1,'$adressvalidation') ");
-        $adressdaten['versandid'] = $this->app->DB->GetInsertID();
-      }elseif($tracking){
-        $this->app->DB->Update("UPDATE versand SET freigegeben = 1, abgeschlossen = 1, tracking =1, paketmarkegedruckt = 1, tracking= '$tracking',adressvalidation = '$adressvalidation', versendet_am = now() WHERE id = '".$adressdaten['versandid']."' LIMIT 1");
-        $this->app->DB->Update("UPDATE versand SET versandunternehmen = versandart WHERE id = '".$adressdaten['versandid']."' AND versandunternehmen = '' LIMIT 1");
-        $this->app->DB->Update("UPDATE versand SET versandunternehmen = '$versandart' WHERE id = '".$adressdaten['versandid']."' AND versandunternehmen = '' LIMIT 1");
-      }
-      $auftragid = $this->app->DB->Select("SELECT auftragid FROM lieferschein WHERE id = '$id' LIMIT 1");
-      if($auftragid) {
-        $this->app->DB->Update("UPDATE auftrag SET schreibschutz = 1, status = 'abgeschlossen' WHERE id = '$auftragid' AND status = 'freigegeben' LIMIT 1");
-      }
-      if($adressvalidation == 1)
-      {
-        $this->app->erp->LieferscheinProtokoll($id, 'Paketmarke automatisch gedruckt');
-        if($adressdaten['versandid']) {
-          return $adressdaten['versandid'];
-        }
-      }elseif($adressvalidation == 2)
-      {
-        $this->app->erp->LieferscheinProtokoll($id, 'automatisches Paketmarke Drucken fehlgeschlagen');
-      }
-    }
-    return $ret;
-  }
-
-  public function GetName3($adressdaten = null)
-  {
-    if($adressdaten === null){
-      return $this->app->Secure->GetPOST('name3');
-    }
-    return !empty($adressdaten['name3'])?$adressdaten['name3']:'';
-  }
-  
-  public function Paketmarke($doctyp, $docid, $target = '', $error = false, &$adressdaten = null)
-  {
-    $zusatz = '';
-    $typ = '';
-    $id = $docid;
-    $sid = $doctyp;
-    if($adressdaten === null) {
-      $drucken = $this->app->Secure->GetPOST('drucken');
-      $anders = $this->app->Secure->GetPOST('anders');
-      $land = $this->app->Secure->GetPOST('land');
-      $tracking_again = $this->app->Secure->GetGET('tracking_again');
-
-      $versandmit = $this->app->Secure->GetPOST('versandmit');
-      $trackingsubmit = $this->app->Secure->GetPOST('trackingsubmit');
-      $versandmitbutton = $this->app->Secure->GetPOST('versandmitbutton');
-      $tracking = $this->app->Secure->GetPOST('tracking');
-      $trackingsubmitcancel = $this->app->Secure->GetPOST('trackingsubmitcancel');
-      //$retourenlabel = $this->app->Secure->GetPOST('retourenlabel');
-
-      $kg = $this->app->Secure->GetPOST('kg1');
-      $name = $this->app->Secure->GetPOST('name');
-      $name2 = $this->app->Secure->GetPOST('name2');
-      $strasse = $this->app->Secure->GetPOST('strasse');
-      $hausnummer = $this->app->Secure->GetPOST('hausnummer');
-      $plz = $this->app->Secure->GetPOST('plz');
-      $ort = $this->app->Secure->GetPOST('ort');
-      $email = $this->app->Secure->GetPOST('email');
-      $phone = $this->app->Secure->GetPOST('telefon');
-      //$nummeraufbeleg = $this->app->Secure->GetPOST('nummeraufbeleg');
-      $sid= $this->app->Secure->GetGET('sid');
-    }else{
-      $drucken = 1;
-      $anders = '';
-      $land = $adressdaten['land'];
-      $tracking_again = '';
-
-      $versandmit = '';
-      $trackingsubmit = '';
-      $versandmitbutton = '';
-      $tracking = '';
-      $trackingsubmitcancel = '';
-      //$retourenlabel = '';
-
-      $kg = $adressdaten['standardkg'];
-      $name = $adressdaten['name'];
-      $name2 = $adressdaten['name2'];
-      $strasse = $adressdaten['strasse'];
-      $hausnummer = $adressdaten['hausnummer'];
-      $plz = $adressdaten['plz'];
-      $ort = $adressdaten['ort'];
-      $email = $adressdaten['email'];
-      $phone = $adressdaten['phone'];
-      //$nummeraufbeleg = 1;//$this->app->Secure->GetPOST('nummeraufbeleg');
-    }
-    $name3 = $this->GetName3($adressdaten);
-    
-
-    if($adressdaten === null) {
-
-      if ($zusatz === 'express')
-        $this->app->Tpl->Set('ZUSATZ', 'Express');
-
-      if ($zusatz === 'export'){
-        $this->app->Tpl->Set('ZUSATZ', 'Export');
-      }
-
-      if ($this->einstellungen['keineversicherung'] == '1') {
-        $this->app->Tpl->Set('VERSICHERT', '');
-        $this->app->Tpl->Set('EXTRAVERSICHERT', '');
-      }
-      if ($this->einstellungen['leitcodierung'] == '1') {
-        $this->app->Tpl->Set('LEITCODIERUNG', ' checked="checked" ');
-      }
-
-      if ($this->einstellungen['intraship_retourenlabel'] == '1'){
-        $this->app->Tpl->Add('RETOURENLABEL', ' checked="checked" ');
-      }
-
-
-      $id = $this->app->Secure->GetGET('id');
-
-      $betrag = $this->app->Secure->GetPOST('betrag');
-      $nachnahme = $this->app->Secure->GetPOST('nachnahme');
-      $_altersfreigabe = $this->app->Secure->GetPOST('altersfreigabe');
-      $versichert = $this->app->Secure->GetPOST('versichert');
-      $leitcodierung = $this->app->Secure->GetPOST('leitcodierung');
-      $wunschtermin = $this->app->Secure->GetPOST('wunschtermin');
-      $wunschzeitraum = $this->app->Secure->GetPOST('wunschzeitraum');
-      $wunschlieferdatum = $this->app->Secure->GetPOST('wunschlieferdatum');
-      $versicherungssumme = $this->app->Secure->GetPOST('versicherungssumme');
-      if($leitcodierung!='1') {
-        $this->einstellungen['leitcodierung']=false;
-      }
-    }else{
-      $betrag = isset($adressdaten['betrag'])?$adressdaten['betrag']:'';
-      $nachnahme = isset($adressdaten['nachnahme'])?$adressdaten['nachnahme']:'';
-      $_altersfreigabe = isset($adressdaten['altersfreigabe'])?$adressdaten['altersfreigabe']:'';
-      $versichert = isset($adressdaten['altersfreigabe'])?$adressdaten['altersfreigabe']:'';
-
-      $wunschtermin = isset($adressdaten['wunschtermin'])?$adressdaten['wunschtermin']:'';
-      $wunschzeitraum = isset($adressdaten['wunschzeitraum'])?$adressdaten['wunschzeitraum']:'';
-      $wunschlieferdatum = isset($adressdaten['wunschlieferdatum'])?$adressdaten['wunschlieferdatum']:'';
-      $versicherungssumme = isset($adressdaten['versicherungssumme'])?$adressdaten['versicherungssumme']:'';
-    }
-
-
-    if($typ==='DHL' || $typ==='dhl'){
-      $versand = 'dhl';
-    }
-    else if($typ==='Intraship'){
-      $versand = 'intraship';
-    }
-    else {
-      $versand = $typ;
-    }
-
-    if($sid === 'versand')
-    {
-      if($adressdaten === null) {
-        $this->app->Tpl->Set("TRACKINGMANUELL",'&nbsp;<input type="button" value="Trackingnummer direkt eingeben" onclick="window.location.href=\'index.php?module=versanderzeugen&action=frankieren&id='.$id.'&tracking_again=1\'" name="anders">&nbsp;');
-      }
-      //$projekt = $this->app->DB->Select("SELECT projekt FROM versand WHERE id='$id' LIMIT 1");
-    }else{
-      //$projekt = $this->app->DB->Select("SELECT projekt FROM lieferschein WHERE id='$id' LIMIT 1");
-    }
-    /*$intraship_weightinkg = $this->app->DB->Select("SELECT intraship_weightinkg FROM projekt WHERE id='$projekt' LIMIT 1");
-
-    if($trackingsubmit == "" && $trackingsubmitcancel=="" && $drucken == "" && $tracking_again=="")
-    {
-
-
-    }*/
-    if($target) {
-      $this->app->YUI->DatePicker('wunschlieferdatum');
-    }
-    if(!$_POST && $target)
-    {
-      if($adressdaten)
-      {
-        $module = $doctyp;
-      }else{
-        $module = $this->app->Secure->GetGET('module');
-      }
-      //TODO Workarrond fuer lieferschein
-      if($module==='lieferschein')
-      {
-        $lieferschein = $id;
-      }
-      else {
-        $lieferschein = $this->app->DB->Select("SELECT lieferschein FROM versand WHERE id='$id' LIMIT 1");
-        if($lieferschein <=0) {
-          $lieferschein=$id;
-        }
-      }
-
-      //$projekt = $this->app->DB->Select("SELECT projekt FROM lieferschein WHERE id='$lieferschein' LIMIT 1");
-      //$lieferscheinnummer = "LS".$this->app->DB->Select("SELECT belegnr FROM lieferschein WHERE id='$lieferschein' LIMIT 1");
-
-        //pruefe ob es auftragsnummer gibt dann nehmen diese
-      $auftragid = $this->app->DB->Select("SELECT auftragid FROM lieferschein WHERE id='$lieferschein' LIMIT 1");
-      if($auftragid > 0)
-      {
-        $versandbeschreibung = (String)$this->app->DB->Select("SELECT ap.beschreibung FROM auftrag_position ap INNER JOIN artikel art ON ap.artikel = art.id AND ap.auftrag = '$auftragid' AND art.porto = 1 LIMIT 1");
-        if($versandbeschreibung !== '')
-        {
-          if(preg_match_all('/([0-9]{1,2})\.([0-9]{1,2})\.([0-9]{2,4})\s([0-9]{1,2})\:([0-9]{2})/i', $versandbeschreibung,$matches, PREG_OFFSET_CAPTURE))
-          {
-            $_wunschdatum = $this->app->String->Convert((strlen($matches[3][0][0]) == 2?'20':'').$matches[3][0][0]."-".(strlen($matches[2][0][0]) == 1?'0':'').$matches[2][0][0]."-".(strlen($matches[1][0][0]) == 1?'0':'').$matches[1][0][0],'%1-%2-%3','%3.%2.%1');
-
-            $_wunschzeit = (String)(strlen($matches[4][0][0] == 1?'0':'').$matches[4][0][0]);
-            $this->app->Tpl->Set('WUNSCHTERMIN', ' checked="checked" ');
-            $this->app->Tpl->Set('WUNSCHLIEFERDATUM', $_wunschdatum);
-            switch($_wunschzeit)
-            {
-              case '10':
-                $this->app->Tpl->Set('WUNSCH10001200', ' checked="checked" ');
-              break;
-              case '12':
-                $this->app->Tpl->Set('WUNSCH12001400', ' checked="checked" ');
-              break;
-              case '14':
-                $this->app->Tpl->Set('WUNSCH14001600', ' checked="checked" ');
-              break;
-              case '16':
-                $this->app->Tpl->Set('WUNSCH16001800', ' checked="checked" ');
-              break;
-              case '18':
-                $this->app->Tpl->Set('WUNSCH18002000', ' checked="checked" ');
-              break;
-              case '19':
-                $this->app->Tpl->Set('WUNSCH19002100', ' checked="checked" ');
-              break;
-            }
-          }
-        }
-      }
-    }elseif($target && $_POST)
-    {
-      switch(substr($wunschzeitraum,0,2))
-      {
-        case '10':
-          $this->app->Tpl->Set('WUNSCH10001200', ' checked="checked" ');
-        break;
-        case '12':
-          $this->app->Tpl->Set('WUNSCH12001400', ' checked="checked" ');
-        break;
-        case '14':
-          $this->app->Tpl->Set('WUNSCH14001600', ' checked="checked" ');
-        break;
-        case '16':
-          $this->app->Tpl->Set('WUNSCH16001800', ' checked="checked" ');
-        break;
-        case '18':
-          $this->app->Tpl->Set('WUNSCH18002000', ' checked="checked" ');
-        break;
-        case '19':
-          $this->app->Tpl->Set('WUNSCH19002100', ' checked="checked" ');
-        break;
-      }
-      if($wunschtermin)$this->app->Tpl->Set('WUNSCHTERMIN', ' checked="checked" ');
-      $this->app->Tpl->Set('WUNSCHLIEFERDATUM', $wunschlieferdatum);
-    }
-
-    if($trackingsubmit!='' || $trackingsubmitcancel!='')
-    {
-
-      if($sid==='versand')
-      {
-        // falche tracingnummer bei DHL da wir in der Funktion PaketmarkeDHLEmbedded sind
-        if((strlen(trim($tracking)) < 12 || strlen(trim($tracking)) > 21) && $trackingsubmitcancel=="" && ($typ=="DHL" || $typ=="Intraship") && $this->einstellungen['intraship_countryISOCode']=="DE")
-        {
-          header("Location: index.php?module=versanderzeugen&action=frankieren&id=$id&land=$land&tracking_again=1");
-          exit;
-        }
-        if(method_exists($this,'deleteTrackingFromUserdata')) {
-          $this->deleteTrackingFromUserdata($tracking);
-        }
-
-        $this->app->DB->Update("UPDATE versand SET versandunternehmen='$versand', tracking='$tracking',
-            versendet_am=NOW(),versendet_am_zeitstempel=NOW(), abgeschlossen='1',logdatei=NOW() WHERE id='$id' LIMIT 1");
-
-        $this->app->erp->VersandAbschluss($id);
-        $this->app->erp->RunHook('versanderzeugen_frankieren_hook1', 1, $id);
-        //versand mail an kunden
-        $this->app->erp->Versandmail($id);
-
-        $weiterespaket=$this->app->Secure->GetPOST('weiterespaket');
-        $lieferscheinkopie=$this->app->Secure->GetPOST('lieferscheinkopie');
-        if($weiterespaket=='1')
-        {
-          if($lieferscheinkopie=='1') {
-            $lieferscheinkopie=0;
-          } else {
-            $lieferscheinkopie=1;
-          }
-          //$this->app->erp->LogFile("Lieferscheinkopie $lieferscheinkopie");
-          $all = $this->app->DB->SelectArr("SELECT * FROM versand WHERE id='$id' LIMIT 1");
-          $this->app->DB->Insert("INSERT INTO versand (id,adresse,rechnung,lieferschein,versandart,projekt,bearbeiter,versender,versandunternehmen,firma,
-            keinetrackingmail,gelesen,paketmarkegedruckt,papieregedruckt,weitererlieferschein)
-              VALUES ('','{$all[0]['adresse']}','{$all[0]['rechnung']}','{$all[0]['lieferschein']}','{$all[0]['versandart']}','{$all[0]['projekt']}',
-                '{$all[0]['bearbeiter']}','{$all[0]['versender']}','{$all[0]['versandunternehmen']}',
-                '{$all[0]['firma']}','{$all[0]['keinetrackingmail']}','{$all[0]['gelesen']}',0,$lieferscheinkopie,1)");
-
-          $newid = $this->app->DB->GetInsertID();
-          header("Location: index.php?module=versanderzeugen&action=einzel&id=$newid");
-        } else {
-          header("Location: index.php?module=versanderzeugen&action=offene");
-        }
-        
-        exit;
-      }
-      //direkt aus dem Lieferschein
-      if($id > 0)
-      {
-        $adresse = $this->app->DB->Select("SELECT adresse FROM lieferschein WHERE id='$id' LIMIT 1");
-        $projekt = $this->app->DB->Select("SELECT projekt FROM lieferschein WHERE id='$id' LIMIT 1");
-        $kg = $this->app->Secure->GetPOST('kg1');
-        if($kg=='') {
-          $kg = $this->app->erp->VersandartMindestgewicht($id);
-        }
-        if(method_exists($this,'deleteTrackingFromUserdata')) {
-          $this->deleteTrackingFromUserdata($tracking);
-        }
-        $this->app->DB->Insert("INSERT INTO versand (id,versandunternehmen, tracking,
-          versendet_am,abgeschlossen,lieferschein,
-          freigegeben,firma,adresse,projekt,gewicht,paketmarkegedruckt,anzahlpakete)
-            VALUES ('','$versand','$tracking',NOW(),1,'$id',1,'".$this->app->User->GetFirma()."','$adresse','$projekt','$kg','1','1') ");
-        $versandId = $this->app->DB->GetInsertID();
-        $auftrag = $this->app->DB->Select("SELECT auftragid FROM lieferschein WHERE id = '$id'");
-        $shop = $this->app->DB->Select("SELECT shop FROM auftrag WHERE id = '$auftrag' LIMIT 1");
-        $auftragabgleich=$this->app->DB->Select("SELECT auftragabgleich FROM shopexport WHERE id='$shop' LIMIT 1");
-
-        if($shop > 0 && $auftragabgleich=="1")
-        {
-          //$this->LogFile("Tracking gescannt");
-          $this->app->remote->RemoteUpdateAuftrag($shop,$auftrag);
-        }
-        $this->app->erp->sendPaymentStatus($versandId);
-        $this->app->Location->execute('index.php?module=lieferschein&action=paketmarke&id='.$id);
-      }
-      
-    }
-
-    if($versandmitbutton!='')
-    {
-
-      if($sid==='versand')
-      {
-        $this->app->DB->Update("UPDATE versand SET versandunternehmen='$versandmit',
-            versendet_am=NOW(),versendet_am_zeitstempel=NOW(),abgeschlossen='1' WHERE id='$id' LIMIT 1");
-
-        $this->app->erp->VersandAbschluss($id);
-        //versand mail an kunden
-        $this->app->erp->Versandmail($id);
-
-        header("Location: index.php?module=versanderzeugen&action=offene");
-        exit;
-      }
-    }
-
-    if($sid==='versand')
-    {
-      // wenn paketmarke bereits gedruckt nur tracking scannen
-      $paketmarkegedruckt = $this->app->DB->Select("SELECT paketmarkegedruckt FROM versand WHERE id='$id' LIMIT 1");
-
-      if($paketmarkegedruckt>=1)
-        $tracking_again=1;
-    }
-    
-    if($anders!='')
-    {
-      
-    }
-    
-    /*if(!($drucken!='' || $tracking_again=='1') || $error)
-    {      
-      if($sid==='versand')
-      {
-        $tid = $this->app->DB->Select("SELECT lieferschein FROM versand WHERE id='$id' LIMIT 1");
-        $rechnung  = $this->app->DB->Select("SELECT rechnung FROM versand WHERE id='$id' LIMIT 1");
-        $sid = 'lieferschein';
-      } else {
-        $tid = $id;
-      }
-      
-    }*/
-    
-    else  if(($drucken!='' || $tracking_again=='1') && !$error)
-    {
-      if($tracking_again!='1')
-      {
-        $kg = (float)str_replace(',','.',$kg);
-
-        $abholdatum = $this->app->Secure->GetPOST("abholdatum");
-        $retourenlabel= $this->app->Secure->GetPOST("retourenlabel");
-        if($retourenlabel)
-        {
-          $this->app->Tpl->Set('RETOURENLABEL', ' checked="checked" ');
-          $zusaetzlich['retourenlabel'] = 1;
-        }
-        if($abholdatum){
-          $this->app->Tpl->Set('ABHOLDATUM',$abholdatum);
-          $zusaetzlich['abholdatum'] = date('Y-m-d', strtotime($abholdatum));
-          $this->app->User->SetParameter("paketmarke_abholdatum",$zusaetzlich['abholdatum']);
-        }
-
-        $kg = (float)(str_replace(',','.',$kg));
-        $kg = round($kg,2);
-        $name = mb_substr($this->app->erp->ReadyForPDF($name), 0, 30, 'UTF-8');
-        $name2 = $this->app->erp->ReadyForPDF($name2);
-        $name3 = $this->app->erp->ReadyForPDF($name3);
-        $strasse = $this->app->erp->ReadyForPDF($strasse);
-        $hausnummer = $this->app->erp->ReadyForPDF($hausnummer);
-        $plz = $this->app->erp->ReadyForPDF($plz);
-        $ort = $this->app->erp->ReadyForPDF(html_entity_decode($ort));
-        $land = $this->app->erp->ReadyForPDF($land);
-
-        if(is_numeric($name) && strtolower($strasse)==='packstation' && $name2!='')
-        {
-          $tmp_name = $name;
-          $name  = $name2;
-          $name2 =$tmp_name;
-        }
-
-        //SetKonfigurationValue($name,$value)
-        if($adressdaten === null){
-          $module = $this->app->Secure->GetGET('module');
-        }else{
-          $module = $doctyp;
-        }
-        //TODO Workarrond fuer lieferschein
-        if($module==='lieferschein')
-        {
-          $lieferschein = $id;
-          $projekt = $this->app->DB->Select("SELECT projekt FROM lieferschein WHERE id='$lieferschein' LIMIT 1");
-          $versandId = 0;
-        }
-        elseif($module === 'retoure') {
-          $lieferschein = $this->app->DB->Select("SELECT lieferschein FROM retoure WHERE id='$id' LIMIT 1");
-          $projekt = $this->app->DB->Select("SELECT projekt FROM retoure WHERE id='$id' LIMIT 1");
-          $versandId = 0;
-        }
-        else {
-          $versandId = $id;
-          $lieferschein = $this->app->DB->Select("SELECT lieferschein FROM versand WHERE id='$id' LIMIT 1");
-          if($lieferschein <=0) {
-            $lieferschein=$id;
-          }
-          $projekt = $this->app->DB->Select("SELECT projekt FROM lieferschein WHERE id='$lieferschein' LIMIT 1");
-        }
-
-        
-        $lieferscheinnummer = 'LS'.$this->app->DB->Select("SELECT belegnr FROM lieferschein WHERE id='$lieferschein' LIMIT 1");
-
-        //pruefe ob es auftragsnummer gibt dann nehmen diese
-        $auftragid = $this->app->DB->Select("SELECT auftragid FROM lieferschein WHERE id='$lieferschein' LIMIT 1");
-        if($auftragid > 0)
-        {
-          $nummeraufbeleg = 'AB'.$this->app->DB->Select("SELECT belegnr FROM auftrag WHERE id='$auftragid' LIMIT 1");
-        } else {
-          $nummeraufbeleg = $lieferscheinnummer;
-        }
-
-        $rechnung = $this->app->DB->Select("SELECT id FROM rechnung WHERE lieferschein='$lieferschein' LIMIT 1");
-        $invoiceCurrency = null;
-        $rechnung_data = $this->app->DB->SelectArr("SELECT * FROM rechnung WHERE id='$rechnung' LIMIT 1");
-        if($rechnung_data) {
-          $rechnungsnummer = $rechnung_data[0]['belegnr'];
-          $invoiceCurrency = $rechnung_data[0]['waehrung'];
-        }
-
-        // check if proformarechnung exists
-        $proformarechnungsnummer = $this->app->DB->Select("SELECT belegnr FROM proformarechnung WHERE lieferschein='$lieferschein' AND belegnr!='' LIMIT 1");
-        if($proformarechnungsnummer!="") {
-          $nummeraufbeleg =  $proformarechnungsnummer;
-        }
-
-        $teillieferungvon = $this->app->DB->Select("SELECT teillieferungvon FROM lieferschein WHERE id='$lieferschein' LIMIT 1");
-        $teillieferungvon2 = $this->app->DB->Select("SELECT id FROM lieferschein WHERE teillieferungvon='$lieferschein' LIMIT 1");
-
-        $rechnungssumme = $rechnung_data[0]['soll']; //XXX
-        $shippingFee = 0;
-
-        if($rechnung && $teillieferungvon <=0 && $teillieferungvon2 <=0){
-          $invoiceData =  $this->app->DB->SelectRow(
-            "SELECT `zahlungsweise`, `soll`, `waehrung` FROM `rechnung` WHERE `id` = '{$rechnung}' LIMIT 1"
-          );
-          $zahlungsweise = $invoiceData['zahlungsweise'];
-          $soll = $invoiceData['soll'];
-          $invoiceCurrency = $invoiceData['waehrung'];
-          $this->app->Tpl->Set('BETRAG',$soll);
-
-          if($zahlungsweise==='nachnahme'){
-            $this->app->Tpl->Set('NACHNAHME', 'checked');
-          }
-
-          if($soll >= 500 && $soll <= 2500 && $this->einstellungen['keineversicherung']!='1'){
-            $this->app->Tpl->Set('VERSICHERT', 'checked');
-          }
-
-          if($soll > 2500 && $this->einstellungen['keineversicherung']!='1'){
-            $this->app->Tpl->Set('EXTRAVERSICHERT', 'checked');
-          }
-
-    
-
-          $artikel_positionen = $this->app->DB->SelectArr(
-            "SELECT rp.*,if(lp.zolltarifnummer!='',lp.zolltarifnummer,rp.zolltarifnummer) as zolltarifnummer 
-            FROM rechnung_position rp 
-            LEFT JOIN lieferschein_position lp ON lp.auftrag_position_id=rp.auftrag_position_id AND lp.auftrag_position_id > 0 
-            WHERE rp.rechnung='$rechnung'");
-          if($versicherungssumme==0) {
-            $versicherungssumme = $this->app->DB->Select("SELECT soll FROM rechnung WHERE id = '$rechnung' LIMIT 1");
-          }
-
-        } else {
-          // wenn mindestens ein zollwert definiert ist dann nur diese nehmen
-          $checkzoll = $this->app->DB->Select("SELECT lp.id FROM lieferschein_position lp WHERE lp.lieferschein='$lieferschein' AND lp.zolleinzelwert>0 LIMIT 1");
-          if($checkzoll > 0)
-          { 
-            $artikel_positionen = $this->app->DB->SelectArr("SELECT lp.menge, lp.bezeichnung,if(lp.zolleinzelwert>0,lp.zolleinzelwert,(ap.preis-(ap.preis/100*ap.rabatt))) as preis, lp.zolltarifnummer,
-              if(lp.zollwaehrung!='',lp.zollwaehrung,ap.waehrung) as waehrung,lp.artikel, lp.zolltarifnummer FROM lieferschein_position lp LEFT JOIN auftrag_position ap ON ap.id=lp.auftrag_position_id 
-              LEFT JOIN artikel a ON a.id=lp.artikel WHERE lp.lieferschein='$lieferschein' AND ap.explodiert!=1 AND a.lagerartikel=1");
- 
-            $rechnungssumme = $this->app->DB->Select("SELECT SUM(lp.menge*if(lp.zolleinzelwert>0,lp.zolleinzelwert,(ap.preis-(ap.preis/100*ap.rabatt)))) 
-              FROM lieferschein_position lp LEFT JOIN auftrag_position ap ON ap.id=lp.auftrag_position_id LEFT JOIN artikel a ON a.id=ap.artikel WHERE lp.lieferschein='$lieferschein' AND ap.explodiert!=1 AND a.porto!=1 ");
-            if($this->app->erp->Export($land) && $this->einstellungen['use_shipping_article_from_order_on_export'] == 1) {
-              $shippingFee = $this->app->DB->Select(
-                "SELECT SUM(ap.menge * IF(ap.zolleinzelwert>0, ap.zolleinzelwert, (ap.preis - (ap.preis / 100 * ap.rabatt)))) 
-                FROM `lieferschein` AS `l` 
-                INNER JOIN `auftrag_position` AS `ap` ON ap.auftrag=l.auftragid 
-                INNER JOIN `artikel` AS `a` ON a.id=ap.artikel 
-                WHERE l.id = '{$lieferschein}' AND ap.explodiert != 1 AND a.porto = 1 "
-              );
-            }
-            else{
-              $shippingFee = $this->app->DB->Select("SELECT SUM(lp.menge*if(lp.zolleinzelwert>0,lp.zolleinzelwert,(ap.preis-(ap.preis/100*ap.rabatt)))) 
-              FROM lieferschein_position lp LEFT JOIN auftrag_position ap ON ap.id=lp.auftrag_position_id LEFT JOIN artikel a ON a.id=ap.artikel WHERE lp.lieferschein='$lieferschein' AND ap.explodiert!=1 AND a.porto=1 ");
-            }
-          } else {
-            $artikel_positionen = $this->app->DB->SelectArr("SELECT lp.menge, lp.bezeichnung,(ap.preis-(ap.preis/100*ap.rabatt)) as preis, lp.zolltarifnummer,
-              if(lp.zollwaehrung!='',lp.zollwaehrung,ap.waehrung) as waehrung,lp.artikel, lp.zolltarifnummer FROM lieferschein_position lp LEFT JOIN auftrag_position ap ON ap.id=lp.auftrag_position_id 
-              LEFT JOIN artikel a ON a.id=lp.artikel WHERE lp.lieferschein='$lieferschein' AND a.lagerartikel=1 ");
-            $rechnungssumme = $this->app->DB->Select("SELECT SUM(lp.menge*(ap.preis-(ap.preis/100*ap.rabatt))) 
-              FROM lieferschein_position lp LEFT JOIN auftrag_position ap ON ap.id=lp.auftrag_position_id LEFT JOIN artikel a ON a.id=ap.artikel WHERE lp.lieferschein='$lieferschein' AND a.porto!=1 ");
-            if($this->app->erp->Export($land) && $this->einstellungen['use_shipping_article_from_order_on_export'] == 1) {
-              $shippingFee = $this->app->DB->Select(
-                "SELECT SUM(ap.menge * (ap.preis-ap.preis / 100 * ap.rabatt)) 
-                FROM `lieferschein` AS `l` 
-                INNER JOIN `auftrag_position` AS `ap` ON ap.auftrag=l.auftragid 
-                INNER JOIN `artikel` AS `a` ON a.id=ap.artikel 
-                WHERE l.id = '{$lieferschein}' AND ap.explodiert != 1 AND a.porto = 1 "
-              );
-            }
-            else{
-              $shippingFee = $this->app->DB->Select("SELECT SUM(lp.menge*(ap.preis-(ap.preis/100*ap.rabatt))) 
-              FROM lieferschein_position lp LEFT JOIN auftrag_position ap ON ap.id=lp.auftrag_position_id LEFT JOIN artikel a ON a.id=ap.artikel WHERE lp.lieferschein='$lieferschein' AND a.porto=1 ");
-            }
-          }
-          if($versicherungssumme==0) $versicherungssumme = $rechnungssumme;
-        }
-
-        $gesamtgewichtzoll = $this->app->DB->Select("SELECT SUM(a.gewicht*lp.menge) FROM lieferschein_position lp LEFT JOIN artikel a ON a.id=lp.artikel WHERE lp.lieferschein='$lieferschein' AND a.lagerartikel=1");
-        $gesamtgewichtzoll = $gesamtgewichtzoll / $this->app->erp->GewichtzuKgFaktor();
-        if( ($kg>0 && $gesamtgewichtzoll > 0) && ($gesamtgewichtzoll > $kg))
-        { 
-           $gewichtfaktor = $kg/$gesamtgewichtzoll;
-        } else $gewichtfaktor=1;
-
-        $altersfreigabe = 0;
-        $cartikel_positionen = !empty($artikel_positionen)?count($artikel_positionen):0;
-        for($i=0;$i<$cartikel_positionen;$i++)
-        {
-          $artikelaltersfreigabe = (int)$this->app->DB->Select("SELECT altersfreigabe FROM artikel WHERE id = '".$artikel_positionen[$i]['artikel']."' LIMIT 1");
-          if($artikelaltersfreigabe > $altersfreigabe)$altersfreigabe = $artikelaltersfreigabe;
-          //$lagerartikel = $this->app->DB->Select("SELECT lagerartikel FROM artikel WHERE id='".$artikel_positionen[$i]['artikel']."' LIMIT 1");
-
-          //if($lagerartikel=="1")
-          {
-            if($artikel_positionen[$i]['waehrung'] == ''){
-              if(!empty($invoiceCurrency)){
-                $artikel_positionen[$i]['waehrung'] = $invoiceCurrency;
-              }else{
-                $artikel_positionen[$i]['waehrung'] = 'EUR';
-              }
-            }
-            $gewicht = $this->app->DB->Select("SELECT gewicht FROM artikel WHERE id='".$artikel_positionen[$i]['artikel']."' LIMIT 1");
-            //$porto = $this->app->DB->Select("SELECT porto FROM artikel WHERE id='".$artikel_positionen[$i]['artikel']."' LIMIT 1");
-            $lagerartikel = $this->app->DB->Select("SELECT lagerartikel FROM artikel WHERE id='".$artikel_positionen[$i]['artikel']."' LIMIT 1");
-            $zolltarifnummer = ($artikel_positionen[$i]['zolltarifnummer']!="" && $artikel_positionen[$i]['zolltarifnummer']!="0"?$artikel_positionen[$i]['zolltarifnummer']:$this->app->DB->Select("SELECT zolltarifnummer FROM artikel WHERE id='".$artikel_positionen[$i]['artikel']."' LIMIT 1"));
-            $herkunftsland = $this->app->DB->Select("SELECT herkunftsland FROM artikel WHERE id='".$artikel_positionen[$i]['artikel']."' LIMIT 1");
-            if(strlen($herkunftsland) > 2) {
-              $herkunftsland = $this->app->erp->FindISOCountry($herkunftsland);
-            }
-            if(!$herkunftsland || strlen($herkunftsland) > 2) {
-              $herkunftsland = 'DE';
-            }
-            if($gewicht > 0) {
-              $gewicht = $artikel_positionen[$i]['menge']*$gewicht / $this->app->erp->GewichtzuKgFaktor();
-            }
-            else {
-              $gewicht = 0.1*$artikel_positionen[$i]['menge'];
-            }
-            //if($gewicht > 0) $gewicht = $artikel_positionen[$i]['menge']*$gewicht;
-            //else $gewicht = 0.1*$artikel_positionen[$i]['menge'];
-            if($lagerartikel!='1') {
-              $gewicht=0;
-            }
-            if( $gewicht > 0)
-            {
-              $artikel[] = array( 'description'=>mb_substr($artikel_positionen[$i]['bezeichnung'], 0, 40, 'UTF-8'),
-                'countrycode'=>$herkunftsland,
-                'commodity_code'=>$zolltarifnummer,
-                'amount'=>$artikel_positionen[$i]['menge'],
-                'netweightinkg'=>$gewicht*$gewichtfaktor,
-                'grossweightinkg'=>$gewicht*$gewichtfaktor,
-                'value'=>$artikel_positionen[$i]['preis'],
-                'currency'=>$artikel_positionen[$i]['waehrung']);
-            }
-          }
-        }
-
-        $data = $this->einstellungen;
-
-        if($land!=$this->einstellungen['intraship_countryISOCode'])
-        {
-          if(!empty($data['partnerid_welt']) && !empty($data['partnerid_welt'])) {
-            $this->einstellungen['partnerid'] = $data['partnerid_welt'];
-          }
-        }
-
-        if(isset($data['intraship_retourenaccount']) && $data['intraship_retourenaccount']) {
-          $einstellungen['intraship_retourenaccount'] = $data['intraship_retourenaccount'];
-        }
-
-        // your company info
-        /*$info = array(
-            'company_name'    => $data['intraship_company_name'],
-            'street_name'     => $data['intraship_street_name'],
-            'street_number'   => $data['intraship_street_number'],
-            'zip'             => $data['intraship_zip'],
-            'country'         => $data['intraship_country'],
-            'city'            => $data['intraship_city'],
-            'email'           => trim($data['intraship_email']),
-            'phone'           => $data['intraship_phone'],
-            'internet'        => $data['intraship_internet'],
-            'contact_person'  => $data['intraship_contact_person'],
-            'export_reason'  => $data['intraship_exportgrund']
-            );*/
-        // receiver details
-
-        if (! (float) $rechnungssumme && !empty($artikel_positionen)) {
-          $fullAmount = 0;
-          foreach ($artikel_positionen as $position) {
-            if (is_array($position) && array_key_exists('preis', $position)) {
-              $fullAmount += (float) $position['preis'] * (float) $position['menge'];
-            }
-          }
-          $rechnungssumme = $fullAmount;
-        }
-
-        $rechnungssumme = max($rechnungssumme, 1);
-        $customer_details = array(
-            'name1'    => $name,
-            'name2'     => $name2,
-            'c/o'           => $name3,
-            'name3'           => $name3,
-            'street_name'   => $strasse,
-            'street_number' => $hausnummer,
-            //    'country'       => 'germany',
-            'country_code'       => $land,
-            'zip'           => $plz,
-            'city'          => $ort,
-            'email'          => trim($email),
-            'ordernumber'   => $nummeraufbeleg,
-            'invoicenumber'   => $rechnungsnummer,
-            'proformanumber'   => $proformarechnungsnummer,
-            'weight'        => $kg,
-            'amount'        => str_replace(",",".",$rechnungssumme),
-            'shippingFee'   => str_replace(",",".",$shippingFee),
-            'currency'        => !empty($artikel_positionen[0]['waehrung']) ? $artikel_positionen[0]['waehrung'] : 'EUR'
-            );
-        if(!empty($phone)){
-          $customer_details['phone'] = $phone;
-        }
-        if(!is_null($zusaetzlich) && isset($zusaetzlich['abholdatum'])) {
-          $customer_details['abholdatum'] = $zusaetzlich['abholdatum'];
-        }
-        if(!is_null($zusaetzlich) && isset($zusaetzlich['retourenlabel'])) {
-          $customer_details['intraship_retourenlabel'] = $zusaetzlich['retourenlabel'];
-        }
-        if($altersfreigabe > 0 && $_altersfreigabe) {
-          $customer_details['altersfreigabe'] = $altersfreigabe;
-        }
-        if($versichert && $versicherungssumme)
-        {
-          $customer_details['versichert'] = $versichert;
-          $customer_details['versicherungssumme'] = $versicherungssumme;         
-        }
-        
-        if($wunschtermin)$customer_details['wunschtermin'] = $wunschtermin;
-        if($wunschzeitraum)$customer_details['wunschzeitraum'] = $wunschzeitraum;
-        if($wunschlieferdatum)
-        {
-          if(strpos($wunschlieferdatum,'.') !== false)
-          {
-            $customer_details['wunschlieferdatum'] = $this->app->String->Convert($wunschlieferdatum,'%1.%2.%3','%3-%2-%1');
-          }else{
-            $customer_details['wunschlieferdatum'] = $wunschlieferdatum;
-          }
-        }
-        
-        //$dhl = new DHLBusinessShipment($einstellungen, $info);
-
-        $shipment_details['WeightInKG'] = $data['intraship_WeightInKG'];
-        $shipment_details['LengthInCM'] = $data['intraship_LengthInCM'];
-        $shipment_details['WidthInCM'] = $data['intraship_WidthInCM'];
-        $shipment_details['HeightInCM'] = $data['intraship_HeightInCM'];
-        $shipment_details['PackageType'] = $data['intraship_PackageType'];
-
-        if($data['intraship_note']=='') {
-          $data['intraship_note'] = $rechnungsnummer;
-        }
-        if($nachnahme && $betrag > 0)
-        {
-          $bank_details = array(
-                'account_owner' => $data['intraship_account_owner'],
-                'account_number' => $data['intraship_account_number'],
-                'bank_code' => $data['intraship_bank_code'],
-                'bank_name' => $data['intraship_bank_name'],
-                'note' => $data['intraship_note'],
-                'iban' => $data['intraship_iban'],
-                'bic' => $data['intraship_bic']
-                );
-
-            //if($this->einstellungen['nachnahmeextra']=="1") $betrag = $betrag + str_replace(',','.',$this->einstellungen['nachnahmegebuehr']);
-
-            $cod_details = array(
-                'amount'=>str_replace(',','.',$betrag),
-                'currency'=> !empty($artikel_positionen[0]['waehrung']) ? $artikel_positionen[0]['waehrung'] : 'EUR'
-                );
-        }
-        if($land==$this->einstellungen['intraship_countryISOCode'])
-        {
-          if($nachnahme && $betrag > 0)
-          {
-            $response = $this->createNationalShipment($customer_details,$shipment_details,$bank_details,$cod_details);
-          } else {
-            //$customer_details['ordernumber']="";
-            $response = $this->createNationalShipment($customer_details,$shipment_details);
-          }
-        } else {
-          $customer_details['EU'] = $this->app->erp->IstEU($land)?1:0;
-          $response = $this->createWeltShipment($customer_details,$shipment_details,$bank_details,$cod_details,$artikel);
-          if($response)
-          {
-
-          // Zoll Papiere
-            //$dhl = new DHLBusinessShipment($einstellungen, $info);
-            $response_export = $this->GetExportDocDD($response['shipment_number']);
-          }else{
-            $dump = $this->app->erp->VarAsString($this->errors);
-            $this->app->erp->Protokoll("Fehler DHL Versenden API beim Erstellen Label fuer Versand $id LS $lieferschein",$dump);
-          }
-        }
-  
-        $data['intraship_drucker'] = $this->paketmarke_drucker;
-        $data['druckerlogistikstufe2'] = $this->export_drucker;
-        
-        if($this->app->erp->GetStandardPaketmarkendrucker()>0){
-          $data['intraship_drucker'] = $this->app->erp->GetStandardPaketmarkendrucker();
-        }
-        
-
-        if($this->app->erp->GetInstrashipExport($projekt)>0){
-          $data['druckerlogistikstufe2'] = $this->app->erp->GetInstrashipExport($projekt);
-        }
-
-        if($response)
-        {
-          //$response['label_url']
-          //$response['shipment_number']
-          $tmppdf = $this->app->erp->DownloadFile($response['label_url'],'Intraship_Versand_'.$id.'_','pdf');
-          if($this->einstellungen['autotracking']=='1'){
-            $this->SetTracking($response['shipment_number'],$sid==='versand'?$id:0, $lieferschein);
-          }
-          $this->app->erp->Protokoll("Erfolg Paketmarke Drucker ".$data['intraship_drucker']," Datei: $tmppdf URL: ".$response['label_url']);
-          $spoolerId = $this->app->printer->Drucken($data['intraship_drucker'],$tmppdf);
-          if($versandId && $spoolerId) {
-            $this->app->DB->Update(
-              sprintf(
-                'UPDATE versand SET lastspooler_id = %d, lastprinter = %d WHERE id = %d',
-                $spoolerId, $data['intraship_drucker'], $versandId
-              )
-            );
-          }
-          if($module === 'retoure')
-          {
-            if(@is_file($tmppdf) && @filesize($tmppdf))
-            {
-              $fileid = $this->app->erp->CreateDatei('Paketmarke_'.$this->app->DB->Select("SELECT belegnr FROM retoure WHERE id = '$id' LIMIT 1").'.pdf', 'Anhang', '', "", $tmppdf, $this->app->DB->real_escape_string($this->app->User->GetName()));
-              $this->app->erp->AddDateiStichwort($fileid, 'anhang', 'retoure', $id);
-            }
-          }
-          
-          unlink($tmppdf);
-        } else {
-          $dump = $this->app->erp->VarAsString($this->errors);
-          $this->app->erp->Protokoll("Fehler DHL Versenden API beim Erstellen Label fuer Versand $id LS $lieferschein",$dump);
-        }
-
-        if($response_export)
-        {
-          $tmppdf = $this->app->erp->DownloadFile($response_export['export_url'],"Export_Intraship_Versand_".$id."_","pdf");
-          $this->app->erp->Protokoll("Erfolg Export Dokumente Drucker ".$data['druckerlogistikstufe2']," Datei: $tmppdf URL: ".$response_export['export_url']);
-          $spoolerId = $this->app->printer->Drucken($data['druckerlogistikstufe2'],$tmppdf);
-          if($versandId && $spoolerId) {
-            $this->app->DB->Update(
-              sprintf(
-                'UPDATE versand SET lastexportspooler_id = %d, lastexportprinter = %d WHERE id = %d',
-                $spoolerId, $data['druckerlogistikstufe2'], $versandId
-              )
-            );
-          }
-          if($module === 'retoure')
-          {
-            if(@is_file($tmppdf) && @filesize($tmppdf))
-            {
-              $fileid = $this->app->erp->CreateDatei('Export_'.$this->app->DB->Select("SELECT belegnr FROM retoure WHERE id = '$id' LIMIT 1").'.pdf', 'Anhang', '', "", $tmppdf, $this->app->DB->real_escape_string($this->app->User->GetName()));
-              $this->app->erp->AddDateiStichwort($fileid, 'anhang', 'retoure', $id);
-            }
-          }
-          
-          unlink($tmppdf);
-        } elseif($land!=$this->einstellungen['intraship_countryISOCode']) {
-          $dump = $this->app->erp->VarAsString($this->errors);
-          $this->app->erp->Protokoll("Fehler DHL Versenden Export Dokument API beim Erstellen fuer Versand $id LS $lieferschein",$dump);
-        }
-        if($adressdaten)
-        {
-          if($response)
-          {
-            $adressdaten['tracking'] = $response['shipment_number'];
-            return true;
-          }
-          return false;
-        }
-        if($response){
-          return false;
-        }
-        return $this->errors;
-      }
-
-      if($this->app->Secure->GetPOST('drucken') || $this->app->Secure->GetPOST('anders'))
-      {
-
-      }else{
-        if(empty($this->einstellungen['retourenaccount']) || !$this->einstellungen['retourenaccount'])            
-        {
-          $this->app->Tpl->Add('VORRETOURENLABEL', '<!--');
-          $this->app->Tpl->Add('NACHRETOURENLABEL', '-->');
-        }
-        if(isset($this->einstellungen['retourenlabel']) && $this->einstellungen['retourenlabel']) {
-          $this->app->Tpl->Add('RETOURENLABEL',' checked="checked" ');
-        }
-        if($target) {
-          $this->app->Tpl->Set('VERSICHERUNGSSUMME',$versicherungssumme);
-        }
-      }
-    }else{
-      if($adressdaten === null){
-        $module = $this->app->Secure->GetGET('module');
-      }
-      else {
-        $module = $doctyp;
-      }
-      //TODO Workarrond fuer lieferschein
-      if($module==='lieferschein')
-      {
-        $lieferschein = $id;
-        //$projekt = $this->app->DB->Select("SELECT projekt FROM lieferschein WHERE id='$lieferschein' LIMIT 1");
-      }elseif($module === 'retoure')
-      {
-        $lieferschein = $this->app->DB->Select("SELECT lieferschein FROM retoure WHERE id='$id' LIMIT 1");
-        //$projekt = $this->app->DB->Select("SELECT projekt FROM retoure WHERE id='$id' LIMIT 1");
-      } else {
-        $lieferschein = $this->app->DB->Select("SELECT lieferschein FROM versand WHERE id='$id' LIMIT 1");
-        //$projekt = $this->app->DB->Select("SELECT projekt FROM lieferschein WHERE id='$lieferschein' LIMIT 1");
-        if($lieferschein <=0) {
-          $lieferschein=$id;
-        }
-      }
-
-      
-      //$lieferscheinnummer = "LS".$this->app->DB->Select("SELECT belegnr FROM lieferschein WHERE id='$lieferschein' LIMIT 1");
-
-      //pruefe ob es auftragsnummer gibt dann nehmen diese
-      $auftragid = $this->app->DB->Select("SELECT auftragid FROM lieferschein WHERE id='$lieferschein' LIMIT 1");
-      if($auftragid > 0)
-      {
-        //$nummeraufbeleg = "AB".$this->app->DB->Select("SELECT belegnr FROM auftrag WHERE id='$auftragid' LIMIT 1");
-        if($versicherungssumme==0) $versicherungssumme = $this->app->DB->Select("SELECT gesamtsumme FROM auftrag WHERE id='$auftragid' LIMIT 1");
-      } else {
-        //$nummeraufbeleg = $lieferscheinnummer;
-      }
-
-      $rechnung = $this->app->DB->Select("SELECT id FROM rechnung WHERE lieferschein='$lieferschein' LIMIT 1");
-      if($rechnung && $versicherungssumme==0) {
-        $versicherungssumme = $this->app->DB->Select("SELECT soll FROM rechnung WHERE id='$rechnung' LIMIT 1");
-      }
-      if($target) {
-        $this->app->Tpl->Set('VERSICHERUNGSSUMME',$versicherungssumme);
-      }
-    }
-
-    // Schutz keine Retouren im Ausland
-    $checkland = $this->app->DB->Select("SELECT land FROM lieferschein WHERE id='$lieferschein' LIMIT 1");
-    if($checkland!=$this->app->erp->Firmendaten('land')){
-      $this->app->Tpl->Set('RETOURENLABEL', '');
-    }
-   
-    //$this->info = $customer_info;
-    if($target)
-    {
-      $this->app->YUI->HideFormular('versichert',array('checked'=>'','unchecked'=>'versicherung'));
-      $this->app->YUI->HideFormular('wunschtermin',array('checked'=>'','unchecked'=>'wunschzeitraum'));
-
-      $this->app->Tpl->Parse($target,'versandarten_dhlversenden.tpl');
-    }
-  }
-  
-  public function Export($daten)
-  {
-    
-  }
-  
-  function Trackinglink($tracking, &$notsend, &$link, &$rawlink)
-  {
-    $notsend = 0;
-    $rawlink = 'http://nolp.dhl.de/nextt-online-public/set_identcodes.do?lang=de&idc='.$tracking;
-    $link = 'DHL Versand: '.$tracking.' ('.$rawlink.')';
-    return true;
-  }
-
-  private function log($message) {
-
-    if (isset($this->einstellungen['log'])) {
-
-      if (is_array($message) || is_object($message)) {
-        $this->logger->debug('DHL parameter', (array) $message);
-      } else {
-        $this->logger->debug($message);
-      }
-
-    }
-
-  }
-
-  function buildClient($retoure='', $altersfreigabe = false) {
-
-    $header = $this->buildAuthHeader();
-
-    $location = self::PRODUCTION_URL;
-    //$location = self::SANDBOX_URL;
-
-    $auth_params = array(
-        'login' => 'wawision_1',
-        'password' => '3KAuCebZmr9bu0ERtNHKcTI8sN5aY9',
-        'location'  => $location,
-        'trace' => $this->einstellungen['log']?1:0,
-        'connection_timeout' => 30
-        );
-
-    $this->log($auth_params);
-    try {
-      $this->client = new SoapClient($altersfreigabe?self::API_URL22:($retoure?self::API_URL2:self::API_URL), $auth_params);
-    } catch(SoapFault $exception)
-    {
-      die('Verbindungsfehler: '.$exception->getMessage());
-      $this->errors[] = 'Verbindungsfehler: '.$exception->getMessage();
-      return;
-    }
-    try {
-      $this->client->__setSoapHeaders($header);
-    } catch(SoapFault $exception)
-    {
-      die('Verbindungsfehler: '.$exception->getMessage());
-      $this->errors[] = 'Verbindungsfehler: '.$exception->getMessage();
-      return;
-    }
-
-    $this->log($this->client);
-
-  }
-
-  function createNationalShipment($customer_details, $shipment_details = null, $bank_details = null, $cod_details = null) {
-    $api2 = false;
-    $api22 = (isset($customer_details['altersfreigabe']) && $customer_details['altersfreigabe']) || (isset($customer_details['wunschtermin']) && $customer_details['wunschtermin']) || (isset($customer_details['versichert']) && $customer_details['versichert'] && isset($customer_details['versicherungssumme']) && $customer_details['versicherungssumme']);
-    if(isset($customer_details['intraship_retourenlabel']) && $customer_details['intraship_retourenlabel'] && isset($this->einstellungen['intraship_retourenaccount']) && $this->einstellungen['intraship_retourenaccount']) {
-      $api2 = true;
-    }
-    if(isset($this->einstellungen['leitcodierung']) && $this->einstellungen['leitcodierung'])$api22 = true;
-
-    $api22 = true; // immer 26.05.2019 BS
-
-    $this->buildClient($api2, $api22);
-
-    $shipment = array();
-
-    // Version
-    $shipment['Version']  = array('majorRelease' => '1', 'minorRelease' => '0');
-/*
-    if(isset($customer_details['intraship_retourenlabel']) && $customer_details['intraship_retourenlabel'] && isset($this->einstellungen['intraship_retourenaccount']) && $this->einstellungen['intraship_retourenaccount'])
-    {
-      $shipment['Version']['minorRelease'] = '1';
-    }
-*/
-    if($api22)
-    {
-      $shipment['Version']  = array('majorRelease' => '2', 'minorRelease' => '0');
-    }
-
-    if($customer_details['country_code']=='' || $customer_details['country_code']=='DE') 
-    { 
-      $customer_details['country_code']='DE';
-      $customer_details['country_zip']='germany';
-    } else if ($customer_details['country_code']=='UK'){
-      $customer_details['country_zip']='england';
-    } else {
-      $customer_details['country_zip']='other';
-    }
-
-    // Order
-    $shipment['ShipmentOrder'] = array();
-
-    // Fixme
-    if($api22)
-    {
-      $shipment['ShipmentOrder']['sequenceNumber']  = '01';
-    }else{
-      $shipment['ShipmentOrder']['SequenceNumber']  = '1';
-    }
-    // Shipment
-    $s = array();
-    if($api22)
-    {
-      if($this->einstellungen['intraship_Product']=="") $this->einstellungen['intraship_Product']="V01PAK";
-      $s['product'] = $this->einstellungen['intraship_Product'];
-    }else{
-      $s['ProductCode']               = 'EPN';
-    }
-
-
-    if($customer_details['intraship_retourenlabel']=="1")
-    {
-      if($api22) {
-        $s['returnShipmentAccountNumber'] = $this->einstellungen['intraship_retourenaccount'];
-        $s['returnShipmentReference'] = $customer_details['ordernumber'];
-      } else {
-        $s['ReturnShipmentBillingNumber'] = $this->einstellungen['intraship_retourenaccount'];
-      }
-    }
-
-
-    if($api22)
-    {
-      if(!empty($customer_details['abholdatum']) && $customer_details['abholdatum']!="0000-00-00")
-        $s['shipmentDate']              = $customer_details['abholdatum'];
-      else
-        $s['shipmentDate']              = date('Y-m-d');
-    }else{    
-      if(!empty($customer_details['abholdatum']) && $customer_details['abholdatum']!="0000-00-00")
-        $s['ShipmentDate']              = $customer_details['abholdatum'];
-      else
-        $s['ShipmentDate']              = date('Y-m-d');
-    }
-
-    if($this->einstellungen['runden']) {
-      $shipment_details['WeightInKG'] = round($shipment_details['WeightInKG']);
-      $customer_details['weight'] = round($customer_details['weight']);
-    }
-
-    if($api22)
-    {
-      $s['accountNumber'] = $this->einstellungen['ekp'].(strlen($this->einstellungen['partnerid']) <= 2?"01".$this->einstellungen['partnerid']:$this->einstellungen['partnerid']);
-      if ($shipment_details == null) {
-        $s['ShipmentItem']  = array();
-        $s['ShipmentItem']['weightInKG'] = '5';
-        $s['ShipmentItem']['lengthInCM'] = '50';
-        $s['ShipmentItem']['widthInCM']  = '50';
-        $s['ShipmentItem']['heightInCM'] = '50';
-      } else {
-        $s['ShipmentItem']  = array();
-        $s['ShipmentItem']['weightInKG'] = $shipment_details['WeightInKG'];
-        $s['ShipmentItem']['lengthInCM'] = $shipment_details['LengthInCM'];
-        $s['ShipmentItem']['widthInCM']  = $shipment_details['WidthInCM'];
-        $s['ShipmentItem']['heightInCM'] = $shipment_details['HeightInCM'];
-      }
-   
-      // Falls ein Gewicht angegeben worden ist
-      if($customer_details['weight']!="")
-        $s['ShipmentItem']['weightInKG'] = $customer_details['weight'];
-    
-    
-    }else{
-      $s['EKP']                       = $this->einstellungen['ekp'];
-
-      $s['Attendance']                = array();
-      $s['Attendance']['partnerID']   = substr($this->einstellungen['partnerid'],0,2);
-      
-      
-      if ($shipment_details == null) {
-        $s['ShipmentItem']  = array();
-        $s['ShipmentItem']['WeightInKG'] = '5';
-        $s['ShipmentItem']['LengthInCM'] = '50';
-        $s['ShipmentItem']['WidthInCM']  = '50';
-        $s['ShipmentItem']['HeightInCM'] = '50';
-        // FIXME: What is this
-        $s['ShipmentItem']['PackageType'] = 'PL';
-      } else {
-        $s['ShipmentItem']  = array();
-        $s['ShipmentItem']['WeightInKG'] = $shipment_details['WeightInKG'];
-        $s['ShipmentItem']['LengthInCM'] = $shipment_details['LengthInCM'];
-        $s['ShipmentItem']['WidthInCM']  = $shipment_details['WidthInCM'];
-        $s['ShipmentItem']['HeightInCM'] = $shipment_details['HeightInCM'];
-        // FIXME: What is this
-        $s['ShipmentItem']['PackageType'] = $shipment_details['PackageType'];
-      }
-   
-      // Falls ein Gewicht angegeben worden ist
-      if($customer_details['weight']!="")
-        $s['ShipmentItem']['WeightInKG'] = $customer_details['weight'];
-    }
-
-    if(isset($this->einstellungen['intraship_vorausverfuegung']) && $this->einstellungen['intraship_vorausverfuegung'] != '' && $this->einstellungen['intraship_vorausverfuegung'] != '-' && $api22){
-      $s['Service']['Endorsement']['active'] = 1;
-      $s['Service']['Endorsement']['type'] = $this->einstellungen['intraship_vorausverfuegung'];
-    }
-
-    if($bank_details != null)
-    {
-      $s['BankData']  = array();
-      $s['BankData']['accountOwner'] = $bank_details['account_owner'];
-      $s['BankData']['accountNumber'] = $bank_details['account_number'];
-      $s['BankData']['bankCode'] = $bank_details['bank_code'];
-      $s['BankData']['bankName'] = $bank_details['bank_name'];
-      $s['BankData']['iban'] = $bank_details['iban'];
-      $s['BankData']['bic'] = $bank_details['bic'];
-      if($api22)
-      {
-        $s['BankData']['note1'] = $bank_details['note'];
-      }else{
-        $s['BankData']['note'] = $bank_details['note'];
-      }
-    } 
-    
-
-    if($cod_details != null)
-    {
-      if($this->einstellungen['nachnahmeextra']=="1") $cod_details['amount'] = $cod_details['amount'] + str_replace(',','.',$this->einstellungen['nachnahmegebuehr']);
-      if($api22)
-      {
-        if($this->einstellungen['intraship_countryISOCode']=='AT')
-        {
-          if($customer_details['country']=='DE') $s['product']='V87PARCEL.V87COD';
-          if($customer_details['country']=='AT') $s['product']='V86PARCEL.V86BLNN';
-        }
-
-
-        $s['Service']['CashOnDelivery']  = array();
-        $s['Service']['CashOnDelivery']['codAmount'] = $cod_details['amount'];
-        $s['Service']['CashOnDelivery']['active'] = 1;
-      }else{
-        //$s['Service']  = array();
-        //$s['Service']['ServiceGroupOther']  = array();
-        $s['Service']['ServiceGroupOther']['COD']  = array();
-        $s['Service']['ServiceGroupOther']['COD']['CODAmount'] = $cod_details['amount'];
-        $s['Service']['ServiceGroupOther']['COD']['CODCurrency'] = $cod_details['currency'];
-      }
-    }
-
-    // Auftragnummer auf Label
-    if($api22)
-    {
-      $s['customerReference']=$customer_details['ordernumber'];
-      if(isset($customer_details['altersfreigabe']) && $customer_details['altersfreigabe'])
-      {
-        if($customer_details['altersfreigabe'] >= 16)
-        {
-          $s['Service']['VisualCheckOfAge'] = array();
-          $s['Service']['VisualCheckOfAge']['active'] = 1;
-          $s['Service']['VisualCheckOfAge']['type'] = $customer_details['altersfreigabe'] > 16?'A18':'A16';
-        }
-      }
-      if(isset($customer_details['wunschtermin']) && $customer_details['wunschtermin'])
-      {
-        if(isset($customer_details['wunschzeitraum']) && $customer_details['wunschzeitraum'])
-        {
-          $s['Service']['PreferredTime'] = array();
-          $s['Service']['PreferredTime']['active'] = 1;
-          $s['Service']['PreferredTime']['type'] = $customer_details['wunschzeitraum'];
-        }
-        if(isset($customer_details['wunschlieferdatum']) && $customer_details['wunschlieferdatum'])
-        {
-          $s['Service']['PreferredDay'] = array();
-          $s['Service']['PreferredDay']['active'] = 1;
-          $s['Service']['PreferredDay']['details'] = $customer_details['wunschlieferdatum'];
-          if($s['product'] !== 'V01PAK' && $s['product'] !== 'V06PAK')
-          {
-            $s['product'] = 'V01PAK';
-          }
-        }
-      }
-      
-      if(isset($customer_details['versichert']) && $customer_details['versichert'] && isset($customer_details['versicherungssumme']) && $customer_details['versicherungssumme'])
-      {
-        $s['Service']['AdditionalInsurance'] = array();
-        $s['Service']['AdditionalInsurance']['active'] = 1;
-        $s['Service']['AdditionalInsurance']['insuranceAmount'] = number_format(str_replace(',','.',$customer_details['versicherungssumme']),2,'.','');
-      }
-      
-      
-      
-    }else{
-      $s['CustomerReference']=$customer_details['ordernumber'];
-    }
-    if($this->einstellungen['sperrgut'] == '1') {
-      $s['Service']['BulkyGoods'] = array();
-      $s['Service']['BulkyGoods']['active'] = 1;
-    }
-
-    $shipment['ShipmentOrder']['Shipment']['ShipmentDetails'] = $s;
-
-    //$shipment['ShipmentOrder']['Shipment']['ShipmentDetails'] = $s;
-    $shipper = array();
-    if($api22)
-    {
-      $shipper['Name'] = array();
-      $shipper['Name']['name1'] = $this->info['company_name'];
-    }else{
-      $shipper['Company'] = array();
-      $shipper['Company']['Company'] = array();
-      $shipper['Company']['Company']['name1'] = $this->info['company_name'];
-    }
-    $shipper['Address'] = array();
-    $shipper['Address']['streetName']     = $this->info['street_name'];
-    $shipper['Address']['streetNumber']   = $this->info['street_number'];
-    if($api22)
-    {
-      $shipper['Address']['zip']            = $this->info['zip'];
-    }else{
-      $shipper['Address']['Zip']            = array();
-      $shipper['Address']['Zip'][strtolower($this->info['country'])]  = $this->info['zip'];
-    }
-    $shipper['Address']['city']           = $this->info['city'];
-
-    $shipper['Address']['Origin'] = array('countryISOCode' => $this->info['countryISOCode']);
-
-    $shipper['Communication']                   = array();
-    if ($this->info['email']!="") {
-      $shipper['Communication']['email']          = $this->info['email'];
-    }
-    $shipper['Communication']['phone']          = $this->info['phone'];
-    $shipper['Communication']['internet']       = $this->info['internet'];
-    $shipper['Communication']['contactPerson']  = $this->info['contact_person'];
-
-
-    $shipment['ShipmentOrder']['Shipment']['Shipper'] = $shipper;
-
-    if($api22)
-    {
-      if(isset($this->einstellungen['leitcodierung']) && $this->einstellungen['leitcodierung'])
-      {
-        $shipment['ShipmentOrder']['PrintOnlyIfCodeable'] = array();
-        $shipment['ShipmentOrder']['PrintOnlyIfCodeable']['active'] = "1";
-      }
-      
-      $receiver = array();
-      $receiver['name1'] = $customer_details['name1'];
-
-      $receiver['Address'] = array();
-
-      if(stripos($customer_details['street_name'], 'packstation') !== false) {
-        if(is_numeric($customer_details['name1']))
-        $receiver['Packstation']['postNumber']=$customer_details['name1'];
-        else if(is_numeric($customer_details['name2']) && $receiver['Packstation']['postNumber']=="")
-        $receiver['Packstation']['postNumber']=$customer_details['name2'];
-
-        $receiver['Packstation']['packstationNumber']=$customer_details['street_number'];
-        $receiver['Packstation']['zip']=$customer_details['zip'];
-        $receiver['Packstation']['city']=$customer_details['city'];
-        $receiver['Packstation']['Origin']=array('countryISOCode' => $customer_details['country_code']);
-      } //else {
-
-      if($customer_details['name2']!="")
-        $receiver['Address']['name2'] = $customer_details['name2'];
-      if($customer_details['name3']!="")
-        $receiver['Address']['name3'] = $customer_details['name3'];
-
-      if($customer_details['name2']!="")
-        $receiver['Address']['addressAddition'] = $customer_details['name2'];
-      if($customer_details['name3']!="")
-        $receiver['Address']['dispatchingInformation'] = $customer_details['name3'];
- 
-      $receiver['Address']['streetName']     = $customer_details['street_name'];
-      $receiver['Address']['streetNumber']   = $customer_details['street_number'];
-      $receiver['Address']['zip']            = $customer_details['zip'];
-      $receiver['Address']['city']           = $customer_details['city'];
-
-      $receiver['Address']['Origin'] = array('countryISOCode' => $customer_details['country_code']);
-      //}
-      $receiver['Communication']                   = array();
-      if($customer_details['c/o']=="") $customer_details['c/o'] = $customer_details['name2'];
-      if($customer_details['c/o']=="") $customer_details['c/o'] = $customer_details['name1'];
-      $receiver['Communication']['contactPerson']  = $customer_details['c/o'];
-
-      if ($customer_details['email']!="") {
-        $receiver['Communication']['email']          = $customer_details['email'];
-      }
-      if ($customer_details['phone']!="") {
-        $receiver['Communication']['phone']          = $customer_details['phone'];
-      }
-
-
-      $shipment['ShipmentOrder']['Shipment']['Receiver'] = $receiver;
-        
-      
-    }else{
-      $receiver = array();
-
-      $receiver['Company'] = array();
-
-      /*
-         $receiver['Company']['Person']  = array();
-         $receiver['Company']['Person']['firstname'] = $customer_details['first_name'];
-         $receiver['Company']['Person']['lastname'] = $customer_details['last_name'];
-       */
-
-      $receiver['Company']['Company']  = array();
-      $receiver['Company']['Company']['name1'] = $customer_details['name1'];
-      $receiver['Company']['Company']['name2'] = $customer_details['name2'];
-
-
-      $receiver['Address'] = array();
-      $receiver['Address']['streetName']     = $customer_details['street_name'];
-      $receiver['Address']['streetNumber']   = $customer_details['street_number'];
-      $receiver['Address']['Zip']            = array();
-      $receiver['Address']['Zip'][strtolower($customer_details['country_zip'])]  = $customer_details['zip'];
-      $receiver['Address']['city']           = $customer_details['city'];
-      $receiver['Communication']                   = array();
-      $receiver['Communication']['contactPerson']  = $customer_details['c/o'];
-      if($customer_details['email']!="")
-        $receiver['Communication']['email']  = $customer_details['email'];
-
-
-
-      $receiver['Address']['Origin'] = array('countryISOCode' => $customer_details['country_code']);
-
-      $shipment['ShipmentOrder']['Shipment']['Receiver'] = $receiver;
-    }
-    if(isset($customer_details['intraship_retourenlabel']) && $customer_details['intraship_retourenlabel'] && isset($this->einstellungen['intraship_retourenaccount']) && $this->einstellungen['intraship_retourenaccount'])
-    {
-      $ReturnReceiver = array();
-      if($api22)
-      {
-        $ReturnReceiver['Name'] = array();
-        $ReturnReceiver['Name']['name1'] = $this->info['company_name'];
-      }else{
-        $ReturnReceiver['Company'] = array();
-        $ReturnReceiver['Company']['Company'] = array();
-        $ReturnReceiver['Company']['Company']['name1'] = $this->info['company_name'];
-      }
-      $ReturnReceiver['Address'] = array();
-      $ReturnReceiver['Address']['streetName']     = $this->info['street_name'];
-      $ReturnReceiver['Address']['streetNumber']   = $this->info['street_number'];
-      if($api22)
-      {
-        $ReturnReceiver['Address']['zip']            = $this->info['zip'];
-      }else{
-        $ReturnReceiver['Address']['Zip']            = array();
-        $ReturnReceiver['Address']['Zip'][strtolower($this->info['country'])]  = $this->info['zip'];
-      }
-      $ReturnReceiver['Address']['city']           = $this->info['city'];
-
-      $ReturnReceiver['Address']['Origin'] = array('countryISOCode' => $this->info['countryISOCode']);
-
-      $ReturnReceiver['Communication']                   = array();
-      if ($this->info['email']!="") {
-        $shipper['Communication']['email']          = $this->info['email'];
-      }
-      $ReturnReceiver['Communication']['phone']          = $this->info['phone'];
-      $ReturnReceiver['Communication']['internet']       = $this->info['internet'];
-      $ReturnReceiver['Communication']['contactPerson']  = $this->info['contact_person'];
-
-
-      $shipment['ShipmentOrder']['Shipment']['ReturnReceiver'] = $ReturnReceiver;
-      // $shipment['ShipmentOrder']['Shipment']['ShipmentDetails']['Service'] = ['PackagingReturn' => ['active' => 1]];
-    }
-    $this->app->erp->LogFile(['shipment'=>$shipment,'customer_details'=>$customer_details]);
-    try {
-      if(empty($this->client)) {
-        return;
-      }
-      if($api22)
-      {
-        $response = $this->client->createShipmentOrder($shipment);
-      }
-      else{
-        $response = $this->client->CreateShipmentDD($shipment);
-      }
-         
-    } catch(SoapFault $exception)
-    {
-      if($this->einstellungen['log'])
-      {
-
-        $this->dumpRequest('request.xml',$this->client->__getLastRequest());
-        $this->dumpRequest('response.xml',$this->client->__getLastResponse());
-      }
-
-      if(trim($exception->getMessage()) == 'Authorization Required')
-      {
-        $this->errors[] = 'Fehlerhafte DHL Versenden Zugangsdaten';
-        return false;
-      }
-
-      $this->errors[] = 'Fehler von DHL Versenden: '.$exception->getMessage();
-
-      return;
-    }
-    if($this->einstellungen['log'])
-    {
-      $this->dumpRequest('request.xml',$this->client->__getLastRequest());
-      $this->dumpRequest('response.xml',$this->client->__getLastResponse());
-    }
-
-    if (is_soap_fault($response) || (isset($response->status) && $response->status->StatusCode != 0 || isset($response->Status) && $response->Status->statusCode != 0)) {
-      $this->errors[] = "<b>Fehlermeldung von DHL:</b>";
-
-      if (is_soap_fault($response)) {
-
-        $this->errors[] = $response->faultstring;
-
-      } else {
-
-        $responsetext = isset($response->status)?$response->status->StatusMessage:$response->Status->statusMessage;
-        if($responsetext=='In der Sendung trat mindestens ein harter Fehler auf.'){
-          $responsetext = 'Fehler bei der Leitcodierung in Adresse. Bitte korrekte Adresse angeben. ';
-        }
-        if($responsetext=='Die Gewichtsangabe ist kleiner als im CN23-Formular'){
-          $responsetext = 'Es müssen für alle Artikel das Gewicht in den Stammdaten gepflegt sein. Es fehlt bei Artikeln das Gewicht. ';
-        }
-
-
-
-       if($responsetext=='Der Nutzer des Webservice konnte nicht authentifiziert werden.'){
-         $responsetext = "DHL Login Failed. Das könnte an einem abgelaufenen Passwort liegen, da DHL in regelmäßigen Abständen ein neues Passwort für den DHL API-User vorschreibt. Mehr Informationen, wie Sie ein neues DHL Passwort vergeben können, finden Sie <a href=\"https://www.wawision.de/helpdesk/intraship#nav-fehlermeldung-beim-versuch-die-dhl-paketmarke-in-wawision-zu-erzeugen-\" target=\"_blank\">hier</a>.";
-       }
-
-        if($responsetext===$response->CreationState->LabelData->Status->statusMessage[1] && $responsetext!=''){
-        } else {
-          $responsetext .= ' '.$response->CreationState->LabelData->Status->statusMessage[1];
-        }
-
-        if($this->einstellungen['log'])
-        {
-          $this->dumpRequest('request.xml',$this->client->__getLastRequest());
-          $this->dumpRequest('response.xml',$this->client->__getLastResponse());
-        }
- 
-        $this->errors[] = $responsetext;
-      }
-      if($response->CreationState->StatusMessage)
-      {
-        foreach($response->CreationState->StatusMessage as $v)
-        {
-          $found = false;
-          if($this->errors && is_array($this->errors))
-          {
-            foreach($this->errors as $err)
-            {
-              if($err == $v)$found = true;
-            }
-          }
-          if(!$found)$this->errors[] = $v;
-        }
-      }
-      return false;
-    }
-    $r = array();
-    if($api22)
-    {
-      $r['shipment_number']   = (String) $response->CreationState->LabelData->shipmentNumber;
-      $r['piece_number']      = (String) $response->CreationState->LabelData->licensePlate;
-      $r['label_url']         = (String) $response->CreationState->LabelData->labelUrl;
-      $r['gesamt'] = $response;
-    }else{      
-      $r['shipment_number']   = (String) $response->CreationState->ShipmentNumber->shipmentNumber;
-      $r['piece_number']      = (String) $response->CreationState->PieceInformation->PieceNumber->licensePlate;
-      $r['label_url']         = (String) $response->CreationState->Labelurl;
-    }
-    return $r;
-
-  }
-
-
-  function createWeltShipment($customer_details, $shipment_details = null, $bank_details = null, $cod_details = null,$artikel=null) {
-    $api2 = false;
-    if(isset($customer_details['altersfreigabe']) && $customer_details['altersfreigabe']) $api22 = true;
-
-    if(isset($this->einstellungen['leitcodierung']) && $this->einstellungen['leitcodierung'])$api22 = true;
-    //if(isset($customer_details['intraship_retourenlabel']) && $customer_details['intraship_retourenlabel'] && isset($this->einstellungen['intraship_retourenaccount']) && $this->einstellungen['intraship_retourenaccount'])$api2 = true;
-
-    // TODO HACK
-    if($this->einstellungen['intraship_countryISOCode']=='AT') {
-      $api22 = true;
-    }
-    $api22 = true; // immer 26.05.2019 BS
-
-    $this->buildClient($api2, $api22);
-
-
-    $shipment = array();
-
-    if($customer_details['country_code']=='DE')
-    {
-      $customer_details['country']='germany';
-    } else if ($customer_details['country_code']=='UK')
-    {                      
-      $customer_details['country']='england';
-    } else {
-      $customer_details['country']='other';
-    } 
-
-    // Version
-    if($api22)
-    {
-      $shipment['Version']  = array('majorRelease' => '2', 'minorRelease' => '0');
-    }else{
-      $shipment['Version']  = array('majorRelease' => '1', 'minorRelease' => '0');
-/*      if(isset($customer_details['intraship_retourenlabel']) && $customer_details['intraship_retourenlabel'] && isset($this->einstellungen['intraship_retourenaccount']) && $this->einstellungen['intraship_retourenaccount'])
-      {
-        $shipment['Version']['minorRelease'] = '1';
-      }
-*/
-    }
-
-    // Order
-    $shipment['ShipmentOrder'] = array();
-    $s = array();
-    // Fixme
-    if($api22)
-    {
-      $shipment['ShipmentOrder']['sequenceNumber']  = '01';
-      if(!empty($customer_details['abholdatum']) && $customer_details['abholdatum']!="0000-00-00")
-        $s['shipmentDate']              = $customer_details['abholdatum'];
-      else
-        $s['shipmentDate']              = date('Y-m-d');
-
-      if($this->einstellungen['intraship_countryISOCode']=='AT') 
-      {
-        //$s['product'] = isset($customer_details['EU'])&&$customer_details['EU']?"V87PARCEL": "V82PARCEL";
-        $s['product'] = ($customer_details['country_code']=="DE"||$customer_details['country_code']=="BE"||$customer_details['country_code']=="NL"||$customer_details['country_code']=="LU"||$customer_details['country_code']=="PL"||$customer_details['country_code']=="SK"||$customer_details['country_code']=="CZ")?"V87PARCEL": "V82PARCEL";
-        $s['accountNumber']= ($customer_details['country_code']=="DE"||$customer_details['country_code']=="BE"||$customer_details['country_code']=="NL"||$customer_details['country_code']=="LU"||$customer_details['country_code']=="PL"||$customer_details['country_code']=="SK"||$customer_details['country_code']=="CZ")?$this->einstellungen['ekp'].$this->einstellungen['partnerid_connect']:$this->einstellungen['ekp'].$this->einstellungen['partnerid_welt'];
-      }
-      else {
-        if($this->einstellungen['euistwelt'])
-        {
-          $s['product'] = "V53WPAK";
-          $s['accountNumber'] =$this->einstellungen['ekp'].(strlen($this->einstellungen['partnerid_welt'])<=2?"01".$this->einstellungen['partnerid_welt']:$this->einstellungen['partnerid_welt']);
-        }
-        else
-        {
-         if(substr($this->einstellungen['partnerid_connect'], -4)=="5501") $s['product'] = "V55PAK";
-         else $s['product'] = isset($customer_details['EU'])&&$customer_details['EU']?"V54EPAK": "V53WPAK";
-         $s['accountNumber'] =$this->einstellungen['ekp'].(isset($customer_details['EU'])&&$customer_details['EU']?$this->einstellungen['partnerid_connect']:$this->einstellungen['partnerid_welt']);
-        }
-      } 
-
-
-    }else{
-      $shipment['ShipmentOrder']['SequenceNumber']  = '1';
-      $s['ProductCode']               = 'BPI';
-      if(!empty($customer_details['abholdatum']) && $customer_details['abholdatum']!="0000-00-00")
-        $s['ShipmentDate']              = $customer_details['abholdatum'];
-      else
-        $s['ShipmentDate']              = date('Y-m-d');
-      $s['EKP']                       = $this->einstellungen['ekp'];
-
-      $s['Attendance']                = array();
-      $s['Attendance']['partnerID']   = $this->einstellungen['partnerid'];
-    }
-    
-
-
-    if($customer_details['intraship_retourenlabel']=="1")
-    {
-      if($api22) {
- //       $s['Service']['ReturnReceipt']  = array();
-//        $s['Service']['ReturnReceipt']['active'] = 1;
-        $s['returnShipmentAccountNumber'] = $this->einstellungen['intraship_retourenaccount'];
-        $s['returnShipmentReference'] = $customer_details['ordernumber'];
-      } else {
-        $s['ReturnShipmentBillingNumber'] = $this->einstellungen['intraship_retourenaccount'];
-      }
-    }
-
-    if($this->einstellungen['runden'])$customer_details['weight'] = round($customer_details['weight']);
-    
-    if($api22)
-    {
-      if ($shipment_details == null) {
-        $s['ShipmentItem']  = array();
-        $s['ShipmentItem']['weightInKG'] = '3';
-        $s['ShipmentItem']['lengthInCM'] = '50';
-        $s['ShipmentItem']['widthInCM']  = '30';
-        $s['ShipmentItem']['heightInCM'] = '15';
-      }      
-      else {
-        $s['ShipmentItem']  = array();
-        $s['ShipmentItem']['weightInKG'] = $shipment_details['WeightInKG'];
-        $s['ShipmentItem']['lengthInCM'] = $shipment_details['LengthInCM'];
-        $s['ShipmentItem']['widthInCM']  = $shipment_details['WidthInCM'];
-        $s['ShipmentItem']['heightInCM'] = $shipment_details['HeightInCM'];
-        $s['ShipmentItem']['PackageType'] = $shipment_details['PackageType'];
-      }
-   // Falls ein Gewicht angegeben worden ist
-      if($customer_details['weight']!="")
-        $s['ShipmentItem']['weightInKG'] = $customer_details['weight'];
-
-    }else{
-      if ($shipment_details == null) {
-        $s['ShipmentItem']  = array();
-        $s['ShipmentItem']['WeightInKG'] = '3';
-        $s['ShipmentItem']['LengthInCM'] = '50';
-        $s['ShipmentItem']['WidthInCM']  = '30';
-        $s['ShipmentItem']['HeightInCM'] = '15';
-        // FIXME: What is this
-        $s['ShipmentItem']['PackageType'] = 'PK';
-      }
-      else {
-        $s['ShipmentItem']  = array();
-        $s['ShipmentItem']['weightInKG'] = $shipment_details['WeightInKG'];
-        $s['ShipmentItem']['lengthInCM'] = $shipment_details['LengthInCM'];
-        $s['ShipmentItem']['widthInCM']  = $shipment_details['WidthInCM'];
-        $s['ShipmentItem']['heightInCM'] = $shipment_details['HeightInCM'];
-        $s['ShipmentItem']['PackageType'] = $shipment_details['PackageType'];
-      }
-
-      // Falls ein Gewicht angegeben worden ist
-      if($customer_details['weight']!="")
-        $s['ShipmentItem']['WeightInKG'] = $customer_details['weight'];
-    }
-    //$s['Service']['ServiceGroupBusinessPackInternational']['Economy'] = 'true';
-    $s['Service']['ServiceGroupBusinessPackInternational']['Premium'] = 'true';
-
-    if($bank_details != null)
-    {
-      $s['BankData']  = array();
-      $s['BankData']['accountOwner'] = $bank_details['account_owner'];
-      $s['BankData']['accountNumber'] = $bank_details['account_number'];
-      $s['BankData']['bankCode'] = $bank_details['bank_code'];
-      $s['BankData']['bankName'] = $bank_details['bank_name'];
-      $s['BankData']['iban'] = $bank_details['iban'];
-      $s['BankData']['bic'] = $bank_details['bic'];
-      $s['BankData']['note'] = $bank_details['note'];
-    }
-
-
-
-    if($cod_details != null)
-    {
-      //$s['Service']  = array();
-      //$s['Service']['ServiceGroupOther']  = array();
-
-      if($this->einstellungen['nachnahmeextra']=='1') $cod_details['amount'] = $cod_details['amount'] + str_replace(',','.',$this->einstellungen['nachnahmegebuehr']);
-      if($api22)
-      {
-        if($this->einstellungen['intraship_countryISOCode']=='AT')
-        {
-          if($customer_details['country']=='DE') $s['product']='V87PARCEL.V87COD';
-          if($customer_details['country']=='AT') $s['product']='V86PARCEL.V86BLNN';
-        }
-        $s['Service']['CashOnDelivery']  = array();
-        $s['Service']['CashOnDelivery']['codAmount'] = $cod_details['amount'];
-        $s['Service']['CashOnDelivery']['active'] = 1;
-      } else {
-        $s['Service']['ServiceGroupOther']['COD']  = array();
-        $s['Service']['ServiceGroupOther']['COD']['CODAmount'] = $cod_details['amount'];
-        $s['Service']['ServiceGroupOther']['COD']['CODCurrency'] = $cod_details['currency'];
-      }
-    }
-    // Auftragnummer auf Label
-    if($api22)
-    {
-      $s['customerReference']=$customer_details['ordernumber'];
-      if($customer_details['altersfreigabe'] >= 16)
-      {
-        $s['Service']['VisualCheckOfAge'] = array();
-        $s['Service']['VisualCheckOfAge']['active'] = 1;
-        $s['Service']['VisualCheckOfAge']['type'] = $customer_details['altersfreigabe'] > 16?'A18':'A16';
-      }     
-    }else{
-      $s['CustomerReference']=$customer_details['ordernumber'];
-    }
-
-    if($this->einstellungen['premiumversand']=='1')
-    {
-      $s['Service']['Premium'] = array();
-      $s['Service']['Premium']['active'] = 1;
-    }
-
-    if($this->einstellungen['sperrgut'] == '1') {
-      $s['Service']['BulkyGoods'] = array();
-      $s['Service']['BulkyGoods']['active'] = 1;
-    }
-    //$s['Service']['ServiceGroupBusinessPackInternational']['Premium'] = 'true';
-
-    $shipment['ShipmentOrder']['Shipment']['ShipmentDetails'] = $s;
-
-    //$shipment['ShipmentOrder']['Shipment']['ShipmentDetails'] = $s;
-
-
-    $shipper = array();
-
-
-    if($api22)
-    {
-      $shipper['Name'] = array();
-      $shipper['Name']['name1'] = $this->info['company_name'];
-    }else{
-      $shipper['Company'] = array();
-      $shipper['Company']['Company'] = array();
-      $shipper['Company']['Company']['name1'] = $this->info['company_name'];
-    }
-
-    $shipper['Address'] = array();
-    $shipper['Address']['streetName']     = $this->info['street_name'];
-    $shipper['Address']['streetNumber']   = $this->info['street_number'];
-    if($api22)
-    {
-      $shipper['Address']['zip']            = $this->info['zip'];
-    }else{
-      $shipper['Address']['Zip']            = array();
-
-      $shipper['Address']['Zip'][strtolower($this->info['country'])]  = $this->info['zip'];
-    }
-    $shipper['Address']['city']           = $this->info['city'];
-
-    $shipper['Address']['Origin'] = array('countryISOCode' => $this->info['countryISOCode']);
-
-
-    $shipper['Communication']                   = array();
-
-
-    if ($this->info['email']!='') {
-      $shipper['Communication']['email']          = $this->info['email'];
-    }
-
-    if(empty($this->info['phone'])) {
-      $this->info['phone'] = '0';
-    }
-    $this->info['phone'] = str_replace('+','00',trim($this->info['phone']));
-    $this->info['phone'] = preg_replace('![^0-9]!', '', $this->info['phone']); 
-    if(empty($this->info['phone'])) {
-      $this->info['phone'] = '0';
-    }
-    
-    $shipper['Communication']['phone']          = $this->info['phone'];
-    $shipper['Communication']['internet']       = $this->info['internet'];
-
-    $shipper['Communication']['contactPerson']  = $this->info['contact_person'];
-
-
-    $shipment['ShipmentOrder']['Shipment']['Shipper'] = $shipper;
-
-
-    if($api22)
-    {
-
-      if(isset($this->einstellungen['leitcodierung']) && $this->einstellungen['leitcodierung'])
-      {
-        $shipment['ShipmentOrder']['PrintOnlyIfCodeable'] = array();
-        $shipment['ShipmentOrder']['PrintOnlyIfCodeable']['active'] = "1";
-      }
-      
-      $receiver = array();
-      $receiver['name1'] = $customer_details['name1'];
-
-      if(stripos($customer_details['street_name'], 'packstation') !== false) { 
-        if(is_numeric($customer_details['name1']))
-        $receiver['Packstation']['postNumber']=$customer_details['name1'];
-        else if(is_numeric($customer_details['name2']) && $receiver['Packstation']['postNumber']=="")
-        $receiver['Packstation']['postNumber']=$customer_details['name2'];
-       
-        $receiver['Packstation']['packstationNumber']=$customer_details['street_number'];
-        $receiver['Packstation']['zip']=$customer_details['zip'];
-        $receiver['Packstation']['city']=$customer_details['city'];
-        $receiver['Packstation']['Origin']=array('countryISOCode' => $customer_details['country_code']);
-      } else {
-
-      $receiver['Address'] = array();
-        if($customer_details['name2']!="")
-          $receiver['Address']['addressAddition'] = $customer_details['name2'];
-        $receiver['Address']['streetName']     = $customer_details['street_name'];
-        $receiver['Address']['streetNumber']   = $customer_details['street_number'];
-        $receiver['Address']['zip']            = $customer_details['zip'];
-        $receiver['Address']['city']           = $customer_details['city'];
-
-        if($customer_details['country_code']==='AT' && strpos($customer_details['street_number'], '/') !== false )
-        {
-          $customer_details['street_number'] = str_replace(' ','',$customer_details['street_number']);
-          $tmpstiege = explode('/',$customer_details['street_number']);
-          //if(isset($tmpstiege[0]))
-          //  $customer_details['street_number'] = $tmpstiege[0];
-
-          if(isset($tmpstiege[1]))
-            $receiver['Address']['addressAddition']=$tmpstiege[1];
-
-          if(isset($tmpstiege[2]))
-            $receiver['Address']['addressAddition2']=$tmpstiege[2];
-
-          //$customer_details['street_number'] = strstr ($customer_details['street_number'], '/',true);
-          //$receiver['Address']['streetNumber'] = strstr ($receiver['Address']['streetNumber'], '/',true);
-        }
-     
-        $receiver['Address']['Origin'] = array('countryISOCode' => $customer_details['country_code']);
-
-      }
-      $receiver['Communication']                   = array();
-      if($customer_details['c/o']=='') $customer_details['c/o'] = $customer_details['name2'];
-      if($customer_details['c/o']=='') $customer_details['c/o'] = $customer_details['name1'];
-      $receiver['Communication']['contactPerson']  = $customer_details['c/o'];
-
-      if ($customer_details['email']!='') {
-        $receiver['Communication']['email']          = $customer_details['email'];
-      }
-
-      if ($customer_details['phone']!='') {
-        $receiver['Communication']['phone']          = $customer_details['phone'];
-      }
-
-      $shipment['ShipmentOrder']['Shipment']['Receiver'] = $receiver;
-        
-    }else{
-      $receiver = array();
-
-      $receiver['Company'] = array();
-
-      $receiver['Company']['Company']  = array();
-      $receiver['Company']['Company']['name1'] = $customer_details['name1'];
-      $receiver['Company']['Company']['name2'] = $customer_details['name2'];
-
-
-      if($customer_details['name2']!="")
-        $tmp_name = explode(' ',$customer_details['name2'],2);
-      else
-        $tmp_name = explode(' ',$customer_details['name1'],2);
-
-      if(isset($tmp_name[2]) && $tmp_name[2]){
-        $receiver['Company']['Person']  = array();
-        $receiver['Company']['Person']['firstname'] = $tmp_name[0];
-        $receiver['Company']['Person']['lastname'] = $tmp_name[1];
-      }
-      $receiver['Address'] = array();
-      $receiver['Address']['streetName']     = $customer_details['street_name'];
-      $receiver['Address']['streetNumber']   = $customer_details['street_number'];
-      $receiver['Address']['Zip']            = array();
-      $receiver['Address']['Zip'][strtolower($customer_details['country_zip'])]  = $customer_details['zip'];
-      $receiver['Address']['city']           = $customer_details['city'];
-      $receiver['Communication']                   = array();
-      if($customer_details['c/o']=="") $customer_details['c/o'] = $customer_details['name2'];
-      if($customer_details['c/o']=="") $customer_details['c/o'] = $customer_details['name1'];
-      $receiver['Communication']['contactPerson']  = $customer_details['c/o'];
-
-
-      if ($customer_details['email']!="") {
-        $receiver['Communication']['email']          = $customer_details['email'];
-      }
-      if(empty($customer_details['phone']))$customer_details['phone'] = '0';
-      $customer_details['phone'] = str_replace('+','00',trim($customer_details['phone']));
-      $customer_details['phone'] = preg_replace('![^0-9]!', '', $customer_details['phone']); 
-      if(empty($customer_details['phone']))$customer_details['phone'] = '0';
-      $receiver['Communication']['phone']          = $customer_details['phone'];
-      $receiver['Address']['Origin'] = array('countryISOCode' => $customer_details['country_code']);
-
-      $shipment['ShipmentOrder']['Shipment']['Receiver'] = $receiver;
-    }
-
-
-    if(isset($customer_details['intraship_retourenlabel']) && $customer_details['intraship_retourenlabel'] && isset($this->einstellungen['intraship_retourenaccount']) && $this->einstellungen['intraship_retourenaccount'])
-    {
-      $ReturnReceiver = array();
-      $ReturnReceiver['Company'] = array();
-      $ReturnReceiver['Company']['Company'] = array();
-      $ReturnReceiver['Company']['Company']['name1'] = $this->info['company_name'];
-
-      $ReturnReceiver['Address'] = array();
-      $ReturnReceiver['Address']['streetName']     = $this->info['street_name'];
-      $ReturnReceiver['Address']['streetNumber']   = $this->info['street_number'];
-      if($api22)
-      {
-        $ReturnReceiver['Address']['zip']            = $this->info['zip'];
-      }else{
-        $ReturnReceiver['Address']['Zip']            = array();
-        $ReturnReceiver['Address']['Zip'][strtolower($this->info['country'])]  = $this->info['zip'];
-      }
-      $ReturnReceiver['Address']['city']           = $this->info['city'];
-
-      $ReturnReceiver['Address']['Origin'] = array('countryISOCode' => $customer_details['country_code']);
-
-      $ReturnReceiver['Communication']                   = array();
-      if ($this->info['email']!="") {
-        $shipper['Communication']['email']          = $this->info['email'];
-      }
-      $ReturnReceiver['Communication']['phone']          = $this->info['phone'];
-      $ReturnReceiver['Communication']['internet']       = $this->info['internet'];
-      $ReturnReceiver['Communication']['contactPerson']  = $this->info['contact_person'];
-
-
-      $shipment['ShipmentOrder']['Shipment']['ReturnReceiver'] = $ReturnReceiver;
-    }
-
-    $proformarechnungsnummer = $customer_details['proformanumber']; 
-
-    if($proformarechnungsnummer=="")
-    {
-      $proformarechnungsnummer = ($customer_details['invoicenumber']!=""?$customer_details['invoicenumber']:$customer_details['ordernumber']);
-    }
-    if($api22)
-    {
-      //$export['invoiceType'] = "commercial";
-      //$export['invoiceDate'] = date('Y-m-d');
-     
-      $export['invoiceNumber'] = $proformarechnungsnummer;
-      $export['exportType'] = "OTHER";
-      $export['exportTypeDescription'] = $this->info['export_reason'];
-      $export['commodityCode'] = "";
-      $export['termsOfTrade'] = "DDP";
-      $export['amount'] = count($artikel);
-      $export['placeOfCommital'] = $customer_details['city'];
-      //$export['Description'] = $this->info['export_reason'];
-      //$export['CountryCodeOrigin'] = "DE";
-      $export['additionalFee'] = number_format((float)$customer_details['shippingFee'],2,".","");
-      $export['customsValue'] = number_format($customer_details['amount'],2,".","");
-      $export['customsCurrency'] = $customer_details['currency'];
-      //$export['permitNumber'] = "";
-
-    }else{
-      $export['InvoiceType'] = "commercial";
-      $export['InvoiceDate'] = date('Y-m-d');
-      $export['InvoiceNumber'] = $proformarechnungsnummer;
-      $export['ExportType'] = 0;
-      $export['ExportTypeDescription'] = $this->info['export_reason'];
-      $export['CommodityCode'] = "";
-      $export['TermsOfTrade'] = "DDP";
-      $export['Amount'] = count($artikel);
-      $export['Description'] = $this->info['export_reason'];
-      $export['CountryCodeOrigin'] = "DE";
-      $export['AdditionalFee'] = number_format((float)$customer_details['shippingFee'],2,".","");
-      $export['CustomsValue'] = number_format($customer_details['value'],2,".","");
-      $export['CustomsCurrency'] = $customer_details['currency'];
-      $export['PermitNumber'] = "";
-    }
-
-    $p=0;
-    $cartikel = !empty($artikel)?count($artikel):0;
-    for($i=0;$i<$cartikel;$i++)
-    {
-        if($artikel[$i]['currency']=="") $artikel[$i]['currency']="EUR";
-        if($api22)
-        {
-          if($this->info['export_reason']!="") 
-            $export['ExportDocPosition'][0]['description'] = $this->info['export_reason'];
-          else
-            $export['ExportDocPosition'][0]['description'] = "Additional Positions";
-
-          $export['ExportDocPosition'][0]['countryCodeOrigin'] = $artikel[$i]['countrycode'];
-          $export['ExportDocPosition'][0]['customsTariffNumber'] = $artikel[$i]['commodity_code'];
-          $export['ExportDocPosition'][0]['amount'] = 1;//+= intval($artikel[$i]['amount']);
-          if(!isset($export['ExportDocPosition'][0]['netWeightInKG'])){
-            $export['ExportDocPosition'][0]['netWeightInKG'] = number_format($artikel[$i]['netweightinkg'], 2, ".", "");
-            $export['ExportDocPosition'][0]['grossWeightInKG'] = number_format($artikel[$i]['grossweightinkg'], 2, ".", "");
-          }else{
-            $export['ExportDocPosition'][0]['netWeightInKG'] = number_format(
-              (float)$export['ExportDocPosition'][0]['netWeightInKG'] + (float)$artikel[$i]['netweightinkg'], 2, ".", ""
-            );
-            $export['ExportDocPosition'][0]['grossWeightInKG'] = number_format(
-              (float)$export['ExportDocPosition'][0]['grossWeightInKG'] + (float)$artikel[$i]['grossweightinkg'], 2, ".", ""
-            );
-          }
-          $export['ExportDocPosition'][0]['customsValue'] = number_format($customer_details['amount'],2,".","");
-          $export['ExportDocPosition'][0]['customsCurrency'] = $customer_details['currency'];
-          $export['ExportDocPosition'][0]['Currency'] = $customer_details['currency'];
-
-        }else{
-          if($this->info['export_reason']!="") 
-            $export['ExportDocPosition'][0]['Description'] = $this->info['export_reason'];
-          else
-            $export['ExportDocPosition'][0]['Description'] = "Additional Positions";
-
-          $export['ExportDocPosition'][0]['CountryCodeOrigin'] = $artikel[$i]['countrycode'];
-          $export['ExportDocPosition'][0]['CommodityCode'] = $artikel[$i]['commodity_code'];
-          $export['ExportDocPosition'][0]['Amount'] = 1;//+= intval($artikel[$i]['amount']);
-          if(!isset($export['ExportDocPosition'][0]['netWeightInKG'])){
-            $export['ExportDocPosition'][0]['netWeightInKG'] = number_format($artikel[$i]['netweightinkg'], 2, ".", "");
-            $export['ExportDocPosition'][0]['grossWeightInKG'] = number_format($artikel[$i]['grossweightinkg'], 2, ".", "");
-          }else{
-            $export['ExportDocPosition'][0]['netWeightInKG'] = number_format(
-              (float)$export['ExportDocPosition'][0]['netWeightInKG'] + (float)$artikel[$i]['netweightinkg'], 2, ".", ""
-            );
-            $export['ExportDocPosition'][0]['grossWeightInKG'] = number_format(
-              (float)$export['ExportDocPosition'][0]['grossWeightInKG'] + (float)$artikel[$i]['grossweightinkg'], 2, ".", ""
-            );
-          }
-          $export['ExportDocPosition'][0]['CustomsValue'] = number_format($customer_details['amount'],2,".","");
-          $export['ExportDocPosition'][0]['CustomsCurrency'] = $customer_details['currency'];
-          $export['ExportDocPosition'][0]['Currency'] = $customer_details['currency'];
-        }
-    }
-    
-    
-
-    if(count($artikel)<=0)$this->errors[]="Bei den Artikel fehlen die Gewichte in den Stammdaten!";
-
-    $shipment['ShipmentOrder']['Shipment']['ExportDocument'] = $export;
-    try {
-      if(empty($this->client)) {
-        return;
-      }
-      if($api22)
-      {
-        $response = $this->client->createShipmentOrder($shipment);
-      }else{
-        $response = $this->client->CreateShipmentDD($shipment);
-      }
-    } catch(SoapFault $exception)
-    {
-
-      if($this->einstellungen['log'])
-      {
-        $this->dumpRequest("request.xml",$this->client->__getLastRequest());
-        $this->dumpRequest("response.xml",$this->client->__getLastResponse());
-      }
-  
-      if(trim($exception->getMessage()) == 'Authorization Required')
-      {
-        $this->errors[] = 'Fehlerhafte DHL Versenden Zugangsdaten';
-        return false;
-      }
-      $this->errors[] = "Fehler von DHL Versenden: ".$exception->getMessage();
-      return;
-    }
-
-    if($this->einstellungen['log'])
-    {
-      $this->dumpRequest("request.xml",$this->client->__getLastRequest());
-      $this->dumpRequest("response.xml",$this->client->__getLastResponse());
-    }
- 
-
-  
-    if (((isset($response->status) && $response->status->StatusCode != 0)
-        || (isset($response->Status) && $response->Status->statusCode != 0)) || is_soap_fault($response)) {
-      $this->errors[] = "<b>Fehlermeldung von DHL:</b>";
-
-      if (is_soap_fault($response)) {
-        $this->errors[] = $response->faultstring;
-      } else {
-
-        $responsetext = isset($response->status)?$response->status->StatusMessage:$response->Status->statusMessage;
-        if($responsetext=='In der Sendung trat mindestens ein harter Fehler auf.')
-          $responsetext = 'Fehler bei der Leitcodierung in Adresse. Bitte korrekte Adresse angeben. ';
-
-        if($responsetext=='Der Nutzer des Webservice konnte nicht authentifiziert werden.')
-          $responsetext = "DHL Login Failed. Das könnte an einem abgelaufenen Passwort liegen, da DHL in regelmäßigen Abständen ein neues Passwort für den DHL API-User vorschreibt. Mehr Informationen, wie Sie ein neues DHL Passwort vergeben können, finden Sie <a href=\"https://www.wawision.de/helpdesk/intraship#nav-fehlermeldung-beim-versuch-die-dhl-paketmarke-in-wawision-zu-erzeugen-\" target=\"_blank\">hier</a>.";
-
-
-
-        if($responsetext=='Exception in extension function java.util.MissingResourceException: Couldnt find 3-letter country code for GERMANY')
-          $responsetext = 'Bitte prüfen Sie die Herkunftsländer der Artikel in den Stammdaten. Es müssen 2-stellige ISO Codes angegeben sein.';
-
-        $secondMessage = (String)$response->CreationState->LabelData->Status->statusMessage[1];
-        if($secondMessage!="" && $secondMessage!=$responsetext)
-        {
-          $responsetext .= " ".$response->CreationState->LabelData->Status->statusMessage[1];
-        }
-
-        $this->errors[] = $responsetext;
-      }
-      if($response->CreationState->StatusMessage)
-      {
-        foreach($response->CreationState->StatusMessage as $v)
-        {
-          $found = false;
-          if($this->errors && is_array($this->errors))
-          {
-            foreach($this->errors as $err)
-            {
-              if($err == $v)$found = true;
-            }
-          }
-          if(!$found) {
-            $this->errors[] = $v;
-          }
-        }
-      }
-
-      return false;
-
-    }
-
-    if($api22)
-    {
-      $r['shipment_number']   = (String) $response->CreationState->LabelData->shipmentNumber;
-      $r['piece_number']      = (String) $response->CreationState->LabelData->licensePlate;
-      $r['label_url']         = (String) $response->CreationState->LabelData->labelUrl;
-      $r['gesamt'] = $response;
-    }else{      
-      $r['shipment_number']   = (String) $response->CreationState->ShipmentNumber->shipmentNumber;
-      $r['piece_number']      = (String) $response->CreationState->PieceInformation->PieceNumber->licensePlate;
-      $r['label_url']         = (String) $response->CreationState->Labelurl;
-    }
-    return $r;
-  }
-
-  function dumpRequest($fileName, $contents){
-    $dir = $this->app->getTmpFolder();
-    file_put_contents("{$dir}$fileName", $contents);
-  }
-
-  function GetExportDocDD($shippment_number, $api22 = false) {
-
-    $this->buildClient();
-
-    $shipment = array();
-
-    // Version
-    if($api22)
-    {
-      $shipment['Version']  = array('majorRelease' => '2', 'minorRelease' => '0');
-    }else{
-      $shipment['Version']  = array('majorRelease' => '1', 'minorRelease' => '0');
-    }
-
-    // Order
-    $shipment['ShipmentNumber'] = array('shipmentNumber'=>$shippment_number);
-    //$shipment['DocType'] = 'PDF';
-    $shipment['DocType'] = 'URL';
-    if(empty($this->client))return false;
-    // Fixme
-    try {
-      if($api22)
-        $response = $this->client->getExportDoc($shipment);
-      else
-        $response = $this->client->GetExportDocDD($shipment);
-    } catch(SoapFault $exception)
-    {
-      if(trim($exception->getMessage()) === 'Authorization Required')
-      {
-        $this->errors[] = 'Fehlerhafte DHL Versenden Zugangsdaten';
-        return false;
-      }
-      
-      $this->errors[] = 'Fehler von DHL Versenden: '.$exception->getMessage();
-      return false;
-    }
-    
-    if (((isset($response->status) && $response->status->StatusCode != 0) ||
-        (isset($response->Status) && $response->Status->statusCode != 0)) ||
-        is_soap_fault($response)
-      ) {
-      $this->errors[] = "<b>Fehlermeldung von DHL:</b>";
-      if (is_soap_fault($response)) {
-        $this->errors[] = $response->faultstring;
-      } else {
-
-        $this->errors[] = isset($response->status)?$response->status->StatusMessage:$response->Status->statusMessage;
-      }
-      return false;
-    }
-    $r = array();
-    if($api22)
-    {
-      $r['export_pdf']   = (String) $response->ExportDocData->exportDocData;
-      $r['export_url']   = (String) $response->ExportDocData->exportDocURL;
-    } else {
-      $r['export_pdf']   = (String) $response->ExportDocData->ExportDocPDFData;
-      $r['export_url']   = (String) $response->ExportDocData->ExportDocURL;
-    }
-    return $r;
-  }
-
-  private function buildAuthHeader() {
-
-    $head = $this->einstellungen;
-
-    $auth_params = array(
-        'user' => $this->einstellungen['user'],
-        'signature' => $this->einstellungen['signature'],
-        'type'  => 0
-
-        );
-    try{
-      $erg = new SoapHeader('http://dhl.de/webservice/cisbase','Authentification', $auth_params);
-    } catch(SoapFault $exception)
-    {
-      $erg = false;
-      $this->errors[] = "Authentifizierungsfehler: ".$exception->getMessage();
-    }
-    return $erg;
-  }
-}
diff --git a/www/lib/versandarten/sendcloud.php b/www/lib/versandarten/sendcloud.php
index a14e6225..263fbec8 100644
--- a/www/lib/versandarten/sendcloud.php
+++ b/www/lib/versandarten/sendcloud.php
@@ -9,6 +9,8 @@ use Xentral\Carrier\SendCloud\Data\SenderAddress;
 use Xentral\Carrier\SendCloud\Data\ShippingProduct;
 use Xentral\Carrier\SendCloud\Data\ShippingMethod;
 use Xentral\Carrier\SendCloud\SendcloudApiException;
+use Xentral\Modules\ShippingMethod\Model\CreateShipmentResult;
+use Xentral\Modules\ShippingMethod\Model\Product;
 
 require_once dirname(__DIR__) . '/class.versanddienstleister.php';
 
@@ -25,6 +27,11 @@ class Versandart_sendcloud extends Versanddienstleister
     $this->api = new SendCloudApi($this->settings->public_key, $this->settings->private_key);
   }
 
+  public function GetName(): string
+  {
+    return "SendCloud";
+  }
+
   protected function FetchOptionsFromApi()
   {
     if (isset($this->options))
@@ -49,13 +56,6 @@ class Versandart_sendcloud extends Versanddienstleister
     $this->options['products'][0] = '';
     $this->options['selectedProduct'] = $shippingProducts[$this->settings->shipping_product] ?? [];
     natcasesort($this->options['products']);
-    $this->options['customs_shipment_types'] = [
-        0 => 'Geschenk',
-        1 => 'Dokumente',
-        2 => 'Kommerzielle Waren',
-        3 => 'Erprobungswaren',
-        4 => 'Rücksendung'
-    ];
   }
 
   public function AdditionalSettings(): array
@@ -66,102 +66,77 @@ class Versandart_sendcloud extends Versanddienstleister
         'private_key' => ['typ' => 'text', 'bezeichnung' => 'API Private Key:'],
         'sender_address' => ['typ' => 'select', 'bezeichnung' => 'Absender-Adresse:', 'optionen' => $this->options['senders']],
         'shipping_product' => ['typ' => 'select', 'bezeichnung' => 'Versand-Produkt:', 'optionen' => $this->options['products']],
-        'default_customs_shipment_type' => ['typ' => 'select', 'bezeichnung' => 'Sendungsart:', 'optionen' => $this->options['customs_shipment_types']],
     ];
   }
 
-  public function Paketmarke(string $target, string $docType, int $docId): void
+  public function CreateShipment(object $json, array $address): CreateShipmentResult
   {
-    $address = $this->GetAdressdaten($docId, $docType);
-
-    if (isset($_SERVER['HTTP_CONTENT_TYPE']) && ($_SERVER['HTTP_CONTENT_TYPE'] === 'application/json')) {
-      $json = json_decode(file_get_contents('php://input'));
-      $response = [];
-      if ($json->submit == 'print') {
-        header('Content-Type: application/json');
-        $parcel = new ParcelCreation();
-        $parcel->SenderAddressId = $this->settings->sender_address;
-        $parcel->ShippingMethodId = $json->method;
-        $parcel->Name = $json->l_name;
-        $parcel->CompanyName = $json->l_companyname;
-        $parcel->Country = $json->land;
-        $parcel->PostalCode = $json->plz;
-        $parcel->City = $json->ort;
-        $parcel->Address = $json->strasse;
-        $parcel->Address2 = $json->l_address2;
-        $parcel->HouseNumber = $json->hausnummer;
-        $parcel->EMail = $json->email;
-        $parcel->Telephone = $json->telefon;
-        $parcel->CountryState = $json->bundesland;
-        $parcel->CustomsInvoiceNr = $json->invoice_number;
-        $parcel->CustomsShipmentType = $json->sendungsart;
-        $parcel->TotalInsuredValue = $json->total_insured_value;
-        $parcel->OrderNumber = $json->order_number;
-        foreach ($json->positions as $pos) {
-          $item = new ParcelItem();
-          $item->HsCode = $pos->zolltarifnummer;
-          $item->Description = $pos->bezeichnung;
-          $item->Quantity = $pos->menge;
-          $item->OriginCountry = $pos->herkunftsland;
-          $item->Price = $pos->zolleinzelwert;
-          $item->Weight = $pos->zolleinzelgewicht * 1000;
-          $parcel->ParcelItems[] = $item;
-        }
-        $parcel->Weight = floatval($json->weight) * 1000;
-        try {
-          $result = $this->api->CreateParcel($parcel);
-          if ($result instanceof ParcelResponse) {
-            $sql = "INSERT INTO versand 
-              (adresse, lieferschein, versandunternehmen, gewicht, tracking, tracking_link, anzahlpakete) 
-              VALUES 
-              ({$address['addressId']}, {$address['lieferscheinId']}, '$this->type',
-               '$json->weight', '$result->TrackingNumber', '$result->TrackingUrl', 1)";
-            $this->app->DB->Insert($sql);
-            $response['messages'][] = ['class' => 'info', 'text' => "Paketmarke wurde erfolgreich erstellt: $result->TrackingNumber"];
-
-            $doc = $result->GetDocumentByType(Document::TYPE_LABEL);
-            $filename = $this->app->erp->GetTMP() . join('_', ['Sendcloud', $doc->Type, $doc->Size, $result->TrackingNumber]) . '.pdf';
-            file_put_contents($filename, $this->api->DownloadDocument($doc));
-            $this->app->printer->Drucken($this->labelPrinterId, $filename);
-
-            $doc = $result->GetDocumentByType(Document::TYPE_CN23);
-            $filename = $this->app->erp->GetTMP() . join('_', ['Sendcloud', $doc->Type, $doc->Size, $result->TrackingNumber]) . '.pdf';
-            file_put_contents($filename, $this->api->DownloadDocument($doc));
-            $this->app->printer->Drucken($this->documentPrinterId, $filename);
-          } else {
-            $response['messages'][] = ['class' => 'error', 'text' => $result];
-          }
-          echo json_encode($response);
-        } catch (SendcloudApiException $e) {
-          $this->app->Tpl->addMessage('error', $e->getMessage());
-        }
-        $this->app->ExitXentral();
-      }
+    $parcel = new ParcelCreation();
+    $parcel->SenderAddressId = $this->settings->sender_address;
+    $parcel->ShippingMethodId = $json->product;
+    $parcel->Name = $json->name;
+    $parcel->CompanyName = $json->companyname;
+    $parcel->Country = $json->country;
+    $parcel->PostalCode = $json->zip;
+    $parcel->City = $json->city;
+    $parcel->Address = $json->street;
+    $parcel->Address2 = $json->address2;
+    $parcel->HouseNumber = $json->streetnumber;
+    $parcel->EMail = $json->email;
+    $parcel->Telephone = $json->phone;
+    $parcel->CountryState = $json->state;
+    $parcel->CustomsInvoiceNr = $json->invoice_number;
+    $parcel->CustomsShipmentType = $json->shipment_type;
+    $parcel->TotalInsuredValue = $json->total_insured_value;
+    $parcel->OrderNumber = $json->order_number;
+    foreach ($json->positions as $pos) {
+      $item = new ParcelItem();
+      $item->HsCode = $pos->zolltarifnummer;
+      $item->Description = $pos->bezeichnung;
+      $item->Quantity = $pos->menge;
+      $item->OriginCountry = $pos->herkunftsland;
+      $item->Price = $pos->zolleinzelwert;
+      $item->Weight = $pos->zolleinzelgewicht * 1000;
+      $parcel->ParcelItems[] = $item;
     }
+    $parcel->Weight = floatval($json->weight) * 1000;
+    $ret = new CreateShipmentResult();
+    try {
+      $result = $this->api->CreateParcel($parcel);
+      if ($result instanceof ParcelResponse) {
+        $ret->Success = true;
+        $ret->TrackingNumber = $result->TrackingNumber;
+        $ret->TrackingUrl = $result->TrackingUrl;
 
-    $address['l_name'] = empty(trim($address['ansprechpartner'])) ? trim($address['name']) : trim($address['ansprechpartner']);
-    $address['l_companyname'] = !empty(trim($address['ansprechpartner'])) ? trim($address['name']) : '';
-    $address['l_address2'] = join(';', array_filter([
-        $address['abteilung'],
-        $address['unterabteilung'],
-        $address['adresszusatz']
-    ], fn(string $item) => !empty(trim($item))));
+        $doc = $result->GetDocumentByType(Document::TYPE_LABEL);
+        $ret->Label = $this->api->DownloadDocument($doc);
 
+        $doc = $result->GetDocumentByType(Document::TYPE_CN23);
+        $ret->ExportDocuments = $this->api->DownloadDocument($doc);
+      } else {
+        $ret->Errors[] = $result;
+      }
+    } catch (SendcloudApiException $e) {
+      $ret->Errors[] = $e->getMessage();
+    }
+    return $ret;
+  }
+
+  public function GetShippingProducts(): array
+  {
     $this->FetchOptionsFromApi();
     /** @var ShippingProduct $product */
     $product = $this->options['selectedProduct'];
-    $methods = [];
+    $result = [];
     /** @var ShippingMethod $item */
-    foreach ($product->ShippingMethods as $item)
-      $methods[$item->Id] = $item->Name;
-    $address['method'] = array_key_first($methods);
-    $address['sendungsart'] = $this->settings->default_customs_shipment_type;
-
-    $this->app->Tpl->Set('JSON', json_encode($address));
-    $this->app->Tpl->Set('JSON_COUNTRIES', json_encode($this->app->erp->GetSelectLaenderliste()));
-    $this->app->Tpl->Set('JSON_METHODS', json_encode($methods));
-    $this->app->Tpl->Set('JSON_CUSTOMS_SHIPMENT_TYPES', json_encode($this->options['customs_shipment_types']));
-    $this->app->Tpl->Parse($target, 'versandarten_sendcloud.tpl');
+    foreach ($product->ShippingMethods as $item) {
+      $p = new Product();
+      $p->Id = $item->Id;
+      $p->Name = $item->Name;
+      $result[] = $p;
+    }
+    return $result;
   }
 
+
 }
\ No newline at end of file
diff --git a/xentral_autoloader.php b/xentral_autoloader.php
index 468e4ded..7b0633a9 100644
--- a/xentral_autoloader.php
+++ b/xentral_autoloader.php
@@ -66,7 +66,6 @@ function xentral_autoloader($class) {
     'ICS'=>__DIR__.'/www/plugins/class.ics.php',
     'USTID'=>__DIR__.'/www/lib/class.ustid.php',
     'phpprint'=>__DIR__.'/www/plugins/php-print.php',
-    'DHLBusinessShipment'=>__DIR__.'/www/lib/class.intraship.php',
     'Navigation'=>__DIR__.'/www/lib/class.navigation_edit.php',
     'GoShipment'=>__DIR__.'/www/lib/class.go.php',
     'UPSShipment'=>__DIR__.'/www/lib/class.ups.php',