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

Merge remote-tracking branch 'remotes/origin/modules/rel_mod_pdfDocumentsFull' into modules/dev_mod_pdfDocumentsFull_ordermanager

This commit is contained in:
Daniel Seifert 2020-06-08 16:36:20 +02:00
parent 3a3e22ac3b b200c54339
commit 3c871862d6
6 changed files with 67 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Application/views/tpl/documents/deliverynote/includingFiles/pdfHeader.tpl
View File

@ -34,19 +34,28 @@
<div>[{$shop->oxshops__oxcountry->value}]</div>
<div>[{$shop->oxshops__oxdeladdinfo->value}]</div>
[{/if}]
[{*Bestellnummer,Rechnungsvermerk, 'Ihre bestellung vom...'*}]
<div class="heading_order_paddingTop22 heading_order_fontSize15"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYNOTE"}][{$order->oxorder__oxordernr->value}]</strong></div>
<div class="heading_order_paddingTop1">[{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSINCERELY"}][{$order->oxorder__oxorderdate->value|date_format:"%d.%m.%Y"}][{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSAT"}]</div>
</td>
<td class="vertical-a heading_order_width35 heading_order_paddingTopSub5">
<td class="vertical-a heading_order_width35 heading_order_paddingTopSub5 eraseBug" style="margin-bottom: 0">
<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}], [{$order->oxorder__oxbilldate->value|date_format:"%d.%m.%Y"}]</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>
</td>
</tr>
[{/block}]
</table>
<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>
</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>
</td>
</tr>
</table>
[{/block}]

56
Application/views/tpl/documents/invoice/includingFiles/pdfHeader.tpl
View File

@ -1,54 +1,54 @@
[{block name="pdfHeading"}]
<table class="fontSize12 pdf_heading_table" cellspacing="0">
<table class="fontSize12 pdf_heading_table marginBottom15" cellspacing="0">
[{block name="heading_owner_information"}]
<tr>
<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>
<div class="pdf_heading_fontSize8">[{$shop->getFielddata('oxname')}] - [{$shop->getFielddata('oxstreet')}] - [{$shop->getFielddata('oxzip')}] [{$shop->getFielddata('oxcity')}]</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>
<div class="aligning fontSize12">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TELEFON"}][{$shop->getFieldData('oxtelefon')}]</div>
<div class="aligning fontSize12">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_FAX"}][{$shop->getFieldData('oxtelefax')}]</div>
<div class="aligning fontSize12">[{$shop->getFieldData('oxinfoemail')}]</div>
</td>
</tr>
[{/block}]
[{block name="heading_order_information"}]
<tr>
<td class="vertical-a heading_order_width65 heading_order_paddingTopSub5">
[{if $order->oxorder__oxbillcompany->value}]
<div>[{$order->oxorder__oxbillcompany->value}]</div>
[{if $order->getFieldData('oxbillcompany')}]
<div>[{$order->getFieldData('oxbillcompany')}]</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>
<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>
[{* +++++++Lieferadressen dynamisch+++++++ *}]
[{if $order->oxorder__oxdelstreet->value}]
[{if $order->getFieldData('oxdelstreet')}]
<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->getFieldData('oxdelcompany')}]<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>
[{/if}]
[{*Bestellnummer,Rechnungsvermerk, 'Ihre bestellung vom...'*}]
<div class="heading_order_paddingTop22 heading_order_fontSize15"><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 class="heading_order_paddingTop1">[{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSINCERELY"}][{$order->oxorder__oxorderdate->value|date_format:"%d.%m.%Y"}][{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSAT"}]</div>
<div class="heading_order_paddingTop22 heading_order_fontSize15"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERNR"}][{$order->getFieldData('oxordernr')}]</strong></div>
[{if $order->getFieldData('d3pdftextkostenstelle_kunden')}]<div>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_INVOICENOTE"}][{$order->getFieldData('d3pdftextkostenstelle_kunden')}]</div>[{/if}]
<div class="heading_order_paddingTop1">[{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSINCERELY"}][{$order->getFieldData('oxorderdate')|date_format:"%d.%m.%Y"}][{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSAT"}]</div>
</td>
<td class="vertical-a heading_order_width35 heading_order_paddingTopSub5">
<div class="aligning heading_order_paddingTop10"><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>
<div class="aligning">[{oxmultilang ident="ORDER_OVERVIEW_PDF_BANKCODE_HEADER"}][{$shop->oxshops__oxbiccode->value}]</div>
<div class="aligning heading_order_paddingTop10">[{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>
<div class="aligning">[{$shop->getFieldData('oxbankname')}]</div>
<div class="aligning">[{oxmultilang ident="ORDER_OVERVIEW_PDF_ACCOUNTNR"}][{$shop->getFieldData('oxibannumber')}]</div>
<div class="aligning">[{oxmultilang ident="ORDER_OVERVIEW_PDF_BANKCODE_HEADER"}][{$shop->getFieldData('oxbiccode')}]</div>
<div class="aligning heading_order_paddingTop10">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILLNR"}][{$order->getFieldData('oxbillnr')}]</div>
<div class="aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_CUSTOMERNR"}] [{$user->getFieldData('oxcustnr')}]</div>
<div class="aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DATE"}][{$order->getFieldData('oxbilldate')|date_format:"%d.%m.%Y"}]</div>
<div class="aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTIDNR"}][{$shop->getFieldData('oxvatnumber')}]</div>
</td>
</tr>
[{/block}]

10
Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl
View File

@ -1,16 +1,14 @@
[{block name="pdfPastThankFile"}]
<table class="past_thank_width100" cellspacing="0">
<tr><td class="past_thank_width100">&nbsp;</td></tr>
<tr><td class="past_thank_width100 fontSize12">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USED_PAYMENTMETHOD"}][{$payment->oxpayments__oxdesc->value}]</td></tr>
<table class="past_thank_width100 borderSpacingUnset">
<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}]
[{*+++++++++++*}]
<tr><td class="past_thank_width100">&nbsp;</td></tr>
<tr><td class="past_thank_width100 fontSize12">[{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_1"}]</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 fontSize12">[{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_2"}]</td></tr>
</table>
[{/block}]

4
Modules/out/src/pdfStyling.css
View File

@ -24,10 +24,10 @@ table{
.border-bottom{
border-bottom: solid 0.15mm #000;
}
.hermes{
.paddingTop{
padding-top: 5px;
}
.mercurius{
.paddingBottom{
padding-bottom: 5px;
}
.spacing_order_info{

4
out/src/css/deliverynote_.css
View File

@ -24,10 +24,10 @@ table{
.border-bottom{
border-bottom: solid 0.15mm #000;
}
.hermes{
.paddingTop{
padding-top: 5px;
}
.mercurius{
.paddingBottom{
padding-bottom: 5px;
}
.spacing_order_info{

19
out/src/css/pdfStyling.css
View File

@ -24,12 +24,20 @@ table{
.border-bottom{
border-bottom: solid 0.15mm #000;
}
.hermes{
.paddingTop{
padding-top: 5px;
}
.mercurius{
.paddingBottom{
padding-bottom: 5px;
}
.paddingTop15{
padding-top: 10px;
}
.marginTop5{
padding-top: 5px;
}
.spacing_order_info{
padding-bottom: 5px;
padding-top: 5px;
@ -50,11 +58,18 @@ table{
border-top: solid 1px #000;
}
.borderSpacingUnset{
border-spacing: 0;
}
/*pdf_heading*/
.pdf_heading_table{
width: 100%;
margin-top: 8mm;
}
.marginBottom15{
margin-bottom: 15px;
}
.pdf_heading_width35{
width: 35%;
}