From 26ff5ea0260247a9d1b774c1727e5b3828d6bdc3 Mon Sep 17 00:00:00 2001
From: Andreas Hnida <ah@mediendesign-hnida.de>
Date: Fri, 23 Feb 2024 10:23:15 +0000
Subject: [PATCH] Felder aus Organisation Bestellformular in Emailmessage
 aufgenommen.

---
 assets/scss/custom.scss |  2 +-
 public/php/message.php  | 30 +++++++++++++++++++++---------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/assets/scss/custom.scss b/assets/scss/custom.scss
index 2a4685d..8f01408 100755
--- a/assets/scss/custom.scss
+++ b/assets/scss/custom.scss
@@ -190,7 +190,7 @@ table .far {
   #formular button, #notification {
    width:400px;
     padding: 0.5rem 1rem;
-    margin-bottom:10px;
+    margin-bottom:10px!important;
     margin-top:10px;
     margin-left: auto;
     margin-right: auto;
diff --git a/public/php/message.php b/public/php/message.php
index e8e0922..d70603f 100644
--- a/public/php/message.php
+++ b/public/php/message.php
@@ -1,20 +1,32 @@
 <?php
 header('Access-Control-Allow-Origin: *'); // Erlaubt Zugriffe von jedem Ursprung
 header('Content-Type: application/json'); // Setzt den Content-Type der Antwort auf JSON
-
 function constructMessage() {
     $message = "Formular: " . "\n" . filter_input(INPUT_POST, 'formularart') . "\n\n\n\n";
-    $message .= "Geschlecht: " . "\n" . filter_input(INPUT_POST, 'gender') . "\n\n";
-    $message .= "Sprache: " . "\n" . filter_input(INPUT_POST, 'sprache') . "\n\n";
-    $message .= "Nachname: " . "\n" . filter_input(INPUT_POST, 'name') . "\n\n";
-    $message .= "Vorname: " . "\n" . filter_input(INPUT_POST, 'vorname') . "\n\n";
+    $organisation = filter_input(INPUT_POST, 'organisation');
+    if (isset($organisation)) {
+        $message .= "Organisation: " . "\n" . $organisation . "\n\n";
+    }
+    $message .= "ZSR Nummer: " . "\n" . filter_input(INPUT_POST, 'zsr_nummer') . "\n\n";
+    $message .= "EAN / GLN-Nr: " . "\n" . filter_input(INPUT_POST, 'ean_nummer') . "\n\n";
+    $message .= "Telefon: " . "\n" . filter_input(INPUT_POST, 'telefon') . "\n\n";
+    $message .= "Email: " . "\n" . filter_input(INPUT_POST, 'email') . "\n\n\n";
     $message .= "Strasse: " . "\n" . filter_input(INPUT_POST, 'strasse') . "\n\n";
     $message .= "PLZ Ort: " . "\n" . filter_input(INPUT_POST, 'plz_ort') . "\n\n";
-    $message .= "Telefon: " . "\n" . filter_input(INPUT_POST, 'telefon') . "\n\n";
-    $message .= "Email: " . "\n" . filter_input(INPUT_POST, 'email') . "\n\n";
-    $message .= "ZSR Nummer: " . "\n" . filter_input(INPUT_POST, 'zsr_nummer') . "\n\n";
-    $bestehend = filter_input(INPUT_POST, 'bestehend');
+    $message .= "Geschlecht: " . "\n" . filter_input(INPUT_POST, 'gender') . "\n\n";
+    $message .= "Sprache: " . "\n" . filter_input(INPUT_POST, 'sprache') . "\n\n\n";
+    $message .= "Nachname: " . "\n" . filter_input(INPUT_POST, 'name') . "\n\n";
+    $message .= "Vorname: " . "\n" . filter_input(INPUT_POST, 'vorname') . "\n\n";
+    $message .= "Ansprechpartner Telefon: " . "\n" . filter_input(INPUT_POST, 'ansprechpartner_telefon') . "\n\n";
+    $message .= "Ansprechpartner Email: " . "\n" . filter_input(INPUT_POST, 'ansprechpartner_email') . "\n\n";
 
+    // Form inputs von Organisation
+    $organisationPaket = filter_input(INPUT_POST, 'organisation-paket');
+    if (isset($organisationPaket)) {
+    $message .= "Organisation Paket: " . "\n" . $organisationPaket . "\n\n";
+    }
+
+    $bestehend = filter_input(INPUT_POST, 'bestehend');
     // Form inputs von Erstbestellung
     if (isset($bestehend)) {
         $message .= "Wünschen Sie einen neuer Server oder den Zugang zu einem bestehenden Team-Server?: " . "\n" . $bestehend . "\n\n";