From d9d3dc8897c824252e4cf45e3c73d9d4fb627207 Mon Sep 17 00:00:00 2001
From: bettina <bettina.rasberger@rabe-web.ch>
Date: Fri, 28 Jun 2024 16:53:49 +0200
Subject: [PATCH] edit message mail

---
 static/php/ajaxmail.php |  4 ++--
 static/php/message.php  | 29 +++++++++++++++--------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/static/php/ajaxmail.php b/static/php/ajaxmail.php
index 5985a32..8f6f676 100644
--- a/static/php/ajaxmail.php
+++ b/static/php/ajaxmail.php
@@ -39,6 +39,7 @@ try {
     $mail->setFrom('order@verua.swiss', 'VeruA AG'); // Sender address
     $mail->addAddress('support@verua.ch', 'VeruA AG'); // Add another recipient
 //    $mail->addBCC('ah@mediendesign-hnida.de'); // Add bounce email address as BCC
+    $mail->addBCC('rabe@verua.swiss'); // Add bounce email address as BCC	
  
 
     // Content Mail to support
@@ -61,11 +62,10 @@ try {
         $customerSubject = ($lang == "DE" ? 'Danke für Ihre Bestellung bei der VeruA AG' : 'Merci pour votre commande chez VeruA AG' );
         $encodedSubject = mb_encode_mimeheader($customerSubject, "UTF-8", "Q");
 
-        $customerMessage = constructCustomerMessage($message, $lang);
+        $customerMessage = constructCustomerMessage($message, $lang, $name);
 
         $mail->clearAddresses();
 	$mail->ClearBCCs();
-	$mail->addBCC('rabe@verua.swiss'); // Add bounce email address as BCC
         $mail->addAddress($customerEmail);
         $mail->Subject = $encodedSubject;
 //        $mail->Body = nl2br(htmlspecialchars($customerMessage));
diff --git a/static/php/message.php b/static/php/message.php
index 546d37b..1332b6b 100644
--- a/static/php/message.php
+++ b/static/php/message.php
@@ -213,35 +213,36 @@ function constructMessage()
 	return $message;
 }
 
-function constructCustomerMessage($bestellMessage, $langForm)
+function constructCustomerMessage($bestellMessage, $langForm, $name)
 {
 	if ( $langForm == "FR" )
 	{	
-		$message .= "Chers Mesdames, Chers Messieurs" . "<br/><br/>";
+		$message .= "Grüezi " . $name .  "<br/><br/>";
 		$message .= "Merci pour votre commande. Nous vous contacterons dès que possible." . "<br/><br/>";
-		$message .= "Cordialement" . "<br/>";
-		$message .= "Votre équipe VeruA" . "<br/><br/><br/>";
+		$messageEnd = "Cordialement" . "<br/>";
+		$messageEnd .= "Votre équipe VeruA" . "<br/><hr/>";
 		$infoCheck = "Voici à nouveau vos informations pour vérification. Si vous trouvez encore une erreur, veuillez nous en informer :" . "<br/><br/>";
 	} else
 	{
-		$message = "Sehr geehrte Damen und Herren" . "<br/>";
+		$message = "Grüezi " . $name . "<br/>";
 		$message .= "Vielen Dank für Ihre Bestellung. Wir werden uns so schnell wie möglich bei Ihnen melden." . "<br/><br/>";
-		$message .= "Freundliche Grüsse" . "<br/>";
-		$message .= "Ihr VeruA Team" . "<br/><br/><br/>";
+		$messageEnd = "Freundliche Grüsse" . "<br/>";
+		$messageEnd .= "Ihr VeruA Team" . "<br/><hr/>";
 		$infoCheck = "Hier noch einmal Ihre Angaben für Sie zur Überprüfung. Sollten Sie noch einen Fehler finden, informieren Sie uns bitte:" . "<br/><br/>";
 	}
+
+	$message .= $infoCheck;
+
+	$message .= $bestellMessage;
+	
+	$message .= $messageEnd;
+		
 	$message .= "VeruA AG" . "<br/>";
 	$message .= "Steinerstrass 19" . "<br/>";
 	$message .= "CH-8253 Diessenhofen" . "<br/>";
 	$message .= "079 393 86 83" . "<br/>";
 	$message .= "kontakt@verua.swiss" . "<br/>";
-	$message .= "www.verua.swiss" . "<br/><br/>";
-
-	$message .= "------------------------------------------------------------" . "<br/><br/>";
-	$message .= $infoCheck;
-
-
-	$message .= $bestellMessage;
+	$message .= "www.verua.swiss" . "<br/><br/>";		
 
 	return $message;
 }
\ No newline at end of file