fix: email data at order confirmation mail

locale.xml

@@ -851,6 +851,27 @@
             <de><![CDATA[Zur Kasse]]></de>
             <en><![CDATA[Checkout]]></en>
         </locale>
+
+        <locale name="mail.order.confirmation.delivery.title">
+            <de><![CDATA[Lieferadresse]]></de>
+            <en><![CDATA[Delivery address]]></en>
+        </locale>
+        <locale name="mail.order.confirmation.shipping.title">
+            <de><![CDATA[Versand]]></de>
+            <en><![CDATA[Shipping]]></en>
+        </locale>
+        <locale name="mail.order.confirmation.payment.title">
+            <de><![CDATA[Zahlungsart]]></de>
+            <en><![CDATA[Payment]]></en>
+        </locale>
+        <locale name="mail.order.confirmation.invoice.title">
+            <de><![CDATA[Rechnungsadresse]]></de>
+            <en><![CDATA[Invoice address]]></en>
+        </locale>
+        <locale name="mail.order.confirmation.details" html="true">
+            <de><![CDATA[]]></de>
+            <en><![CDATA[]]></en>
+        </locale>
     </groups>
 
     <groups name="quiqqer/order" datatype="js">

src/QUI/ERP/Order/Mail.php

@@ -43,9 +43,11 @@ public static function sendOrderConfirmationMail(Order $Order)
             'template'  => 'OrderLikeBasket'
         ]);
 
+        $Address  = null;
         $Customer = $Order->getCustomer();
-        $user     = $Customer->getName();
-        $user     = \trim($user);
+
+        $user = $Customer->getName();
+        $user = \trim($user);
 
         if (empty($user)) {
             $Address = $Customer->getAddress();
@@ -74,10 +76,25 @@ public static function sendOrderConfirmationMail(Order $Order)
         $Articles = $Order->getArticles()->toUniqueList();
         $Articles->hideHeader();
 
+        $Shipping        = null;
+        $DeliveryAddress = null;
+
+        if ($Order->getShipping()) {
+            $Shipping        = QUI\ERP\Shipping\Shipping::getInstance()->getShippingByObject($Order);
+            $DeliveryAddress = $Shipping->getAddress();
+        }
+
         $Engine->assign([
+            'Shipping'        => $Shipping,
+            'DeliveryAddress' => $DeliveryAddress,
+            'InvoiceAddress'  => $Order->getInvoiceAddress(),
+            'Payment'         => $Order->getPayment(),
+
             'Order'    => $Order,
             'Articles' => $Articles,
-            'message'  => QUI::getLocale()->get('quiqqer/order', 'order.confirmation.body', [
+            'Address'  => $Address,
+
+            'message' => QUI::getLocale()->get('quiqqer/order', 'order.confirmation.body', [
                 'orderId'  => $Order->getPrefixedId(),
                 'user'     => $user,
                 'username' => $Customer->getUsername(),

src/QUI/ERP/Order/MailTemplates/orderConfirmation.html

-<style>
-    .articles-article-header-unitprice,
-    .articles-article-unitprice {
-        display: none;
-    }
-</style>
-
 {template_event name="quiqqer::order::mail::orderConfirmation::begin" Order=$Order Articles=$Articles}
 
 {$message}
 
+
+{if $InvoiceAddress}
+<div class="">
+    <h4>{locale group="quiqqer/order" var="mail.order.confirmation.invoice.title"}</h4>
+    {$InvoiceAddress->render()}
+</div>
+{/if}
+
+{if $DeliveryAddress}
+<div class="">
+    <h4>{locale group="quiqqer/order" var="mail.order.confirmation.delivery.title"}</h4>
+    {$DeliveryAddress->render()}
+</div>
+{/if}
+
 <br/>
 <br/>
 
 {$Articles->renderForMail()}
 
-{template_event name="quiqqer::order::mail::orderConfirmation::end" Order=$Order Articles=$Articles}
\ No newline at end of file
+<div style="clear: both; width: 100%"></div>
+
+{template_event name="quiqqer::order::mail::orderConfirmation::middle" Order=$Order Articles=$Articles}
+
+{if $Shipping}
+<div style="clear: both;">
+    <h4>{locale group="quiqqer/order" var="mail.order.confirmation.shipping.title"}</h4>
+    {$Shipping->getTitle()}
+</div>
+{/if}
+
+{if $Payment}
+<div class="">
+    <h4>{locale group="quiqqer/order" var="mail.order.confirmation.payment.title"}</h4>
+    {$Payment->getTitle()}
+</div>
+{/if}
+
+{template_event name="quiqqer::order::mail::orderConfirmation::end" Order=$Order Articles=$Articles}
+
+{locale group="quiqqer/order" var="mail.order.confirmation.details"}
\ No newline at end of file