From b73219f6b5511d1e07292a2200a0b176cab3109a Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Mon, 29 Jun 2020 00:28:32 +0200 Subject: [PATCH] adjust invoice layout --- .../views/admin/de/pdfdocuments_lang.php | 34 ++--- .../documents/deliverynote/deliverynote.tpl | 109 ++++++-------- .../deliverynote/deliverynoteNoLogo.tpl | 93 +----------- .../includingFiles/informations.tpl | 9 ++ .../includingFiles/recipientAddress.tpl | 80 ++++------- .../includingFiles/salutation.tpl | 7 + .../documents/inc/elements/addressarea.tpl | 1 + .../documents/inc/elements/articlelist.tpl | 133 ++++++++++++++---- .../inc/elements/deliveryaddress.tpl | 16 ++- .../tpl/documents/inc/elements/foldmarks.tpl | 2 +- .../documents/inc/elements/informations.tpl | 48 ++++--- .../inc/elements/recipientAddress.tpl | 12 ++ .../views/tpl/documents/inc/helper/rulers.tpl | 8 +- .../views/tpl/documents/inc/page/base.tpl | 2 +- .../views/tpl/documents/inc/page/footer.tpl | 4 +- .../tpl/documents/inc/page/returnaddress.tpl | 2 +- .../invoice/includingFiles/conclusion.tpl | 18 +-- .../d3_article_costs_summary.tpl | 26 ---- .../invoice/includingFiles/informations.tpl | 18 +++ .../includingFiles/recipientAddress.tpl | 17 ++- .../invoice/includingFiles/salutation.tpl | 1 + .../views/tpl/documents/invoice/invoice.tpl | 15 +- .../tpl/documents/invoice/invoiceNoLogo.tpl | 90 +----------- metadata.php | 7 +- out/src/css/pdfStyling.css | 87 +++++++++--- 25 files changed, 396 insertions(+), 443 deletions(-) create mode 100644 Application/views/tpl/documents/deliverynote/includingFiles/informations.tpl create mode 100644 Application/views/tpl/documents/deliverynote/includingFiles/salutation.tpl create mode 100644 Application/views/tpl/documents/inc/elements/recipientAddress.tpl delete mode 100644 Application/views/tpl/documents/invoice/includingFiles/d3_article_costs_summary.tpl create mode 100644 Application/views/tpl/documents/invoice/includingFiles/informations.tpl diff --git a/Application/views/admin/de/pdfdocuments_lang.php b/Application/views/admin/de/pdfdocuments_lang.php index 89aa105..ee794c4 100644 --- a/Application/views/admin/de/pdfdocuments_lang.php +++ b/Application/views/admin/de/pdfdocuments_lang.php @@ -47,28 +47,28 @@ $aLang = array( 'D3_ORDER_OVERVIEW_PDF_COURT' => 'Amtsgericht ', 'D3_ORDER_OVERVIEW_PDF_HRBNR' => 'HRB ', 'D3_AUFTRAGSBESTAETIGUNG_PDF_PRETEXT' => 'Auf Grundlage unserer allgemeinen Liefer- und Geschäftsbedingungen bestätigen wir Ihnen folgenden Auftrag:', - 'D3_ORDER_OVERVIEW_PDF_USTID' => 'Ust.-ID: ', - 'D3_ORDER_OVERVIEW_PDF_USTIDNR' => 'Ust.-ID-Nr: ', + 'D3_ORDER_OVERVIEW_PDF_USTID' => 'Ust.-ID: ', + 'D3_ORDER_OVERVIEW_PDF_USTIDNR' => 'Ust.-ID-Nr: ', 'D3_ORDER_OVERVIEW_PDF_USTPERCENTAGE' => 'Ust. %: ', - 'D3_ORDER_OVERVIEW_PDF_TELEFON' => 'Telefon: ', - 'D3_ORDER_OVERVIEW_PDF_FAX' => 'Fax: ', + 'D3_ORDER_OVERVIEW_PDF_TELEFON' => 'Telefon: ', + 'D3_ORDER_OVERVIEW_PDF_FAX' => 'Fax: ', 'D3_ORDER_OVERVIEW_PDF_ORDERBILLNR' => 'Rechnungs-Nr.: ', 'D3_ORDER_OVERVIEW_PDF_ORDERNR' => 'Bestellnr.: ', 'D3_ORDER_OVERVIEW_PDF_DATE' => 'Datum: ', - 'D3_ORDER_OVERVIEW_PDF_AMOUNT' => 'Menge', - 'D3_ORDER_OVERVIEW_PDF_ARTNR' => 'Art.-Nr.', - 'D3_ORDER_OVERVIEW_PDF_DESCRIPTION' => 'Beschreibung', - 'D3_ORDER_OVERVIEW_PDF_UNITPRICE' => 'Einzelpreise', - 'D3_ORDER_OVERVIEW_PDF_TOTALPRICE' => 'Gesamtpreis', + 'D3_ORDER_OVERVIEW_PDF_AMOUNT' => 'Menge', + 'D3_ORDER_OVERVIEW_PDF_ARTNR' => 'Art.-Nr.', + 'D3_ORDER_OVERVIEW_PDF_DESCRIPTION' => 'Beschreibung', + 'D3_ORDER_OVERVIEW_PDF_UNITPRICE' => 'Einzelpreise', + 'D3_ORDER_OVERVIEW_PDF_TOTALPRICE' => 'Gesamtpreis', 'D3_ORDER_OVERVIEW_PDF_USED_PAYMENTMETHOD' => 'Ihre gewählte Zahlungsweise: ', - 'D3_ORDER_OVERVIEW_PDF_USED_GREETINGSORDER' => 'Den Rechnungsbetrag haben wir dankend erhalten.', - 'D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO' => 'Summe Artikel (brutto)', - 'D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT' => 'Rabatt', - 'D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMNETTO' => 'Summe Artikel (netto)', - 'D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAX' => 'zzgl. MwSt. ', - 'D3_ORDER_OVERVIEW_PDF_ORDERBILL_PERCENTAGE' => '%', - 'D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAXPERCVALUE' => ' Betrag', - 'D3_ORDER_OVERVIEW_PDF_ORDERBILL_DELIVERY' => 'Versandkosten (netto)', + 'D3_ORDER_OVERVIEW_PDF_USED_GREETINGSORDER'=> 'Den Rechnungsbetrag haben wir dankend erhalten.', + 'D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO'=> 'Summe Artikel (brutto)', + 'D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT' => 'Rabatt', + 'D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMNETTO' => 'Summe Artikel (netto)', + 'D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAX' => 'zzgl. MwSt. ', + 'D3_ORDER_OVERVIEW_PDF_ORDERBILL_PERCENTAGE' => '%', + 'D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAXPERCVALUE' => ' Betrag', + 'D3_ORDER_OVERVIEW_PDF_ORDERBILL_DELIVERY' => 'Versandkosten (netto)', 'D3_ORDER_OVERVIEW_PDF_ORDERBILL_TOTALSUMBRUT' => 'Gesamtsumme (brutto)', 'D3_ORDER_OVERVIEW_PDF_ORDERBILL_CUSTOMERNR' => 'Kundennummer: ', ); diff --git a/Application/views/tpl/documents/deliverynote/deliverynote.tpl b/Application/views/tpl/documents/deliverynote/deliverynote.tpl index 5503fab..fa53be1 100644 --- a/Application/views/tpl/documents/deliverynote/deliverynote.tpl +++ b/Application/views/tpl/documents/deliverynote/deliverynote.tpl @@ -1,67 +1,50 @@ -[{assign var= currency value= $order->getOrderCurrency()}] -[{assign var= deliveryPrice value= $order->getOrderDeliveryPrice()}] +[{assign var="currency" value=$order->getOrderCurrency()}] +[{assign var="deliveryPrice" value= $order->getOrderDeliveryPrice()}] +[{assign var="productVats" value= $order->getProductVats(false)}] +[{assign var="pagePadding" value=","|explode:"45,15,25,25"}] [{* top, right, bottom, left *}] +[{assign var="showLogo" value=$showLogo|default:true}] - - - - - [{block name="pdfTopingFile"}] - [{include file="d3pdfheader.tpl" showLogo=true}] - [{/block}] - - - [{block name="pdfFooterFile"}] - [{include file="d3pdffooter.tpl"}] - [{/block}] - - - [{* +++++ main page part +++++ *}] - [{block name="pdfHeadingFile"}] - [{block name="pdfHeaderFile"}] - [{include file="d3delnote_pdf_addressarea.tpl"}] - [{/block}] +[{capture append="pdfBlock_style"}] + [{block name="pdfStyles"}] + [{include file="d3pdfstyles.css"}] [{/block}] - [{* +++++Artikeltabelle+++++*}] - [{block name="articleListing"}] - - - - - - [{foreach from=$order->getOrderArticles(true) item=oOrderArticle}] - - - - - [{/foreach}] -
-
- [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_AMOUNT"}] -
- 		-
- [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DESCRIPTION"}] -
-
-
- [{$oOrderArticle->getFieldData('oxamount')}] -
- 		-
- [{$oOrderArticle->getFieldData('oxtitle')}] [{$oOrderArticle->getFieldData('oxselvariant')}]
- - [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->getFieldData('oxartnum')}] - -
-
+[{/capture}] + +[{capture append="pdfBlock_header"}] + [{block name="pdfHeader"}] + [{include file="d3pdfheader.tpl" showLogo=$showLogo}] [{/block}] - - [{block name="articleCosts"}][{/block}] - [{block name="pdfPastThankFile"}] +[{/capture}] + +[{capture append="pdfBlock_content"}] + [{* include file="d3pdfrulers.tpl" pagePadding=$pagePadding *}] + [{include file="d3pdffoldmarks.tpl" pagePadding=$pagePadding}] + + [{block name="pdfAddressArea"}] + [{include file="d3pdfaddressarea.tpl" addressfile="d3delnote_pdf_recipient.tpl"}] + [{/block}] + + [{block name="pdfInformations"}] + [{include file="d3pdfinformations.tpl" documentinformationfile="d3delnote_pdf_informations.tpl"}] + [{/block}] + + [{block name="pdfSalutation"}] + [{include file="d3delnote_pdf_salutation.tpl"}] + [{/block}] + + [{block name="pdfArticleList"}] + [{include file="d3pdfarticlelist.tpl" showPrices=false}] + [{/block}] + + [{block name="pdfConclusion"}] [{include file="d3delnote_pdf_conclusion.tpl"}] - [{/block}] - - \ No newline at end of file + [{/block}] +[{/capture}] + +[{capture append="pdfBlock_footer"}] + [{block name="pdfFooter"}] + [{include file="d3pdffooter.tpl" pagePadding=$pagePadding}] + [{/block}] +[{/capture}] + +[{include file="d3pdfbase.tpl" pagePadding=$pagePadding}] \ No newline at end of file diff --git a/Application/views/tpl/documents/deliverynote/deliverynoteNoLogo.tpl b/Application/views/tpl/documents/deliverynote/deliverynoteNoLogo.tpl index cb28af1..f40d245 100644 --- a/Application/views/tpl/documents/deliverynote/deliverynoteNoLogo.tpl +++ b/Application/views/tpl/documents/deliverynote/deliverynoteNoLogo.tpl @@ -1,92 +1 @@ -[{assign var= currency value= $order->getOrderCurrency()}] -[{assign var= deliveryPrice value= $order->getOrderDeliveryPrice()}] - - - - - - [{block name="pdfTopingFile"}] - [{include file="d3pdfheader.tpl" showLogo=false}] - [{/block}] - - - [{block name="pdfFooterFile"}] - [{include file="d3pdffooter.tpl"}] - [{/block}] - - - [{* +++++ main page part +++++ *}] - [{block name="pdfHeadingFile"}] - [{block name="pdfHeaderFile"}] - [{include file="d3delnote_pdf_addressarea.tpl"}] - [{/block}] - [{/block}] - [{* +++++Artikeltabelle+++++*}] - [{block name="articleListing"}] - - - - - - - [{foreach from=$order->getOrderArticles(true) item=oOrderArticle}] - [{* - - - - - - *}] - - - - - - [{/foreach}] -
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_AMOUNT"}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DESCRIPTION"}]
[{$oOrderArticle->oxorderarticles__oxamount->value }]
- [{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }] -
- [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }] -
[{$oOrderArticle->oxorderarticles__oxvat->value }]
[{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}]
[{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}]
[{$oOrderArticle->oxorderarticles__oxamount->value }]
[{$oOrderArticle->oxorderarticles__oxartnum->value }]
[{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{$oOrderArticle->oxorderarticles__oxselvariant->getRawValue()}]
- [{/block}] - - [{block name="articleCosts"}] - [{* - - [{ ++++++Artikelzusammenfassung++++++ }] - - [{ ++++++Kosten der Bestellung++++++ }] - - -
-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO"}]
- [{if $order->getFormattedDiscount() != 0}] -
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT"}]
- [{/if}] -
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMNETTO"}]
- [{foreach from=$order->getVats() key=VatKey item=oVat}] -
[{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"}]
- [{/foreach}] -
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DELIVERY"}]
-
[{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"}]
-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TOTALSUMBRUT"}]
- 		-
[{$order->getFormattedTotalBrutSum()}] [{$currency->name}]
- [{if $order->getFormattedDiscount() != 0}] -
-[{$order->getFormattedDiscount()}] [{$currency->name}]
- [{/if}] -
[{$order->getFormattedTotalNetSum()}] [{$currency->name}]
-
[{$lang->formatCurrency($oVat, $currency)}] [{$currency->name}]
-
[{$lang->formatCurrency($deliveryPrice->getNettoPrice(), $currency)}] [{$currency->name}]
-
[{$lang->formatCurrency($deliveryPrice->getVATValue(), $currency)}] [{$currency->name}]
-
[{$order->getFormattedTotalOrderSum()}] [{$currency->name}]
-
*}] - [{/block}] - [{block name="pdfPastThankFile"}] - [{include file="d3delnote_pdf_conclusion.tpl"}] - [{/block}] - - \ No newline at end of file +[{include file="d3deliverynote_pdf.tpl" showLogo=false}] \ No newline at end of file diff --git a/Application/views/tpl/documents/deliverynote/includingFiles/informations.tpl b/Application/views/tpl/documents/deliverynote/includingFiles/informations.tpl new file mode 100644 index 0000000..f2429dd --- /dev/null +++ b/Application/views/tpl/documents/deliverynote/includingFiles/informations.tpl @@ -0,0 +1,9 @@ +[{block name="informations"}] +
+ [{block name="pdfDocumentInformations"}] +
+ [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DATE"}][{$smarty.now|date_format:"%d.%m.%Y"}] +
+ [{/block}] +
+[{/block}] \ No newline at end of file diff --git a/Application/views/tpl/documents/deliverynote/includingFiles/recipientAddress.tpl b/Application/views/tpl/documents/deliverynote/includingFiles/recipientAddress.tpl index 662a120..bb4e8c3 100644 --- a/Application/views/tpl/documents/deliverynote/includingFiles/recipientAddress.tpl +++ b/Application/views/tpl/documents/deliverynote/includingFiles/recipientAddress.tpl @@ -1,57 +1,25 @@ -[{block name="pdfHeading"}] - - [{block name="heading_owner_information"}] - - - - [{/block}] - [{block name="heading_order_information"}] - - - - - [{/block}] -
-
[{$shop->oxshops__oxname->value}] - [{$shop->oxshops__oxstreet->value}] - [{$shop->oxshops__oxzip->value}] [{$shop->oxshops__oxcity->value}]
-
- [{* +++++++Lieferadressen dynamisch+++++++ *}] - [{if $order->getFieldData('oxdellname')}] -
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYADDRESS"}]
- [{if $order->oxorder__oxdelcompany->value}] -
[{$order->getFieldData('oxdelcompany')}]
- [{/if}] -
[{$order->getFieldData('oxdelfname')}] [{$order->getFieldData('oxdellname')}]
-
[{$order->getFieldData('oxdelstreet')}] [{$order->getFieldData('oxdelstreetnr')}]
-
[{$order->getFieldData('oxdelzip')}] [{$order->getFieldData('oxdelcity')}]
-
[{$shop->getFieldData('oxcountry')}]
-
[{$shop->getFieldData('oxdeladdinfo')}]
- [{else}] - [{if $order->getFieldData('oxbillcompany')}] -
[{$order->getFieldData('oxbillcompany')}]
- [{/if}] -
[{$order->getFieldData('oxbillfname')}] [{$order->getFieldData('oxbilllname')}]
-
[{$order->getFieldData('oxbillstreet')}] [{$order->getFieldData('oxbillstreetnr')}]
-
[{$order->getFieldData('oxbillzip')}] [{$order->getFieldData('oxbillcity')}]
-
[{$shop->getFieldData('oxcountry')}]
- [{/if}] - [{*Bestellnummer,Rechnungsvermerk, 'Ihre bestellung vom...'*}] - 		-
[{oxmultilang ident="D3_DELIVERYNOTE_PDF_QUOTECUSTMNR"}]
-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_CUSTOMERNR"}] [{$user->getFieldData('oxcustnr')}]
-
[{$shop->getFieldData('oxcity')}], [{$smarty.now|date_format:"%d.%m.%G"}]
-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTIDNR"}][{$shop->getFieldData('oxvatnumber')}]
-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILLNR"}][{$order->getFieldData('oxbillnr')}]
-
- - - - - - - -
-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYNOTE"}][{$order->oxorder__oxordernr->value}]
-
-
[{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSINCERELY"}][{$order->oxorder__oxorderdate->value|date_format:"%d.%m.%Y"}][{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSAT"}]
-
+[{block name="recipientaddress"}] + [{if $order->getFieldData('oxdellname')}] + [{if $order->getFieldData('oxdelcompany')}] +
[{$order->getFieldData('oxdelcompany')}]
+ [{/if}] +
[{$order->getFieldData('oxdelfname')}] [{$order->getFieldData('oxdellname')}]
+ [{if $order->getFieldData('oxdeladdinfo')}] +
[{$order->getFieldData('oxdeladdinfo')}]
+ [{/if}] +
[{$order->getFieldData('oxdelstreet')}] [{$order->getFieldData('oxdelstreetnr')}]
+
[{$order->getFieldData('oxdelzip')}] [{$order->getFieldData('oxdelcity')}]
+
[{$order->getFieldData('oxdelcountry')}]
+ [{else}] + [{if $order->getFieldData('oxbillcompany')}] +
[{$order->getFieldData('oxbillcompany')}]
+ [{/if}] +
[{$order->getFieldData('oxbillfname')}] [{$order->getFieldData('oxbilllname')}]
+ [{if $order->getFieldData('oxbilladdinfo')}] +
[{$order->getFieldData('oxbilladdinfo')}]
+ [{/if}] +
[{$order->getFieldData('oxbillstreet')}] [{$order->getFieldData('oxbillstreetnr')}]
+
[{$order->getFieldData('oxbillzip')}] [{$order->getFieldData('oxbillcity')}]
+
[{$order->getFieldData('oxbillcountry')}]
+ [{/if}] [{/block}] \ No newline at end of file diff --git a/Application/views/tpl/documents/deliverynote/includingFiles/salutation.tpl b/Application/views/tpl/documents/deliverynote/includingFiles/salutation.tpl new file mode 100644 index 0000000..58390f8 --- /dev/null +++ b/Application/views/tpl/documents/deliverynote/includingFiles/salutation.tpl @@ -0,0 +1,7 @@ +[{block name="salutation"}] +
+
Rechnung
+
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERNR"}][{$order->getFieldData('oxordernr')}]
+
[{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSINCERELY"}][{$order->getFieldData('oxorderdate')|date_format:"%d.%m.%Y"}][{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSAT"}] [{$shop->oxshops__oxname->value}]
+
+[{/block}] \ No newline at end of file diff --git a/Application/views/tpl/documents/inc/elements/addressarea.tpl b/Application/views/tpl/documents/inc/elements/addressarea.tpl index 93338a2..72c3fd3 100644 --- a/Application/views/tpl/documents/inc/elements/addressarea.tpl +++ b/Application/views/tpl/documents/inc/elements/addressarea.tpl @@ -1,4 +1,5 @@ [{assign var="backaddressfile" value=$backaddressfile|default:"d3pdfreturnaddress.tpl"}] +[{assign var="addressfile" value=$addressfile|default:"d3pdfrecipientaddress.tpl"}]
diff --git a/Application/views/tpl/documents/inc/elements/articlelist.tpl b/Application/views/tpl/documents/inc/elements/articlelist.tpl index 7f407f5..52c6519 100644 --- a/Application/views/tpl/documents/inc/elements/articlelist.tpl +++ b/Application/views/tpl/documents/inc/elements/articlelist.tpl @@ -1,5 +1,7 @@ +[{assign var="showPrices" value=$showPrices|default:true}] + [{block name="articlelist"}] - +
- - - + [{if $showPrices}] + + + + [{/if}] [{foreach from=$order->getOrderArticles(true) item=oOrderArticle}] @@ -29,25 +33,104 @@ [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }] - + + + [{/if}] + + [{/foreach}] + [{foreach from=$order->getOrderArticles(true) item=oOrderArticle}] + + - - + + + [{/if}] + + [{/foreach}] + [{foreach from=$order->getOrderArticles(true) item=oOrderArticle}] + + + + [{if $showPrices}] + + + + [{/if}] + + [{/foreach}] + [{foreach from=$order->getOrderArticles(true) item=oOrderArticle}] + + + + [{if $showPrices}] + + + + [{/if}] [{/foreach}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_AMOUNT"}] @@ -7,15 +9,17 @@ [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DESCRIPTION"}] - [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTPERCENTAGE"}] - - [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_UNITPRICE"}] - - [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TOTALPRICE"}] - + [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTPERCENTAGE"}] + + [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_UNITPRICE"}] + + [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TOTALPRICE"}] +
- [{$oOrderArticle->oxorderarticles__oxvat->value }] + [{if $showPrices}] + + [{$oOrderArticle->oxorderarticles__oxvat->value }] + + [{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}] + + [{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}] +
+ [{$oOrderArticle->oxorderarticles__oxamount->value }] - [{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}] + + [{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }] +
+ + [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }] + 		- [{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}] + [{if $showPrices}] + + [{$oOrderArticle->oxorderarticles__oxvat->value }] + + [{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}] + + [{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}] +
+ [{$oOrderArticle->oxorderarticles__oxamount->value }] + [{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }] +
+ + [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }] + + 		+ [{$oOrderArticle->oxorderarticles__oxvat->value }] + + [{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}] + + [{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}] +
+ [{$oOrderArticle->oxorderarticles__oxamount->value }] + + [{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }] +
+ + [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }] + + 		+ [{$oOrderArticle->oxorderarticles__oxvat->value }] + + [{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}] + + [{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}] +
[{/block}] -[{block name="articleCosts"}] - - - [{block name="d3_article_costs_summary"}] - [{include file="d3pdfarticlecostsummary.tpl"}] - [{/block}] - -
-[{/block}] \ No newline at end of file +[{if $showPrices}] + [{block name="articleCosts"}] + + + [{block name="d3_article_costs_summary"}] + [{include file="d3pdfarticlecostsummary.tpl"}] + [{/block}] + +
+ [{/block}] +[{/if}] \ No newline at end of file diff --git a/Application/views/tpl/documents/inc/elements/deliveryaddress.tpl b/Application/views/tpl/documents/inc/elements/deliveryaddress.tpl index a9ad966..cacea05 100644 --- a/Application/views/tpl/documents/inc/elements/deliveryaddress.tpl +++ b/Application/views/tpl/documents/inc/elements/deliveryaddress.tpl @@ -1,17 +1,19 @@ [{block name="deliveryaddress"}] [{if $order->getFieldData('oxdelstreet')}]
-
+
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYADDRESS"}]
[{if $order->getFieldData('oxdelcompany')}] -
[{$order->getFieldData('oxdelcompany')}]
+
[{$order->getFieldData('oxdelcompany')}]
[{/if}] -
[{$order->getFieldData('oxdelfname')}] [{$order->getFieldData('oxdellname')}]
-
[{$order->getFieldData('oxdelstreet')}] [{$order->getFieldData('oxdelstreetnr')}]
-
[{$order->getFieldData('oxdelzip')}] [{$order->getFieldData('oxdelcity')}]
-
[{$shop->getFieldData('oxcountry')}]
-
[{$shop->getFieldData('oxdeladdinfo')}]
+
[{$order->getFieldData('oxdelfname')}] [{$order->getFieldData('oxdellname')}]
+ [{if $order->getFieldData('oxdeladdinfo')}] +
[{$order->getFieldData('oxdeladdinfo')}]
+ [{/if}] +
[{$order->getFieldData('oxdelstreet')}] [{$order->getFieldData('oxdelstreetnr')}]
+
[{$order->getFieldData('oxdelzip')}] [{$order->getFieldData('oxdelcity')}]
+
[{$order->getFieldData('oxdelcountry')}]
[{/if}] [{/block}] \ No newline at end of file diff --git a/Application/views/tpl/documents/inc/elements/foldmarks.tpl b/Application/views/tpl/documents/inc/elements/foldmarks.tpl index 34a9218..9b99fff 100644 --- a/Application/views/tpl/documents/inc/elements/foldmarks.tpl +++ b/Application/views/tpl/documents/inc/elements/foldmarks.tpl @@ -1,4 +1,4 @@ -[{assign var="defaultPagePadding" value=","|explode:"45,20,10,25"}] [{* top, right, bottom, left *}] +[{assign var="defaultPagePadding" value=","|explode:"45,15,25,25"}] [{* top, right, bottom, left *}] [{assign var="pagePadding" value=$pagePadding|default:$defaultPagePadding}] - - - - [{block name="pdfTopingFile"}] - [{include file="d3pdfheader.tpl" showLogo=false}] - [{/block}] - - - [{block name="pdfFooterFile"}] - [{include file="d3pdffooter.tpl"}] - [{/block}] - - - [{* +++++ main page part +++++ *}] - [{block name="pdfHeadingFile"}] - [{block name="pdfHeaderFile"}] - [{include file="d3invoice_pdf_addressarea.tpl"}] - [{/block}] - [{/block}] - [{* +++++Artikeltabelle+++++*}] - [{block name="articleListing"}] - - - - - - - - - [{foreach from=$order->getOrderArticles(true) item=oOrderArticle}] - - - - - - - - [{/foreach}] -
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_AMOUNT"}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DESCRIPTION"}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTPERCENTAGE"}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_UNITPRICE"}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TOTALPRICE"}]
[{$oOrderArticle->oxorderarticles__oxamount->value }]
- [{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }] -
- [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }] -
[{$oOrderArticle->oxorderarticles__oxvat->value }]
[{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}]
[{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}]
- [{/block}] - - [{block name="articleCosts"}] - - - [{* ++++++Artikelzusammenfassung++++++ *}] - - [{* ++++++Kosten der Bestellung++++++ *}] - - -
-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO"}]
- [{if $order->getFormattedDiscount() != 0}] -
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT"}]
- [{/if}] -
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMNETTO"}]
- [{foreach from=$productVats key=VatKey item=oVat}] -
[{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"}]
- [{/foreach}] -
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DELIVERY"}]
-
[{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"}]
-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TOTALSUMBRUT"}]
- 		-
[{$order->getFormattedTotalBrutSum()}] [{$currency->name}]
- [{if $order->getFormattedDiscount() != 0}] -
-[{$order->getFormattedDiscount()}] [{$currency->name}]
- [{/if}] -
[{$order->getFormattedTotalNetSum()}] [{$currency->name}]
-
[{$lang->formatCurrency($oVat, $currency)}] [{$currency->name}]
-
[{$lang->formatCurrency($deliveryPrice->getNettoPrice(), $currency)}] [{$currency->name}]
-
[{$lang->formatCurrency($deliveryPrice->getVATValue(), $currency)}] [{$currency->name}]
-
[{$order->getFormattedTotalOrderSum()}] [{$currency->name}]
-
- [{/block}] - [{block name="pdfPastThankFile"}] - [{include file="d3invoice_pdf_conclusion.tpl"}] - [{/block}] - - \ No newline at end of file +[{include file="d3invoice_pdf.tpl" showLogo=false}] \ No newline at end of file diff --git a/metadata.php b/metadata.php index 4ca27c6..777179e 100644 --- a/metadata.php +++ b/metadata.php @@ -51,13 +51,15 @@ $aModule = [ 'd3deliverynote_pdf.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/deliverynote/deliverynote.tpl', 'd3deliverynoteNoLogo_pdf.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/deliverynote/deliverynoteNoLogo.tpl', - 'd3delnote_pdf_addressarea.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/deliverynote/includingFiles/recipientAddress.tpl', + 'd3delnote_pdf_informations.tpl'=> 'd3/pdfdocuments/Application/views/tpl/documents/deliverynote/includingFiles/informations.tpl', + 'd3delnote_pdf_recipient.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/deliverynote/includingFiles/recipientAddress.tpl', + 'd3delnote_pdf_salutation.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/deliverynote/includingFiles/salutation.tpl', 'd3delnote_pdf_conclusion.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/deliverynote/includingFiles/conclusion.tpl', 'd3delnote_pdf_style.css' => 'd3/pdfdocuments/out/src/css/deliverynote.css', 'd3invoice_pdf.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/invoice.tpl', 'd3invoiceNoLogo_pdf.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/invoiceNoLogo.tpl', - 'd3invoice_pdf_addressarea.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/includingFiles/recipientAddress.tpl', + 'd3invoice_pdf_informations.tpl'=> 'd3/pdfdocuments/Application/views/tpl/documents/invoice/includingFiles/informations.tpl', 'd3invoice_pdf_salutation.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/includingFiles/salutation.tpl', 'd3invoice_pdf_conclusion.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/includingFiles/conclusion.tpl', @@ -67,6 +69,7 @@ $aModule = [ 'd3pdfreturnaddress.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/inc/page/returnaddress.tpl', 'd3pdfaddressarea.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/inc/elements/addressarea.tpl', + 'd3pdfrecipientaddress.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/inc/elements/recipientAddress.tpl', 'd3pdfinformations.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/inc/elements/informations.tpl', 'd3pdfdeladdress.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/inc/elements/deliveryaddress.tpl', 'd3pdfarticlelist.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/inc/elements/articlelist.tpl', diff --git a/out/src/css/pdfStyling.css b/out/src/css/pdfStyling.css index e5044c5..366f541 100644 --- a/out/src/css/pdfStyling.css +++ b/out/src/css/pdfStyling.css @@ -36,6 +36,17 @@ .addressarea .recipientAddress { height: 27.3mm; } +.addressarea .recipientAddress .location, +.deliveryaddress .location { + font-weight: bold; +} +.addressarea .recipientAddress .country { + padding-top: 5mm; +} +.deliveryaddress .headline { + font-size: 10px; + padding-bottom: 2mm; +} .informations { width: 75mm; @@ -78,6 +89,23 @@ padding: 0 2mm; } +.contactinformations, +.bankaccountinformations, +.documentinformations { + margin-bottom: 5mm; +} +.contactinformations div, +.bankaccountinformations div, +.documentinformations div { + text-align: right; + font-size: 11px; +} +.contactinformations div.headline, +.bankaccountinformations div.headline, +.documentinformations div.headline { + font-weight: bold; +} + /*debug hilfe*/ .eraseBug{ border: dashed blueviolet 1px; @@ -178,61 +206,85 @@ table{ } /*order_article_listing*/ -.article_table { +.article_table, +.article_table_prices { width: 100%; margin-top: 5mm; border-spacing: 0; border-collapse: collapse; } .article_table th, -.article_table td { +.article_table td, +.article_table_prices th, +.article_table_prices td { padding-bottom: 2mm; vertical-align: top; } -.article_table th { +.article_table th, +.article_table_prices th { border-bottom: solid 0.15mm #000; font-weight: normal; font-size: 11px; } -.article_table td { +.article_table td, +.article_table_prices td { padding-top: 2mm; font-size: 12px; } .article_table th.amount, -.article_table td.amount, -.article_table th.tax, -.article_table td.tax { +.article_table td.amount { width: 10%; } -.article_table th.tax, -.article_table td.tax { +.article_table_prices th.amount, +.article_table_prices td.amount, +.article_table_prices th.tax, +.article_table_prices td.tax { + width: 10%; +} +.article_table_prices th.tax, +.article_table_prices td.tax { text-align: right; padding-right: 0; } .article_table th.description, .article_table td.description { + width: 90%; +} +.article_table_prices th.description, +.article_table_prices td.description { width: 50%; } -.article_table td.description .artnr { +.article_table td.description .artnr, +.article_table_prices td.description .artnr { font-size: 9px; } -.article_table th.unitPrice, -.article_table td.unitPrice, -.article_table th.totalPrice, -.article_table td.totalPrice { +.article_table_prices th.unitPrice, +.article_table_prices td.unitPrice, +.article_table_prices th.totalPrice, +.article_table_prices td.totalPrice { width: 15%; text-align: right; } -.article_table td.amount { +.article_table td.amount, +.article_table_prices td.amount { text-align: right; padding-right: 10mm; } -.article_table td.unitPrice, -.article_table td.totalPrice { +.article_table_prices td.unitPrice, +.article_table_prices td.totalPrice { text-align: right; padding-right: 0; } +.conclusion_table { + width: 100%; + border-spacing: 0; + border-collapse: collapse; + padding-top: 10mm +} +.conclusion_table td { + font-size: 12px; +} .order_article_listing_width_amount{ width: 20px; } @@ -280,6 +332,7 @@ table{ .article_costs_table{ width: 100%; border-top: solid 0.15mm #000; + border-bottom: solid 0.15mm #000; } .article_costs_table_desc_width70{ width: 70%;