From f5dde09ea5eca1e930bae63b46fb13875a6dabb2 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca@haid.in>
Date: Thu, 12 Sep 2024 08:36:14 +0200
Subject: [PATCH] added new et ref field for eshop

---
 .../WarehouseEShopOrderController.php         |  8 ++++---
 .../WarehouseEShopOrderModel.php              |  2 ++
 ...912080700_warehouse_add_e_shop_ext_ref.php | 22 +++++++++++++++++++
 .../js/pages/WarehouseEShop/WarehouseEShop.js |  4 +++-
 4 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 db/migrations/20240912080700_warehouse_add_e_shop_ext_ref.php

diff --git a/application/WarehouseEShopOrder/WarehouseEShopOrderController.php b/application/WarehouseEShopOrder/WarehouseEShopOrderController.php
index 36c6c7d18..b09717d9b 100644
--- a/application/WarehouseEShopOrder/WarehouseEShopOrderController.php
+++ b/application/WarehouseEShopOrder/WarehouseEShopOrderController.php
@@ -5,6 +5,7 @@ class WarehouseEShopOrderController extends TTCrud {
     protected bool $createText = false;
 
     protected array $columns = [['key' => 'id', 'text' => 'ID', 'modal' => false],
+                                ['key' => 'extRef', 'text' => 'Externe Referenz', 'required' => true],
                                 ['key' => 'status',
                                  'text' => 'Status',
                                  'required' => true,
@@ -54,7 +55,7 @@ class WarehouseEShopOrderController extends TTCrud {
             return ['value' => intval($user->id), 'text' => $user->name];
         }, UserModel::search());
 
-        $this->columns[8]['modal']['items'] = $users;
+        $this->columns[9]['modal']['items'] = $users;
     }
 
     protected function singleOrderEmailAction() {
@@ -219,6 +220,7 @@ class WarehouseEShopOrderController extends TTCrud {
         Helper::validateArray($json, $this->getCheckArray());
 
         $id = WarehouseEShopOrderModel::create(['status' => 'new',
+                                                'extRef' => $json['extRef'],
                                                 'deliveryMode' => $json['deliveryMode'],
                                                 'deliveryAddressName' => $json['deliveryAddressName'],
                                                 'deliveryAddressLine' => $json['deliveryAddressLine'],
@@ -249,7 +251,7 @@ class WarehouseEShopOrderController extends TTCrud {
         $subjectId = str_pad($id, 3, '0', STR_PAD_LEFT);
 
         // create email body with all items (use $shoppingCart)
-        $body = "Bestellung #$subjectId\n\n";
+        $body = "Bestellung #$subjectId\n\nIhre Referenz: " . $json['extRef'] . "\n\n";
         $body .= "Lieferadresse:\n";
         $body .= $json['deliveryAddressName'] . "\n";
         $body .= $json['deliveryAddressLine'] . "\n";
@@ -266,7 +268,7 @@ class WarehouseEShopOrderController extends TTCrud {
 
         foreach (["office@xinon.at", $user->email] as $emailAddr) {
             $email = new Emailnotification();
-            $email->setSubject("Bestellbestätigung Bestellung #$subjectId");
+            $email->setSubject("Bestellbestätigung Bestellung #$subjectId - Referenz: " . $json['extRef']);
             $email->setBody($body);
             $email->setFrom(TT_OUTGOING_EMAIL_2FA, TT_OUTGOING_EMAIL_2FA);
             $email->setTo($emailAddr);
diff --git a/application/WarehouseEShopOrder/WarehouseEShopOrderModel.php b/application/WarehouseEShopOrder/WarehouseEShopOrderModel.php
index fcf5bd215..b8dcdd974 100644
--- a/application/WarehouseEShopOrder/WarehouseEShopOrderModel.php
+++ b/application/WarehouseEShopOrder/WarehouseEShopOrderModel.php
@@ -1,4 +1,5 @@
 <?php
+//TODO: fix phpdoc
 /**
  * @property int $id
  * @property 'new'|'accepted'|'sent'|'done' $status
@@ -13,6 +14,7 @@
 
 class WarehouseEShopOrderModel extends TTCrudBaseModel {
     public int $id;
+    public string $extRef;
     public string $status;
     public string $deliveryMode;
     public string $deliveryAddressName;
diff --git a/db/migrations/20240912080700_warehouse_add_e_shop_ext_ref.php b/db/migrations/20240912080700_warehouse_add_e_shop_ext_ref.php
new file mode 100644
index 000000000..5c01e0b0e
--- /dev/null
+++ b/db/migrations/20240912080700_warehouse_add_e_shop_ext_ref.php
@@ -0,0 +1,22 @@
+<?php /** @noinspection ALL */
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class WarehouseAddEShopExtRef extends AbstractMigration {
+    public function up(): void {
+        if ($this->getEnvironment() == "thetool") {
+            $WarehouseEShopOrder = $this->table("WarehouseEShopOrder");
+            $WarehouseEShopOrder->addColumn("ext_ref", "string", ["limit" => 255, "null" => true]);
+            $WarehouseEShopOrder->update();
+        }
+    }
+
+    public function down(): void {
+        if ($this->getEnvironment() == "thetool") {
+            $WarehouseEShopOrder = $this->table("WarehouseEShopOrder");
+            $WarehouseEShopOrder->removeColumn("ext_ref");
+            $WarehouseEShopOrder->update();
+        }
+    }
+}
diff --git a/public/js/pages/WarehouseEShop/WarehouseEShop.js b/public/js/pages/WarehouseEShop/WarehouseEShop.js
index 23bbe02b1..e74ffa322 100644
--- a/public/js/pages/WarehouseEShop/WarehouseEShop.js
+++ b/public/js/pages/WarehouseEShop/WarehouseEShop.js
@@ -56,7 +56,8 @@ Vue.component('warehouse-e-shop', {
                     <tt-select v-model="createOrderDialogData.deliveryMode" label="Adresse" :options="[
                         {text: 'Einzelne Adresse', value: 'singleAddress'},
                         // {text: 'Mehrere Adressen', value: 'multipleAddresses'},
-                    ]" sm row/>
+                    ]" 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.deliveryAddressLine" label="Straße" sm row/>
                     <tt-input v-model="createOrderDialogData.deliveryAddressPLZ" label="PLZ" sm row/>
@@ -113,6 +114,7 @@ Vue.component('warehouse-e-shop', {
                 this.shoppingCart = [];
                 this.createOrderDialogData = {
                     deliveryMode: 'singleAddress',
+                    extRef: '',
                     deliveryAddressName: '',
                     deliveryAddressLine: '',
                     deliveryAddressPLZ: '',