From 4305c9f4738e63dca56084c77d6b95eade9925b5 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca@haid.in>
Date: Tue, 10 Sep 2024 13:55:07 +0200
Subject: [PATCH] fixed utf8 encoding in email

---
 .../WarehouseEShopOrderController.php           | 17 +++++++++++++++--
 .../WarehouseEShopOrder/WarehouseEShopOrder.js  |  1 +
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/application/WarehouseEShopOrder/WarehouseEShopOrderController.php b/application/WarehouseEShopOrder/WarehouseEShopOrderController.php
index 41e1b5bb5..962daf068 100644
--- a/application/WarehouseEShopOrder/WarehouseEShopOrderController.php
+++ b/application/WarehouseEShopOrder/WarehouseEShopOrderController.php
@@ -88,7 +88,8 @@ class WarehouseEShopOrderController extends TTCrud {
 //            $email->setTo('ftth-versand@triotronik.com');
             $email->setTo('luca.haid@xinon.eu');
             $csvContent = $this->CSVExportNewOrdersMarkAcceptedAction(true, [$id]);
-            $email->addAttachment(null, $csvContent, "Bestellung_$paddedId.csv", "text/csv");
+            $csvContent = utf8_decode($csvContent);
+            $email->addAttachment(null, $csvContent, "Bestellung_$paddedId.csv", "text/csv", "attachment", "base64", "utf-8");
             $email->send();
             self::returnJson(['success' => true, 'message' => 'E-Mail wurde versendet']);
         }
@@ -222,7 +223,19 @@ class WarehouseEShopOrderController extends TTCrud {
         }
 
         if (empty($orders)) {
-            self::returnJson(['success' => false, 'message' => 'Keine neuen Bestellungen']);
+            $msg = '';
+            switch (count($orderIds)) {
+                case 0:
+                    $msg = 'Keine neuen Bestellungen';
+                    break;
+                case 1:
+                    $msg = 'Keine neue Bestellung mit dieser ID gefunden';
+                    break;
+                default:
+                    $msg = 'Keine neuen Bestellungen mit diesen IDs gefunden';
+                    break;
+            }
+            self::returnJson(['success' => false, 'message' => $msg]);
             die();
         }
 
diff --git a/public/js/pages/WarehouseEShopOrder/WarehouseEShopOrder.js b/public/js/pages/WarehouseEShopOrder/WarehouseEShopOrder.js
index adda88c16..c284c63b8 100644
--- a/public/js/pages/WarehouseEShopOrder/WarehouseEShopOrder.js
+++ b/public/js/pages/WarehouseEShopOrder/WarehouseEShopOrder.js
@@ -69,6 +69,7 @@ Vue.component('warehouse-e-shop-order', {
             } else {
                 window.notify('error', 'Ein Fehler ist aufgetreten');
             }
+            await this.$refs.table.$refs.table.fetchData();
         },
         async createCSVExportAndMarkAsAccepted() {
             const response = await axios.post(`${window['TT_CONFIG']['BASE_PATH']}/WarehouseEShopOrder/CSVExportNewOrdersMarkAccepted`);