Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Added Anschriftenzusatz to WarehouseEShop

Browse Source
This commit is contained in:
Luca Haid
2025-01-22 09:17:40 +01:00
parent 07b2f56dc6
commit a8f289f495
4 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
application/WarehouseEShopOrder/WarehouseEShopOrderController.php
View File

@@ -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',

2
application/WarehouseEShopOrder/WarehouseEShopOrderModel.php
View File

@@ -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;

4
public/js/pages/WarehouseEShop/WarehouseEShop.js
View File

@@ -14,7 +14,9 @@ Vue.component('warehouse-e-shop', {
// {text: 'Mehrere Adressen', value: 'multipleAddresses'},
]" sm row/>
<tt-input v-model="createOrderDialogData.extRef" label="Externe Referenz" sm row/>
<tt-input v-model="createOrderDialogData.deliveryAddressName" label="Name" sm row/>
<tt-input v-model="createOrderDialogData.deliveryAddressAdditional" label="Anschriftenzusatz" sm row/>
<tt-input v-model="createOrderDialogData.deliveryAddressLine" label="Straße" sm row/>
<tt-input v-model="createOrderDialogData.deliveryAddressPLZ" label="PLZ" sm row/>
<tt-input v-model="createOrderDialogData.deliveryAddressCity" label="Stadt" 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: '',

4
public/js/pages/WarehouseEShopOrder/WarehouseEShopOrder.js
View File

@@ -171,6 +171,10 @@ Vue.component('warehouse-e-shop-order', {
</button>
</template>
<template v-slot:deliveryaddressname="{ row }">
{{ row.deliveryAddressName }} {{ row.deliveryAddressAdditional ? '(' + row.deliveryAddressAdditional + ')' : '' }}
</template>
<template v-slot:create="{ row }">
{{ window.moment(row.create * 1000).format('DD.MM.YYYY HH:mm:ss') }}
</template>