From 5db3bca501e8a29cf4de34eaef173dd2bc48833c Mon Sep 17 00:00:00 2001
From: MaxBUhe <mb@shopmodule.com>
Date: Fri, 12 Jun 2020 16:22:17 +0200
Subject: [PATCH] add: css-classes

---
 .../deliverynote/includingFiles/pdfHeader.tpl | 52 +++++++++----------
 1 file changed, 24 insertions(+), 28 deletions(-)

diff --git a/Application/views/tpl/documents/deliverynote/includingFiles/pdfHeader.tpl b/Application/views/tpl/documents/deliverynote/includingFiles/pdfHeader.tpl
index 86b0c87..91a16ce 100644
--- a/Application/views/tpl/documents/deliverynote/includingFiles/pdfHeader.tpl
+++ b/Application/views/tpl/documents/deliverynote/includingFiles/pdfHeader.tpl
@@ -5,43 +5,39 @@
 			<td class="pdf_heading_width65">
 				<div class="pdf_heading_fontSize8">[{$shop->oxshops__oxname->value}] - [{$shop->oxshops__oxstreet->value}] - [{$shop->oxshops__oxzip->value}] [{$shop->oxshops__oxcity->value}]</div>
 			</td>
-			[{*<td class="pdf_heading_width35">
-				<div class="aligning"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_GET_IN_CONTACT"}]</strong></div>
-				<div class="aligning fontSize12">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TELEFON"}][{$shop->oxshops__oxtelefon->value}]</div>
-				<div class="aligning fontSize12">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_FAX"}][{$shop->oxshops__oxtelefax->value}]</div>
-				<div class="aligning fontSize12">[{$shop->oxshops__oxinfoemail->value}]</div>
-			</td>*}]
 		</tr>
 	[{/block}]
 	[{block name="heading_order_information"}]
 		<tr>
 			<td class="vertical-a heading_order_width65 heading_order_paddingTopSub5" style="padding-top: 5px">
-			[{if $order->oxorder__oxbillcompany->value}]
-				<div>[{$order->oxorder__oxbillcompany->value}]</div>
-			[{/if}]
-				<div>[{$order->oxorder__oxbillfname->value}] [{$order->oxorder__oxbilllname->value}]</div>
-				<div>[{$order->oxorder__oxbillstreet->value}] [{$order->oxorder__oxbillstreetnr->value}]</div>
-				<div><strong>[{$order->oxorder__oxbillzip->value}] [{$order->oxorder__oxbillcity->value}]</strong></div>
-				<div class="heading_order_paddingBottom15">[{$shop->oxshops__oxcountry->value}]</div>
-
 			[{* +++++++Lieferadressen dynamisch+++++++ *}]
-			[{if $order->oxorder__oxdelstreet->value}]
+			[{if $order->getFieldData('oxdellname')}]
 				<div class="heading_order_fontSize10 heading_order_paddingBottom8">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYADDRESS"}]</div>
-			[{if $order->oxorder__oxdelcompany->value}]<div>[{$order->oxorder__oxdelcompany->value}]</div>[{/if}]
-				<div>[{$order->oxorder__oxdelfname->value}] [{$order->oxorder__oxdellname->value}]</div>
-				<div>[{$order->oxorder__oxdelstreet->value}] [{$order->oxorder__oxdelstreetnr->value}]</div>
-				<div><strong>[{$order->oxorder__oxdelzip->value}] [{$order->oxorder__oxdelcity->value}]</strong></div>
-				<div>[{$shop->oxshops__oxcountry->value}]</div>
-				<div>[{$shop->oxshops__oxdeladdinfo->value}]</div>
+			[{if $order->oxorder__oxdelcompany->value}]
+				<div>[{$order->getFieldData('oxdelcompany')}]</div>
 			[{/if}]
+				<div>[{$order->getFieldData('oxdelfname')}] [{$order->getFieldData('oxdellname')}]</div>
+				<div>[{$order->getFieldData('oxdelstreet')}] [{$order->getFieldData('oxdelstreetnr')}]</div>
+				<div><strong>[{$order->getFieldData('oxdelzip')}] [{$order->getFieldData('oxdelcity')}]</strong></div>
+				<div>[{$shop->getFieldData('oxcountry')}]</div>
+				<div>[{$shop->getFieldData('oxdeladdinfo')}]</div>
+			[{else}]
+			[{if $order->getFieldData('oxbillcompany')}]
+				<div>[{$order->getFieldData('oxbillcompany')}]</div>
+			[{/if}]
+				<div>[{$order->getFieldData('oxbillfname')}] [{$order->getFieldData('oxbilllname')}]</div>
+				<div>[{$order->getFieldData('oxbillstreet')}] [{$order->getFieldData('oxbillstreetnr')}]</div>
+				<div><strong>[{$order->getFieldData('oxbillzip')}] [{$order->getFieldData('oxbillcity')}]</strong></div>
+				<div class="heading_order_paddingBottom15">[{$shop->getFieldData('oxcountry')}]</div>
+				[{/if}]
 			[{*Bestellnummer,Rechnungsvermerk, 'Ihre bestellung vom...'*}]
 			</td>
-			<td class="vertical-a heading_order_width35 heading_order_paddingTopSub5 eraseBug" style="margin-bottom: 0">
+			<td class="vertical-a heading_order_width35" style="padding-bottom: -30px">
 				<div class="aligning" style="font-size: 7px; padding-top: 50px">[{oxmultilang ident="D3_DELIVERYNOTE_PDF_QUOTECUSTMNR"}]</div>
-				<div class="aligning" style="padding-bottom: 50px">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_CUSTOMERNR"}] [{$user->oxuser__oxcustnr->value}]</div>
-				<div class="aligning">[{$shop->oxshops__oxcity->value}], [{$smarty.now|date_format:"%d.%m.%G"}]</div>
-				<div class="aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTIDNR"}][{$shop->oxshops__oxvatnumber->value}]</div>
-				<div class="aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILLNR"}][{$order->oxorder__oxbillnr->value}]</div>
+				<div class="aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_CUSTOMERNR"}] [{$user->getFieldData('oxcustnr')}]</div>
+				<div class="aligning" style="padding-top: 50px">[{$shop->getFieldData('oxcity')}], [{$smarty.now|date_format:"%d.%m.%G"}]</div>
+				<div class="aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTIDNR"}][{$shop->getFieldData('oxvatnumber')}]</div>
+				<div class="aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILLNR"}][{$order->getFieldData('oxbillnr')}]</div>
 			</td>
 		</tr>
     [{/block}]
@@ -49,12 +45,12 @@
 	<table class="fontSize12" cellspacing="0">
 		<tr>
 			<td>
-				<div style="width: 300px" class="eraseBug heading_order_paddingTop22 heading_order_fontSize15"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYNOTE"}][{$order->oxorder__oxordernr->value}]</strong></div>
+				<div style="width: 300px; padding-bottom: 20px" class="heading_order_paddingTop22 heading_order_fontSize15"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYNOTE"}][{$order->oxorder__oxordernr->value}]</strong></div>
 			</td>
 		</tr>
 		<tr>
 			<td>
-				<div class="eraseBug">[{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSINCERELY"}][{$order->oxorder__oxorderdate->value|date_format:"%d.%m.%Y"}][{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSAT"}]</div>
+				<div style="padding-bottom: 20px">[{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSINCERELY"}][{$order->oxorder__oxorderdate->value|date_format:"%d.%m.%Y"}][{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSAT"}]</div>
 			</td>
 		</tr>
 	</table>