D3Public/pdfdokumente
8
0
Fork 0
Code Pull Requests Releases Activity

#9641 add oxcountry, oxinfoemail; changed position: oxordernr, custnr, date, ustvat; mod table width

Browse Source
This commit is contained in:
MaxBUhe 2020-04-22 09:52:07 +02:00
parent 3cbd737362
commit 89e7064d7c
2 changed files with 81 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

153
Application/views/tpl/deliverynote.tpl
View File

@ -6,6 +6,7 @@
.aligning{ .aligning{
text-align: right; text-align: right;
} }
table > td > div,
table > td{ table > td{
font-family: "helvetica"; font-family: "helvetica";
} }
@ -45,7 +46,7 @@
<td style="width: 33.33%">[{oxmultilang ident="ORDER_OVERVIEW_PDF_ACCOUNTNR"}][{$shop->oxshops__oxibannumber->value}]</td> <td style="width: 33.33%">[{oxmultilang ident="ORDER_OVERVIEW_PDF_ACCOUNTNR"}][{$shop->oxshops__oxibannumber->value}]</td>
</tr> </tr>
<tr> <tr>
<td style="width: 33.33%"></td> <td style="width: 33.33%">[{$shop->oxshops__oxcountry->value}]</td>
<td style="width: 33.33%">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTID"}][{$shop->oxshops__oxvatnumber->value}]</td> <td style="width: 33.33%">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTID"}][{$shop->oxshops__oxvatnumber->value}]</td>
<td style="width: 33.33%">[{oxmultilang ident="ORDER_OVERVIEW_PDF_BANKCODE"}][{$shop->oxshops__oxbiccode->value}]</td> <td style="width: 33.33%">[{oxmultilang ident="ORDER_OVERVIEW_PDF_BANKCODE"}][{$shop->oxshops__oxbiccode->value}]</td>
</tr> </tr>
@ -73,19 +74,23 @@
<td style="width: 50%; "></td> <td style="width: 50%; "></td>
<td style="width: 50%; " class="aligning sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_FAX"}][{$shop->oxshops__oxtelefax->value}]</td> <td style="width: 50%; " class="aligning sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_FAX"}][{$shop->oxshops__oxtelefax->value}]</td>
</tr> </tr>
<tr>
<td style="width: 50%; "></td>
<td style="width: 50%; " class="aligning sizing">[{$shop->oxshops__oxinfoemail->value}]</td>
</tr>
</table> </table>
<table style="width: 100%; font-size: 12px;" cellspacing="0"> <table style="width: 100%; font-size: 12px;" cellspacing="0">
<tr> <tr>
<td style="width: 50%;"> <td style="width: 65%;">
<div>[{$order->oxorder__oxbillcompany->value}]</div> <div>[{$order->oxorder__oxbillcompany->value}]</div>
<div>[{$order->oxorder__oxbillfname->value}] [{$order->oxorder__oxbilllname->value}]</div> <div>[{$order->oxorder__oxbillfname->value}] [{$order->oxorder__oxbilllname->value}]</div>
<div>[{$order->oxorder__oxbillstreet->value}] [{$order->oxorder__oxbillstreetnr->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><strong>[{$order->oxorder__oxbillzip->value}] [{$order->oxorder__oxbillcity->value}]</strong></div>
<div style="padding-bottom: 10px">[{$shop->oxshops__oxcountry->value}]</div> <div style="padding-bottom: 15px">[{$shop->oxshops__oxcountry->value}]</div>
[{* +++++Lieferadressen dynamisch++++++ *}] [{* +++++Lieferadressen dynamisch++++++ *}]
[{if $order->oxorder__oxdelstreet->value}] [{if $order->oxorder__oxdelstreet->value}]
<div style="font-size: 10px; padding-bottom: 10px">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYADDRESS"}]</div> <div style="font-size: 10px; padding-bottom: 15px">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYADDRESS"}]</div>
[{if $order->oxorder__oxdelcompany->value}]<div>[{$order->oxorder__oxdelcompany->value}]</div>[{/if}] [{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__oxdelfname->value}] [{$order->oxorder__oxdellname->value}]</div>
<div>[{$order->oxorder__oxdelstreet->value}] [{$order->oxorder__oxdelstreetnr->value}]</div> <div>[{$order->oxorder__oxdelstreet->value}] [{$order->oxorder__oxdelstreetnr->value}]</div>
@ -94,54 +99,52 @@
<div>[{$shop->oxshops__oxdeladdinfo->value}]</div> <div>[{$shop->oxshops__oxdeladdinfo->value}]</div>
[{/if}] [{/if}]
</td> </td>
<td style="width: 50%;"> <td style="width: 35%;" class="vertical-a">
<div style="padding-top: 10px" class="aligning"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_BANKVERBINDUNG"}]</strong></div> <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">[{$shop->oxshops__oxbankname->value}]</div>
<div class="aligning">[{oxmultilang ident="ORDER_OVERVIEW_PDF_ACCOUNTNR"}][{$shop->oxshops__oxibannumber->value}]</div> <div class="aligning">[{oxmultilang ident="ORDER_OVERVIEW_PDF_ACCOUNTNR"}][{$shop->oxshops__oxibannumber->value}]</div>
<div style="padding-bottom: 10px" class="aligning">[{oxmultilang ident="ORDER_OVERVIEW_PDF_BANKCODE_HEADER"}][{$shop->oxshops__oxbiccode->value}]</div> <div style="padding-bottom: 10px" class="aligning">[{oxmultilang ident="ORDER_OVERVIEW_PDF_BANKCODE_HEADER"}][{$shop->oxshops__oxbiccode->value}]</div>
<div style="padding-top: 10px" 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->oxuser__oxcustnr->value}]</div>
<div class="aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DATE"}][{$order->oxorder__oxbilldate->value|date_format:"%d.%m.%Y"}]</div>
<div class="aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTIDNR"}][{$shop->oxshops__oxvatnumber->value}]</div>
</td> </td>
</tr> </tr>
</table> </table>
<table style="width: 100%; font-size: 12px;" cellspacing="0"> <table style="width: 100%; font-size: 12px;" cellspacing="0">
<tr> <tr>
<td style="width: 50%;"> <td>
<div style="font-size: 15px; padding-top: 10px"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERNR"}][{$order->oxorder__oxordernr->value}]</strong></div> <div style="font-size: 15px; padding-top: 10px"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERNR"}][{$order->oxorder__oxordernr->value}]</strong></div>
<div style="padding-top:10px">[{if $order->oxorder__d3pdftextkostenstelle_kunden->value}][{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_INVOICENOTE"}][{$order->oxorder__d3pdftextkostenstelle_kunden->value}][{/if}]</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 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> <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>
<td style="width: 50%;">
<div style="padding-top: 10px" 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->oxuser__oxcustnr->value}]</div>
<div style="padding-bottom: 10px" class="aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DATE"}][{$order->oxorder__oxbilldate->value|date_format:"%d.%m.%Y"}]</div>
<div class="aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTIDNR"}][{$shop->oxshops__oxvatnumber->value}]</div>
</td>
</tr> </tr>
</table> </table>
<table style="width: 100%; margin-top: 10px;" cellspacing="0"> <table style="width: 100%; margin-top: 10px;" cellspacing="0">
<tr> <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: 10%; padding-bottom: 5px; font-size: 11px;" class="sizing vertical-a">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_AMOUNT"}]</td>
<td style="width: 15%; padding-bottom: 5px; font-size: 11px;" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}]</td> <td style="width: 17%; padding-bottom: 5px; font-size: 11px;" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}]</td>
<td style="width: 40%; padding-bottom: 5px; font-size: 11px;" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DESCRIPTION"}]</td> <td style="width: 47%; padding-bottom: 5px; font-size: 11px;" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DESCRIPTION"}]</td>
<td style="width: 10%; padding-bottom: 5px; font-size: 11px;" class="sizing aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTPERCENTAGE"}]</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: 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> <td style="width: 13%; padding-bottom: 5px; font-size: 11px;" class="aligning sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TOTALPRICE"}]</td>
</tr> </tr>
<tr> <tr>
<td style="width: 10%; border-top: solid 0.15mm #000; padding-bottom: 5px"></td> <td style="width: 10%; border-top: solid 0.15mm #000; padding-bottom: 5px"></td>
<td style="width: 15%; 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: 40%; 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: 10%; 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: 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> <td style="width: 13%; border-top: solid 0.15mm #000; padding-bottom: 5px"></td>
</tr> </tr>
[{foreach from=$order->getOrderArticles(true) item=oOrderArticle}] [{foreach from=$order->getOrderArticles(true) item=oOrderArticle}]
<tr> <tr>
<td style="width: 10%; padding-bottom: 5px; " class='vertical-a sizing'>[{$oOrderArticle->oxorderarticles__oxamount->value }]</td> <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: 15%; padding-bottom: 5px; " class='vertical-a sizing'>[{$oOrderArticle->oxorderarticles__oxartnum->value }]</td> <td style="width: 17%; padding-bottom: 5px;" class='vertical-a sizing'>[{$oOrderArticle->oxorderarticles__oxartnum->value }]</td>
<td style="width: 40%; padding-bottom: 5px; " class='vertical-a sizing'>[{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }]</td> <td style="width: 47%; padding-bottom: 5px;" class='vertical-a sizing'>[{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }]</td>
<td style="width: 10%; padding-bottom: 5px; " class='vertical-a sizing aligning'>[{$oOrderArticle->oxorderarticles__oxvat->value }]</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: 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> <td style="width: 13%; padding-bottom: 5px;" class="aligning vertical-a sizing">[{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}]</td>
</tr> </tr>
@ -150,112 +153,112 @@
<nobreak> <nobreak>
<table style="width: 100%;" cellspacing="0"> <table style="width: 100%;" cellspacing="0">
<tr> <tr>
<td style="width: 8%; border-top: solid 0.15mm #000;"></td> <td style="width: 10%; border-top: solid 0.15mm #000;"></td>
<td style="width: 20%; border-top: solid 0.15mm #000;"></td> <td style="width: 17%; border-top: solid 0.15mm #000;"></td>
<td style="width: 40%; border-top: solid 0.15mm #000;"></td> <td style="width: 47%; border-top: solid 0.15mm #000;"></td>
<td style="width: 5%; 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: 12%; border-top: solid 0.15mm #000;"></td>
<td style="width: 15%; border-top: solid 0.15mm #000;"></td> <td style="width: 13%; border-top: solid 0.15mm #000;"></td>
</tr> </tr>
<tr style="border-bottom: solid 2px #000;"> <tr style="border-bottom: solid 2px #000;">
<td style="width: 8%"></td> <td style="width: 10%"></td>
<td style="width: 20%"></td> <td style="width: 17%"></td>
<td style="width: 40%" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMNETTO"}]</td> <td style="width: 47%" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMNETTO"}]</td>
<td style="width: 5%"></td> <td style="width: 5%"></td>
<td style="width: 12%"></td> <td style="width: 12%"></td>
<td style="width: 15%" class="aligning sizing">[{$order->getFormattedTotalNetSum()}] [{$currency->name}]</td> <td style="width: 13%" class="aligning sizing">[{$order->getFormattedTotalNetSum()}] [{$currency->name}]</td>
</tr> </tr>
[{if $order->getFormattedDiscount() != 0}] [{if $order->getFormattedDiscount() != 0}]
<tr> <tr>
<td style="width: 8%;"></td> <td style="width: 10%;"></td>
<td style="width: 20%;"></td> <td style="width: 17%;"></td>
<td style="width: 40%; border-bottom: solid 0.15mm #000;"></td> <td style="width: 47%; border-bottom: solid 0.15mm #000;"></td>
<td style="width: 5%; 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: 12%; border-bottom: solid 0.15mm #000;"></td>
<td style="width: 15%; border-bottom: solid 0.15mm #000;"></td> <td style="width: 13%; border-bottom: solid 0.15mm #000;"></td>
</tr> </tr>
<tr> <tr>
<td style="width: 8%"></td> <td style="width: 10%"></td>
<td style="width: 20%"></td> <td style="width: 17%"></td>
<td style="width: 40%" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT"}]</td> <td style="width: 47%" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT"}]</td>
<td style="width: 5%"></td> <td style="width: 5%"></td>
<td style="width: 12%"></td> <td style="width: 12%"></td>
<td style="width: 15%" class="aligning sizing">-[{$order->getFormattedDiscount()}] [{$currency->name}]</td> <td style="width: 13%" class="aligning sizing">-[{$order->getFormattedDiscount()}] [{$currency->name}]</td>
</tr> </tr>
<tr> <tr>
<td style="width: 8%;"></td> <td style="width: 10%;"></td>
<td style="width: 20%;"></td> <td style="width: 17%;"></td>
<td style="width: 40%; border-top: solid 0.15mm #000;"></td> <td style="width: 47%; border-top: solid 0.15mm #000;"></td>
<td style="width: 5%; 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: 12%; border-top: solid 0.15mm #000;"></td>
<td style="width: 15%; border-top: solid 0.15mm #000;"></td> <td style="width: 13%; border-top: solid 0.15mm #000;"></td>
</tr> </tr>
[{/if}] [{/if}]
[{foreach from=$order->getVats() key=VatKey item=oVat}] [{foreach from=$order->getVats() key=VatKey item=oVat}]
<tr> <tr>
<td style="width: 8%;"></td> <td style="width: 10%;"></td>
<td style="width: 20%;">&nbsp;</td> <td style="width: 17%;">&nbsp;</td>
<td style="width: 40%;" 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: 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: 5%;"></td> <td style="width: 5%;"></td>
<td style="width: 12%;"></td> <td style="width: 12%;"></td>
<td style="width: 15%;" class="aligning sizing">[{$lang->formatCurrency($oVat, $currency)}] [{$currency->name}]</td> <td style="width: 13%;" class="aligning sizing">[{$lang->formatCurrency($oVat, $currency)}] [{$currency->name}]</td>
</tr> </tr>
[{/foreach}] [{/foreach}]
<tr> <tr>
<td style="width: 8%; padding-bottom: 5px;"></td> <td style="width: 10%; padding-bottom: 5px;"></td>
<td style="width: 20%; padding-bottom: 5px;"></td> <td style="width: 17%; padding-bottom: 5px;"></td>
<td style="width: 40%; padding-bottom: 5px;" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO"}]</td> <td style="width: 47%; 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: 5%; padding-bottom: 5px;"></td>
<td style="width: 12%; padding-bottom: 5px;"></td> <td style="width: 12%; padding-bottom: 5px;"></td>
<td style="width: 15%; padding-bottom: 5px;" class="aligning sizing">[{$order->getFormattedTotalBrutSum()}] [{$currency->name}]</td> <td style="width: 13%; padding-bottom: 5px;" class="aligning sizing">[{$order->getFormattedTotalBrutSum()}] [{$currency->name}]</td>
</tr> </tr>
<tr> <tr>
<td style="width: 8%;"></td> <td style="width: 10%;"></td>
<td style="width: 20%;"></td> <td style="width: 17%;"></td>
<td style="width: 40%; border-top: solid 0.15mm #000;"></td> <td style="width: 47%; border-top: solid 0.15mm #000;"></td>
<td style="width: 5%; 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: 12%; border-top: solid 0.15mm #000;"></td>
<td style="width: 15%; border-top: solid 0.15mm #000;"></td> <td style="width: 13%; border-top: solid 0.15mm #000;"></td>
</tr> </tr>
<tr style="border-bottom: 2px solid #000"> <tr style="border-bottom: 2px solid #000">
<td style="width: 8%; padding-top: 5px;"></td> <td style="width: 10%; padding-top: 5px;"></td>
<td style="width: 20%; padding-top: 5px;"></td> <td style="width: 17%; padding-top: 5px;"></td>
<td style="width: 40%; padding-top: 5px;" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DELIVERY"}]</td> <td style="width: 47%; 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: 5%; padding-top: 5px;"></td>
<td style="width: 12%; padding-top: 5px;"></td> <td style="width: 12%; padding-top: 5px;"></td>
<td style="width: 15%; padding-top: 5px;" class="aligning sizing">[{$lang->formatCurrency($deliveryPrice->getNettoPrice(), $currency)}] [{$currency->name}]</td> <td style="width: 13%; padding-top: 5px;" class="aligning sizing">[{$lang->formatCurrency($deliveryPrice->getNettoPrice(), $currency)}] [{$currency->name}]</td>
</tr> </tr>
<tr> <tr>
<td style="width: 8%; padding-bottom: 5px;"></td> <td style="width: 10%; padding-bottom: 5px;"></td>
<td style="width: 20%; padding-bottom: 5px;">&nbsp;</td> <td style="width: 17%; padding-bottom: 5px;">&nbsp;</td>
<td style="width: 40%; padding-bottom: 5px;" class="sizing">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAX"}]</td> <td style="width: 47%; 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: 5%; padding-bottom: 5px;"></td>
<td style="width: 12%; padding-bottom: 5px;"></td> <td style="width: 12%; padding-bottom: 5px;"></td>
<td style="width: 15%; padding-bottom: 5px;" class="aligning sizing">[{$lang->formatCurrency($deliveryPrice->getVATValue(), $currency)}] [{$currency->name}]</td> <td style="width: 13%; padding-bottom: 5px;" class="aligning sizing">[{$lang->formatCurrency($deliveryPrice->getVATValue(), $currency)}] [{$currency->name}]</td>
</tr> </tr>
<tr> <tr>
<td style="width: 8%; border-top: solid 0.1mm #000;"></td> <td style="width: 10%; border-top: solid 0.1mm #000;"></td>
<td style="width: 20%; border-top: solid 0.1mm #000;"></td> <td style="width: 17%; border-top: solid 0.1mm #000;"></td>
<td style="width: 40%; border-top: solid 0.1mm #000;"></td> <td style="width: 47%; border-top: solid 0.1mm #000;"></td>
<td style="width: 5%; 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: 12%; border-top: solid 0.1mm #000;"></td>
<td style="width: 15%; border-top: solid 0.1mm #000;"></td> <td style="width: 13%; border-top: solid 0.1mm #000;"></td>
</tr> </tr>
<tr> <tr>
<td style="width: 8%; padding-bottom: 5px"></td> <td style="width: 10%; padding-bottom: 5px"></td>
<td style="width: 20%; padding-bottom: 5px"></td> <td style="width: 17%; padding-bottom: 5px"></td>
<td style="width: 40%; padding-bottom: 5px" class="sizing"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TOTALSUMBRUT"}]</strong></td> <td style="width: 47%; 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: 5%; padding-bottom: 5px"></td>
<td style="width: 12%; padding-bottom: 5px"></td> <td style="width: 12%; padding-bottom: 5px"></td>
<td style="width: 15%; padding-bottom: 5px" class="aligning sizing"><strong>[{$order->getFormattedTotalOrderSum()}] [{$currency->name}]</strong></td> <td style="width: 13%; padding-bottom: 5px" class="aligning sizing"><strong>[{$order->getFormattedTotalOrderSum()}] [{$currency->name}]</strong></td>
</tr> </tr>
<tr> <tr>
<td style="width: 8%; border-top: solid 0.1mm #000;"></td> <td style="width: 10%; border-top: solid 0.1mm #000;"></td>
<td style="width: 20%; border-top: solid 0.1mm #000;"></td> <td style="width: 17%; border-top: solid 0.1mm #000;"></td>
<td style="width: 40%; border-top: solid 0.1mm #000;"></td> <td style="width: 47%; border-top: solid 0.1mm #000;"></td>
<td style="width: 5%; 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: 12%; border-top: solid 0.1mm #000;"></td>
<td style="width: 15%; border-top: solid 0.1mm #000;"></td> <td style="width: 13%; border-top: solid 0.1mm #000;"></td>
</tr> </tr>
</table> </table>
<table style="width: 100%" cellspacing="0"> <table style="width: 100%" cellspacing="0">

2
Modules/Application/Model/d3_Order_PdfDocuments.php
View File

@ -67,6 +67,7 @@ class d3_Order_PdfDocuments extends d3_Order_PdfDocuments_parent
$this->save(); $this->save();
} }
switch (Registry::getRequest()->getRequestParameter('pdftype')) { switch (Registry::getRequest()->getRequestParameter('pdftype')) {
case ('dnote'): case ('dnote'):
case ('dnote_without_logo'): case ('dnote_without_logo'):
@ -76,6 +77,7 @@ class d3_Order_PdfDocuments extends d3_Order_PdfDocuments_parent
$sContent = $oSmarty->fetch($this->getDeliveryNoteTemplate()); $sContent = $oSmarty->fetch($this->getDeliveryNoteTemplate());
} }
$sFilename = str_replace( $this->oxorder__oxordernr->value, $this->oxorder__oxbillnr->value, $sFilename);
$oPdf = oxNew(Html2Pdf::class, 'P', 'A4', 'de'); $oPdf = oxNew(Html2Pdf::class, 'P', 'A4', 'de');
$oPdf->writeHTML($sContent); $oPdf->writeHTML($sContent);