From 0ea3f0e2019f9a5f2ff25f97fefb2ab26c1a19f9 Mon Sep 17 00:00:00 2001
From: MaxBUhe <mb@shopmodule.com>
Date: Thu, 11 Jun 2020 10:19:31 +0200
Subject: [PATCH] add: database require, nl2br

---
 .../documents/invoice/includingFiles/pdfPastThank.tpl  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl b/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl
index 476d247..e020a45 100644
--- a/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl
+++ b/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl
@@ -1,14 +1,14 @@
 [{block name="pdfPastThankFile"}]
     <table class="past_thank_width100 borderSpacingUnset paddingTop10">
         <tr><td class="paddingTop15 past_thank_width100 fontSize12">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USED_PAYMENTMETHOD"}] [{$payment->getFieldData('oxdesc')}]</td></tr>
+
     [{* +++++++Individueller Zahlungstext+++++++ *}]
-    [{if $order->oxorder__d3pdftextbestellbestaetigung->value}]
-        <tr><td class="past_thank_width100 fontSize12">[{$order->oxorder__d3pdftextbestellbestaetigung->value}]</td></tr>
-    [{else}]
-        <tr><td class="past_thank_width100 fontSize12">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USED_GREETINGSORDER"}]</td></tr>
+    [{if $order->getFieldData('d3pdftextbestellbestaetigung')}]
+        <tr><td class="past_thank_width100 fontSize12">[{$order->getFieldData('d3pdftextbestellbestaetigung')|nl2br}]</td></tr>
     [{/if}]
+        <tr><td class="past_thank_width100 paddingTop10 fontSize12">[{$payment->getFieldData('d3shortdescpdf')|nl2br}]</td></tr>
         [{**Schlusstext/ Abschied***}]
-        <tr><td class="marginTop5 past_thank_width100 fontSize12">[{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_1"}]</td></tr>
+        <tr><td class="past_thank_width100 paddingTop10 fontSize12">[{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_1"}]</td></tr>
         <tr><td class="past_thank_width100 fontSize12">[{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_2"}]</td></tr>
     </table>
 [{/block}]
\ No newline at end of file