#9641 include order_info into upper table_construct; dynamic paymenttext, ordercompany

This commit is contained in:
MaxBUhe 2020-04-22 14:13:46 +02:00
parent 89e7064d7c
commit 1a49463a9c
1 changed files with 46 additions and 43 deletions

View File

@ -32,7 +32,7 @@
</tr>
<tr>
<td style="width: 33.33%">[{$shop->oxshops__oxname->value}]</td>
<td style="width: 33.33%">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_GESCHAEFTSFUEHRER"}]</td>
<td style="width: 33.33%">[{$shop->oxshops__oxfname->value}][{$shop->oxshops__oxlname->value}]</td>
<td style="width: 33.33%">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_BANKVERBINDUNG"}]</td>
</tr>
<tr>
@ -60,37 +60,31 @@
</tr>
</table>
</page_footer>
<table style="width: 100%; font-size: 12px; margin-top: 50px;" cellspacing="0">
<tr>
<td style="width: 50%;"></td>
<td style="width: 50%;" class="aligning"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_GET_IN_CONTACT"}]</strong></td>
</tr>
<tr>
<td style="width: 50%; font-size: 8px;">[{$shop->oxshops__oxname->value}] - [{$shop->oxshops__oxstreet->value}] - [{$shop->oxshops__oxzip->value}] [{$shop->oxshops__oxcity->value}]</td>
<td style="width: 50%;" class="aligning sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TELEFON"}][{$shop->oxshops__oxtelefon->value}]</td>
</tr>
<tr>
<td style="width: 50%; "></td>
<td style="width: 50%; " class="aligning sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_FAX"}][{$shop->oxshops__oxtelefax->value}]</td>
</tr>
<tr>
<td style="width: 50%; "></td>
<td style="width: 50%; " class="aligning sizing">[{$shop->oxshops__oxinfoemail->value}]</td>
</tr>
</table>
<table style="width: 100%; font-size: 12px;" cellspacing="0">
<tr>
<td style="width: 65%;">
<div style="font-size: 8px;">[{$shop->oxshops__oxname->value}] - [{$shop->oxshops__oxstreet->value}] - [{$shop->oxshops__oxzip->value}] [{$shop->oxshops__oxcity->value}]</div>
</td>
<td style="width: 35%;">
<div class="aligning"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_GET_IN_CONTACT"}]</strong></div>
<div class="aligning sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TELEFON"}][{$shop->oxshops__oxtelefon->value}]</div>
<div class="aligning sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_FAX"}][{$shop->oxshops__oxtelefax->value}]</div>
<div class="aligning sizing">[{$shop->oxshops__oxinfoemail->value}]</div>
</td>
</tr>
<tr>
<td style="width: 65%; vertical-align: top; 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 style="padding-bottom: 15px">[{$shop->oxshops__oxcountry->value}]</div>
[{* +++++Lieferadressen dynamisch++++++ *}]
[{* +++++++Lieferadressen dynamisch+++++++ *}]
[{if $order->oxorder__oxdelstreet->value}]
<div style="font-size: 10px; padding-bottom: 15px">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYADDRESS"}]</div>
<div style="font-size: 10px; padding-bottom: 10px">[{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>
@ -98,8 +92,13 @@
<div>[{$shop->oxshops__oxcountry->value}]</div>
<div>[{$shop->oxshops__oxdeladdinfo->value}]</div>
[{/if}]
[{*Bestellnummer,Rechnungsvermerk, 'Ihre bestellung vom...'*}]
<div style="font-size: 15px; padding-top: 22px"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERNR"}][{$order->oxorder__oxordernr->value}]</strong></div>
<div>[{if $order->oxorder__d3pdftextkostenstelle_kunden->value}][{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_INVOICENOTE"}][{$order->oxorder__d3pdftextkostenstelle_kunden->value}][{/if}]</div>
<div>[{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSINCERELY"}][{$order->oxorder__oxorderdate->value|date_format:"%d.%m.%Y"}][{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSAT"}]</div>
</td>
<td style="width: 35%;" class="vertical-a">
<td style="width: 35%; padding-top: -5px;" class="vertical-a">
<div style="padding-top: 10px" class="aligning"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_BANKVERBINDUNG"}]</strong></div>
<div class="aligning">[{$shop->oxshops__oxbankname->value}]</div>
<div class="aligning">[{oxmultilang ident="ORDER_OVERVIEW_PDF_ACCOUNTNR"}][{$shop->oxshops__oxibannumber->value}]</div>
@ -111,22 +110,21 @@
</td>
</tr>
</table>
<table style="width: 100%; font-size: 12px;" cellspacing="0">
[{*<table style="width: 100%; font-size: 12px;" cellspacing="0">
<tr>
<td>
<div style="font-size: 15px; padding-top: 10px"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERNR"}][{$order->oxorder__oxordernr->value}]</strong></div>
<div>[{if $order->oxorder__d3pdftextkostenstelle_kunden->value}][{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_INVOICENOTE"}][{$order->oxorder__d3pdftextkostenstelle_kunden->value}][{/if}]</div>
<div style="padding-bottom: 10px">[{if $order->oxorder__oxremark->value }][{$order->oxorder__oxremark->value}][{/if}]</div>
<div>[{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>
</table>*}]
<table style="width: 100%; margin-top: 10px;" cellspacing="0">
<tr>
<td style="width: 10%; padding-bottom: 5px; font-size: 11px;" class="sizing vertical-a">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_AMOUNT"}]</td>
<td style="width: 17%; padding-bottom: 5px; font-size: 11px;" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}]</td>
<td style="width: 47%; padding-bottom: 5px; font-size: 11px;" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DESCRIPTION"}]</td>
<td style="width: 43%; padding-bottom: 5px; font-size: 11px;" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DESCRIPTION"}]</td>
<td style="width: 5%; padding-bottom: 5px; font-size: 11px;" class="sizing aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTPERCENTAGE"}]</td>
<td style="width: 12%; text-align: right; padding-bottom: 5px; font-size: 11px;" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_UNITPRICE"}]</td>
<td style="width: 13%; padding-bottom: 5px; font-size: 11px;" class="aligning sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TOTALPRICE"}]</td>
@ -134,7 +132,7 @@
<tr>
<td style="width: 10%; border-top: solid 0.15mm #000; padding-bottom: 5px"></td>
<td style="width: 17%; border-top: solid 0.15mm #000; padding-bottom: 5px"></td>
<td style="width: 47%; border-top: solid 0.15mm #000; padding-bottom: 5px"></td>
<td style="width: 43%; border-top: solid 0.15mm #000; padding-bottom: 5px"></td>
<td style="width: 5%; border-top: solid 0.15mm #000; padding-bottom: 5px"></td>
<td style="width: 12%; border-top: solid 0.15mm #000; padding-bottom: 5px"></td>
<td style="width: 13%; border-top: solid 0.15mm #000; padding-bottom: 5px"></td>
@ -143,7 +141,7 @@
<tr>
<td style="width: 10%; padding-bottom: 5px; padding-right: 45px; text-align: right;" class='vertical-a sizing'>[{$oOrderArticle->oxorderarticles__oxamount->value }]</td>
<td style="width: 17%; padding-bottom: 5px;" class='vertical-a sizing'>[{$oOrderArticle->oxorderarticles__oxartnum->value }]</td>
<td style="width: 47%; padding-bottom: 5px;" class='vertical-a sizing'>[{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }]</td>
<td style="width: 43%; padding-bottom: 5px;" class='vertical-a sizing'>[{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }]</td>
<td style="width: 5%; padding-bottom: 5px;" class='vertical-a sizing aligning'>[{$oOrderArticle->oxorderarticles__oxvat->value }]</td>
<td style="width: 12%; padding-bottom: 5px; text-align: right" class='vertical-a sizing'>[{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}]</td>
<td style="width: 13%; padding-bottom: 5px;" class="aligning vertical-a sizing">[{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}]</td>
@ -155,7 +153,7 @@
<tr>
<td style="width: 10%; border-top: solid 0.15mm #000;"></td>
<td style="width: 17%; border-top: solid 0.15mm #000;"></td>
<td style="width: 47%; border-top: solid 0.15mm #000;"></td>
<td style="width: 43%; border-top: solid 0.15mm #000;"></td>
<td style="width: 5%; border-top: solid 0.15mm #000;"></td>
<td style="width: 12%; border-top: solid 0.15mm #000;"></td>
<td style="width: 13%; border-top: solid 0.15mm #000;"></td>
@ -163,7 +161,7 @@
<tr style="border-bottom: solid 2px #000;">
<td style="width: 10%"></td>
<td style="width: 17%"></td>
<td style="width: 47%" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMNETTO"}]</td>
<td style="width: 43%" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMNETTO"}]</td>
<td style="width: 5%"></td>
<td style="width: 12%"></td>
<td style="width: 13%" class="aligning sizing">[{$order->getFormattedTotalNetSum()}] [{$currency->name}]</td>
@ -172,7 +170,7 @@
<tr>
<td style="width: 10%;"></td>
<td style="width: 17%;"></td>
<td style="width: 47%; border-bottom: solid 0.15mm #000;"></td>
<td style="width: 43%; border-bottom: solid 0.15mm #000;"></td>
<td style="width: 5%; border-bottom: solid 0.15mm #000;"></td>
<td style="width: 12%; border-bottom: solid 0.15mm #000;"></td>
<td style="width: 13%; border-bottom: solid 0.15mm #000;"></td>
@ -180,7 +178,7 @@
<tr>
<td style="width: 10%"></td>
<td style="width: 17%"></td>
<td style="width: 47%" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT"}]</td>
<td style="width: 43%" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT"}]</td>
<td style="width: 5%"></td>
<td style="width: 12%"></td>
<td style="width: 13%" class="aligning sizing">-[{$order->getFormattedDiscount()}] [{$currency->name}]</td>
@ -188,7 +186,7 @@
<tr>
<td style="width: 10%;"></td>
<td style="width: 17%;"></td>
<td style="width: 47%; border-top: solid 0.15mm #000;"></td>
<td style="width: 43%; border-top: solid 0.15mm #000;"></td>
<td style="width: 5%; border-top: solid 0.15mm #000;"></td>
<td style="width: 12%; border-top: solid 0.15mm #000;"></td>
<td style="width: 13%; border-top: solid 0.15mm #000;"></td>
@ -198,7 +196,7 @@
<tr>
<td style="width: 10%;"></td>
<td style="width: 17%;">&nbsp;</td>
<td style="width: 47%;" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAX"}] [{$VatKey}] [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_PERCENTAGE"}] [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAXPERCVALUE"}]</td>
<td style="width: 43%;" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAX"}] [{$VatKey}] [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_PERCENTAGE"}] [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAXPERCVALUE"}]</td>
<td style="width: 5%;"></td>
<td style="width: 12%;"></td>
<td style="width: 13%;" class="aligning sizing">[{$lang->formatCurrency($oVat, $currency)}] [{$currency->name}]</td>
@ -207,7 +205,7 @@
<tr>
<td style="width: 10%; padding-bottom: 5px;"></td>
<td style="width: 17%; padding-bottom: 5px;"></td>
<td style="width: 47%; padding-bottom: 5px;" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO"}]</td>
<td style="width: 43%; padding-bottom: 5px;" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO"}]</td>
<td style="width: 5%; padding-bottom: 5px;"></td>
<td style="width: 12%; padding-bottom: 5px;"></td>
<td style="width: 13%; padding-bottom: 5px;" class="aligning sizing">[{$order->getFormattedTotalBrutSum()}] [{$currency->name}]</td>
@ -215,7 +213,7 @@
<tr>
<td style="width: 10%;"></td>
<td style="width: 17%;"></td>
<td style="width: 47%; border-top: solid 0.15mm #000;"></td>
<td style="width: 43%; border-top: solid 0.15mm #000;"></td>
<td style="width: 5%; border-top: solid 0.15mm #000;"></td>
<td style="width: 12%; border-top: solid 0.15mm #000;"></td>
<td style="width: 13%; border-top: solid 0.15mm #000;"></td>
@ -223,7 +221,7 @@
<tr style="border-bottom: 2px solid #000">
<td style="width: 10%; padding-top: 5px;"></td>
<td style="width: 17%; padding-top: 5px;"></td>
<td style="width: 47%; padding-top: 5px;" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DELIVERY"}]</td>
<td style="width: 43%; padding-top: 5px;" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DELIVERY"}]</td>
<td style="width: 5%; padding-top: 5px;"></td>
<td style="width: 12%; padding-top: 5px;"></td>
<td style="width: 13%; padding-top: 5px;" class="aligning sizing">[{$lang->formatCurrency($deliveryPrice->getNettoPrice(), $currency)}] [{$currency->name}]</td>
@ -231,7 +229,7 @@
<tr>
<td style="width: 10%; padding-bottom: 5px;"></td>
<td style="width: 17%; padding-bottom: 5px;">&nbsp;</td>
<td style="width: 47%; padding-bottom: 5px;" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAX"}]</td>
<td style="width: 43%; padding-bottom: 5px;" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAX"}]</td>
<td style="width: 5%; padding-bottom: 5px;"></td>
<td style="width: 12%; padding-bottom: 5px;"></td>
<td style="width: 13%; padding-bottom: 5px;" class="aligning sizing">[{$lang->formatCurrency($deliveryPrice->getVATValue(), $currency)}] [{$currency->name}]</td>
@ -239,7 +237,7 @@
<tr>
<td style="width: 10%; border-top: solid 0.1mm #000;"></td>
<td style="width: 17%; border-top: solid 0.1mm #000;"></td>
<td style="width: 47%; border-top: solid 0.1mm #000;"></td>
<td style="width: 43%; border-top: solid 0.1mm #000;"></td>
<td style="width: 5%; border-top: solid 0.1mm #000;"></td>
<td style="width: 12%; border-top: solid 0.1mm #000;"></td>
<td style="width: 13%; border-top: solid 0.1mm #000;"></td>
@ -247,7 +245,7 @@
<tr>
<td style="width: 10%; padding-bottom: 5px"></td>
<td style="width: 17%; padding-bottom: 5px"></td>
<td style="width: 47%; padding-bottom: 5px" class="sizing"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TOTALSUMBRUT"}]</strong></td>
<td style="width: 43%; padding-bottom: 5px" class="sizing"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TOTALSUMBRUT"}]</strong></td>
<td style="width: 5%; padding-bottom: 5px"></td>
<td style="width: 12%; padding-bottom: 5px"></td>
<td style="width: 13%; padding-bottom: 5px" class="aligning sizing"><strong>[{$order->getFormattedTotalOrderSum()}] [{$currency->name}]</strong></td>
@ -255,7 +253,7 @@
<tr>
<td style="width: 10%; border-top: solid 0.1mm #000;"></td>
<td style="width: 17%; border-top: solid 0.1mm #000;"></td>
<td style="width: 47%; border-top: solid 0.1mm #000;"></td>
<td style="width: 43%; border-top: solid 0.1mm #000;"></td>
<td style="width: 5%; border-top: solid 0.1mm #000;"></td>
<td style="width: 12%; border-top: solid 0.1mm #000;"></td>
<td style="width: 13%; border-top: solid 0.1mm #000;"></td>
@ -264,8 +262,13 @@
<table style="width: 100%" cellspacing="0">
<tr><td style="width: 100%">&nbsp;</td></tr>
<tr><td style="width: 100%" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USED_PAYMENTMETHOD"}][{$payment->oxpayments__oxdesc->value}]</td></tr>
[{if $order->oxorder__d3pdftextbestellbestaetigung}]<tr><td style="width: 100%" class="sizing">[{$order->oxorder__d3pdftextbestellbestaetigung->value}]</td></tr>[{/if}]
[{* +++++++Individueller Zahlungstext+++++++ *}]
[{if $order->oxorder__d3pdftextbestellbestaetigung->value}]
<tr><td style="width: 100%" class="sizing">[{$order->oxorder__d3pdftextbestellbestaetigung->value}]</td></tr>
[{else}]
<tr><td style="width: 100%" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USED_GREETINGSORDER"}]</td></tr>
[{/if}]
<tr><td style="width: 100%">&nbsp;</td></tr>
<tr><td style="width: 100%" class="sizing">[{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_1"}]</td></tr>
<tr><td style="width: 100%" class="sizing">[{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_2"}]</td></tr>