From 5c0acfe43b4d14bd21a1b874595b56b917b2120e Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Mon, 12 May 2025 12:53:03 +0200
Subject: [PATCH] added new neccesary fields

---
 .../WarehouseEShopOrderController.php         |  2 +
 .../WarehouseEShopOrderModel.php              |  2 +
 .../20250512130000_warehouse_modify_22.php    | 41 +++++++++++++++++++
 .../js/pages/WarehouseEShop/WarehouseEShop.js | 10 ++++-
 4 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 db/migrations/20250512130000_warehouse_modify_22.php

diff --git a/application/WarehouseEShopOrder/WarehouseEShopOrderController.php b/application/WarehouseEShopOrder/WarehouseEShopOrderController.php
index a555c49d1..7a9bfac78 100644
--- a/application/WarehouseEShopOrder/WarehouseEShopOrderController.php
+++ b/application/WarehouseEShopOrder/WarehouseEShopOrderController.php
@@ -12,6 +12,8 @@ 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' => 'deliveryAddressMail', 'text' => 'E-Mail', 'required' => true],
+        ['key' => 'deliveryAddressPhone', 'text' => 'Nummer', '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}$/'],
diff --git a/application/WarehouseEShopOrder/WarehouseEShopOrderModel.php b/application/WarehouseEShopOrder/WarehouseEShopOrderModel.php
index c9868567b..91e03f16f 100644
--- a/application/WarehouseEShopOrder/WarehouseEShopOrderModel.php
+++ b/application/WarehouseEShopOrder/WarehouseEShopOrderModel.php
@@ -19,6 +19,8 @@ class WarehouseEShopOrderModel extends TTCrudBaseModel {
     public string $status;
     public string $deliveryMode;
     public string $deliveryAddressName;
+    public ?string $deliveryAddressMail;
+    public ?string $deliveryAddressPhone;
     public ?string $deliveryAddressAdditional;
     public string $deliveryAddressLine;
     public string $deliveryAddressPLZ;
diff --git a/db/migrations/20250512130000_warehouse_modify_22.php b/db/migrations/20250512130000_warehouse_modify_22.php
new file mode 100644
index 000000000..3d3a2e9cf
--- /dev/null
+++ b/db/migrations/20250512130000_warehouse_modify_22.php
@@ -0,0 +1,41 @@
+<?php /** @noinspection ALL */
+declare(strict_types = 1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class WarehouseModify22 extends AbstractMigration {
+    public function up(): void {
+        if ($this->getEnvironment() == "thetool") {
+            $WarehouseEShopOrder = $this->table("WarehouseEShopOrder");
+
+            if (!$WarehouseEShopOrder->hasColumn("deliveryAddressMail")) {
+                $WarehouseEShopOrder
+                    ->addColumn("deliveryAddressMail", "string", ["limit" => 255, "null" => true])
+                    ->update();
+            }
+
+            if (!$WarehouseEShopOrder->hasColumn("deliveryAddressPhone")) {
+                $WarehouseEShopOrder
+                    ->addColumn("deliveryAddressPhone", "string", ["limit" => 255, "null" => true])
+                    ->update();
+            }
+        }
+    }
+
+    public function down(): void {
+        if ($this->getEnvironment() == "thetool") {
+            $WarehouseEShopOrder = $this->table("WarehouseEShopOrder");
+            if ($WarehouseEShopOrder->hasColumn("deliveryAddressMail")) {
+                $WarehouseEShopOrder
+                    ->removeColumn("deliveryAddressMail")
+                    ->update();
+            }
+
+            if ($WarehouseEShopOrder->hasColumn("deliveryAddressPhone")) {
+                $WarehouseEShopOrder
+                    ->removeColumn("deliveryAddressPhone")
+                    ->update();
+            }
+        }
+    }
+}
diff --git a/public/js/pages/WarehouseEShop/WarehouseEShop.js b/public/js/pages/WarehouseEShop/WarehouseEShop.js
index 3cf7deda8..5a6168991 100644
--- a/public/js/pages/WarehouseEShop/WarehouseEShop.js
+++ b/public/js/pages/WarehouseEShop/WarehouseEShop.js
@@ -14,8 +14,10 @@ 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.deliveryAddressMail" label="E-Mail" sm row/>
+                    <tt-input v-model="createOrderDialogData.deliveryAddressPhone" label="Nummer" 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/>
@@ -51,6 +53,8 @@ Vue.component('warehouse-e-shop', {
                 deliveryMode: 'singleAddress',
                 extRef: '',
                 deliveryAddressName: '',
+                deliveryAddressMail: '',
+                deliveryAddressPhone: '',
                 deliveryAddressLine: '',
                 deliveryAddressPLZ: '',
                 deliveryAddressCity: '',
@@ -67,6 +71,8 @@ Vue.component('warehouse-e-shop', {
                 deliveryMode: this.createOrderDialogData.deliveryMode,
                 extRef: this.createOrderDialogData.extRef?.trim(),
                 deliveryAddressName: this.createOrderDialogData.deliveryAddressName?.trim(),
+                deliveryAddressMail: this.createOrderDialogData.deliveryAddressMail?.trim(),
+                deliveryAddressPhone: this.createOrderDialogData.deliveryAddressPhone?.trim(),
                 deliveryAddressAdditional: this.createOrderDialogData.deliveryAddressAdditional?.trim(),
                 deliveryAddressLine: this.createOrderDialogData.deliveryAddressLine?.trim(),
                 deliveryAddressPLZ: this.createOrderDialogData.deliveryAddressPLZ?.trim(),
@@ -79,6 +85,8 @@ Vue.component('warehouse-e-shop', {
                     deliveryMode: 'singleAddress',
                     extRef: '',
                     deliveryAddressName: '',
+                    deliveryAddressMail: '',
+                    deliveryAddressPhone: '',
                     deliveryAddressAdditional: '',
                     deliveryAddressLine: '',
                     deliveryAddressPLZ: '',