From 484d85e431f33240f9a875d92b949587d743d8a6 Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Sun, 28 Jun 2020 01:03:15 +0200 Subject: [PATCH] adjust invoice layout --- .../views/admin/de/pdfdocuments_lang.php | 4 +- .../deliverynote/deliverynoteNoLogo.tpl | 2 +- .../{pdfPastThank.tpl => conclusion.tpl} | 0 .../{pdfHeader.tpl => recipientAddress.tpl} | 2 +- .../inc/elements/articlecostssummary.tpl | 26 ++++++ .../documents/inc/elements/articlelist.tpl | 53 +++++++++++ .../inc/elements/deliveryaddress.tpl | 17 ++++ .../tpl/documents/inc/elements/foldmarks.tpl | 2 +- .../views/tpl/documents/inc/helper/rulers.tpl | 2 +- .../views/tpl/documents/inc/page/base.tpl | 2 +- .../views/tpl/documents/inc/page/footer.tpl | 4 +- .../{pdfPastThank.tpl => conclusion.tpl} | 19 ++-- .../{pdfHeader.tpl => recipientAddress.tpl} | 0 .../invoice/includingFiles/salutation.tpl | 6 ++ .../views/tpl/documents/invoice/invoice.tpl | 74 ++++----------- metadata.php | 12 ++- out/src/css/pdfStyling.css | 89 ++++++++++++++++--- 17 files changed, 215 insertions(+), 99 deletions(-) rename Application/views/tpl/documents/deliverynote/includingFiles/{pdfPastThank.tpl => conclusion.tpl} (100%) rename Application/views/tpl/documents/deliverynote/includingFiles/{pdfHeader.tpl => recipientAddress.tpl} (92%) create mode 100644 Application/views/tpl/documents/inc/elements/articlecostssummary.tpl create mode 100644 Application/views/tpl/documents/inc/elements/articlelist.tpl create mode 100644 Application/views/tpl/documents/inc/elements/deliveryaddress.tpl rename Application/views/tpl/documents/invoice/includingFiles/{pdfPastThank.tpl => conclusion.tpl} (51%) rename Application/views/tpl/documents/invoice/includingFiles/{pdfHeader.tpl => recipientAddress.tpl} (100%) create mode 100644 Application/views/tpl/documents/invoice/includingFiles/salutation.tpl diff --git a/Application/views/admin/de/pdfdocuments_lang.php b/Application/views/admin/de/pdfdocuments_lang.php index bf3d76d..89aa105 100644 --- a/Application/views/admin/de/pdfdocuments_lang.php +++ b/Application/views/admin/de/pdfdocuments_lang.php @@ -22,10 +22,8 @@ $aLang = array( 'ORDER_OVERVIEW_PDF_auftragsbestaetigung' => 'Auftragsbestätigung', 'ORDER_OVERVIEW_PDF_auftragsbestaetigung_TEXTAREA' => 'Text für Auftragsbestätigung', 'ORDER_OVERVIEW_PDF_AUFTRAGSNUMMER' => 'Auftragsbestätigung:', - //'ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_1' => 'Herzlichen Dank für Ihre Bestellung! Bitte empfehlen Sie uns weiter.', 'ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_1' => 'Vielen Dank für Ihren Einkauf!', - 'ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_2' => 'Ihr Elektroversand Schmidt', - //'ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_2' => '', + 'ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_2' => 'Ihr Team von ', 'ORDER_OVERVIEW_PDF_auftragsbestaetigung_Alternativtext' => 'Alle Artikel sind ab Lager lieferbar und gehen schnellstmöglich in den Versand.', 'ORDER_OVERVIEW_PDF_bestellbestaetitung_TEXTAREA' => 'Individueller Zahlungstext', 'PAYMENT_MAIN_D3SHORTDESCPDF' => 'Rechnungstext', diff --git a/Application/views/tpl/documents/deliverynote/deliverynoteNoLogo.tpl b/Application/views/tpl/documents/deliverynote/deliverynoteNoLogo.tpl index 1af284c..cb28af1 100644 --- a/Application/views/tpl/documents/deliverynote/deliverynoteNoLogo.tpl +++ b/Application/views/tpl/documents/deliverynote/deliverynoteNoLogo.tpl @@ -26,7 +26,7 @@ [{/block}] [{* +++++Artikeltabelle+++++*}] [{block name="articleListing"}] - +
diff --git a/Application/views/tpl/documents/deliverynote/includingFiles/pdfPastThank.tpl b/Application/views/tpl/documents/deliverynote/includingFiles/conclusion.tpl similarity index 100% rename from Application/views/tpl/documents/deliverynote/includingFiles/pdfPastThank.tpl rename to Application/views/tpl/documents/deliverynote/includingFiles/conclusion.tpl diff --git a/Application/views/tpl/documents/deliverynote/includingFiles/pdfHeader.tpl b/Application/views/tpl/documents/deliverynote/includingFiles/recipientAddress.tpl similarity index 92% rename from Application/views/tpl/documents/deliverynote/includingFiles/pdfHeader.tpl rename to Application/views/tpl/documents/deliverynote/includingFiles/recipientAddress.tpl index 91a16ce..662a120 100644 --- a/Application/views/tpl/documents/deliverynote/includingFiles/pdfHeader.tpl +++ b/Application/views/tpl/documents/deliverynote/includingFiles/recipientAddress.tpl @@ -45,7 +45,7 @@
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_AMOUNT"}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}]
diff --git a/Application/views/tpl/documents/inc/elements/articlecostssummary.tpl b/Application/views/tpl/documents/inc/elements/articlecostssummary.tpl new file mode 100644 index 0000000..a440358 --- /dev/null +++ b/Application/views/tpl/documents/inc/elements/articlecostssummary.tpl @@ -0,0 +1,26 @@ +[{* ++++++Beschreibung der Kostensummierung++++++ *}] + +[{* ++++++Kostensummierung++++++ *}] + \ No newline at end of file diff --git a/Application/views/tpl/documents/inc/elements/articlelist.tpl b/Application/views/tpl/documents/inc/elements/articlelist.tpl new file mode 100644 index 0000000..7f407f5 --- /dev/null +++ b/Application/views/tpl/documents/inc/elements/articlelist.tpl @@ -0,0 +1,53 @@ +[{block name="articlelist"}] +
-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYNOTE"}][{$order->oxorder__oxordernr->value}]
+
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYNOTE"}][{$order->oxorder__oxordernr->value}]
+
[{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}]
+
+ + + + + + + + [{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"}] + + + [{block name="d3_article_costs_summary"}] + [{include file="d3pdfarticlecostsummary.tpl"}] + [{/block}] + +
+[{/block}] \ 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 new file mode 100644 index 0000000..a9ad966 --- /dev/null +++ b/Application/views/tpl/documents/inc/elements/deliveryaddress.tpl @@ -0,0 +1,17 @@ +[{block name="deliveryaddress"}] + [{if $order->getFieldData('oxdelstreet')}] +
+
+ [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYADDRESS"}] +
+ [{if $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')}]
+
+ [{/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 07f3668..34a9218 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"}] +[{assign var="defaultPagePadding" value=","|explode:"45,20,10,25"}] [{* top, right, bottom, left *}] [{assign var="pagePadding" value=$pagePadding|default:$defaultPagePadding}]