diff --git a/application/WarehouseEShopOrder/WarehouseEShopOrderController.php b/application/WarehouseEShopOrder/WarehouseEShopOrderController.php
index e5701ae97..72c0fe1fc 100644
--- a/application/WarehouseEShopOrder/WarehouseEShopOrderController.php
+++ b/application/WarehouseEShopOrder/WarehouseEShopOrderController.php
@@ -12,6 +12,7 @@ class WarehouseEShopOrderController extends TTCrud {
['key' => 'shippingNoteStatus', 'text' => 'LS-Status', 'required' => false, 'modal' => false, 'table' => ['filter' => false, 'order' => false]],
['key' => 'deliveryMode', 'text' => 'Liefermodus', 'required' => true, 'modal' => ['type' => 'select', 'items' => [['value' => 'singleAddress', 'text' => 'Einzelne Adresse']]]],
['key' => 'deliveryAddressName', 'text' => 'Name', 'required' => true],
+ ['key' => 'deliveryAddressAdditional', 'text' => 'Anschriftenzusatz', 'required' => false, 'table' => false],
['key' => 'deliveryAddressLine', 'text' => 'Adresse', 'required' => true, 'required_length' => 4],
['key' => 'deliveryAddressPLZ', 'text' => 'PLZ', 'required' => true, 'regex' => '/^\d{4}$/'],
['key' => 'deliveryAddressCity', 'text' => 'Stadt', 'required' => true, 'required_length' => 3],
@@ -264,7 +265,7 @@ class WarehouseEShopOrderController extends TTCrud {
'Postleitzahl' => $order['deliveryAddressPLZ'],
'Ort' => $order['deliveryAddressCity'],
'Land' => 'AT',
- 'Anschriftenzusatz 1' => '',
+ 'Anschriftenzusatz 1' => $order['deliveryAddressAdditional'],
'Produkte' => $orderItemsStr];
WarehouseHistoryModel::create(['table' => 'WarehouseEShopOrder',
diff --git a/application/WarehouseEShopOrder/WarehouseEShopOrderModel.php b/application/WarehouseEShopOrder/WarehouseEShopOrderModel.php
index 015463f73..8f1c5b6fb 100644
--- a/application/WarehouseEShopOrder/WarehouseEShopOrderModel.php
+++ b/application/WarehouseEShopOrder/WarehouseEShopOrderModel.php
@@ -5,6 +5,7 @@
* @property 'new'|'accepted'|'sent'|'done' $status
* @property 'singleAddress'|'multipleAddresses' $deliveryMode
* @property string $deliveryAddressName
+ * @property string $deliveryAddressAdditional
* @property string $deliveryAddressLine
* @property string $deliveryAddressPLZ
* @property string $deliveryAddressCity
@@ -18,6 +19,7 @@ class WarehouseEShopOrderModel extends TTCrudBaseModel {
public string $status;
public string $deliveryMode;
public string $deliveryAddressName;
+ public string $deliveryAddressAdditional;
public string $deliveryAddressLine;
public string $deliveryAddressPLZ;
public string $deliveryAddressCity;
diff --git a/public/js/pages/WarehouseEShop/WarehouseEShop.js b/public/js/pages/WarehouseEShop/WarehouseEShop.js
index ceeafdad9..716fc3c6a 100644
--- a/public/js/pages/WarehouseEShop/WarehouseEShop.js
+++ b/public/js/pages/WarehouseEShop/WarehouseEShop.js
@@ -14,7 +14,9 @@ Vue.component('warehouse-e-shop', {
// {text: 'Mehrere Adressen', value: 'multipleAddresses'},
]" sm row/>
+
+
@@ -65,6 +67,7 @@ Vue.component('warehouse-e-shop', {
deliveryMode: this.createOrderDialogData.deliveryMode,
extRef: this.createOrderDialogData.extRef.trim(),
deliveryAddressName: this.createOrderDialogData.deliveryAddressName.trim(),
+ deliveryAddressAdditional: this.createOrderDialogData.deliveryAddressAdditional.trim(),
deliveryAddressLine: this.createOrderDialogData.deliveryAddressLine.trim(),
deliveryAddressPLZ: this.createOrderDialogData.deliveryAddressPLZ.trim(),
deliveryAddressCity: this.createOrderDialogData.deliveryAddressCity.trim(),
@@ -76,6 +79,7 @@ Vue.component('warehouse-e-shop', {
deliveryMode: 'singleAddress',
extRef: '',
deliveryAddressName: '',
+ deliveryAddressAdditional: '',
deliveryAddressLine: '',
deliveryAddressPLZ: '',
deliveryAddressCity: '',
diff --git a/public/js/pages/WarehouseEShopOrder/WarehouseEShopOrder.js b/public/js/pages/WarehouseEShopOrder/WarehouseEShopOrder.js
index d6cd8c89e..a66d6b0c5 100644
--- a/public/js/pages/WarehouseEShopOrder/WarehouseEShopOrder.js
+++ b/public/js/pages/WarehouseEShopOrder/WarehouseEShopOrder.js
@@ -171,6 +171,10 @@ Vue.component('warehouse-e-shop-order', {
+
+ {{ row.deliveryAddressName }} {{ row.deliveryAddressAdditional ? '(' + row.deliveryAddressAdditional + ')' : '' }}
+
+
{{ window.moment(row.create * 1000).format('DD.MM.YYYY HH:mm:ss') }}