diff --git a/Application/views/tpl/deliverynote.tpl b/Application/views/tpl/deliverynote.tpl index 99392eb..30ca4e9 100644 --- a/Application/views/tpl/deliverynote.tpl +++ b/Application/views/tpl/deliverynote.tpl @@ -3,10 +3,11 @@ -
- + [{block name="pdf_header"}] +
+
+ [{/block}] - +
- - - + [{/block}]
- + + [{* +++++ main page part +++++ *}] +[{block name="pdf_heading"}] +
+ [{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}]
@@ -83,8 +158,10 @@
[{$shop->oxshops__oxinfoemail->value}]
+ [{if $order->oxorder__oxbillcompany->value}]
[{$order->oxorder__oxbillcompany->value}]
[{/if}] @@ -120,44 +197,40 @@
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTIDNR"}][{$shop->oxshops__oxvatnumber->value}]
- +[{/block}] [{* +++++Artikeltabelle+++++*}] +[{block name="order_article_listing"}] - - - - - + + + + + - [{* +++++auslagerbar?+++++ *}] + [{foreach from=$order->getOrderArticles(true) item=oOrderArticle}] - - - - - - - [{foreach from=$order->getOrderArticles(true) item=oOrderArticle}] - - - + - - - + + + - [{/foreach}] + [{/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"}]
[{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__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__oxvat->value }]
[{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}]
[{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}]
+[{/block}] - + [{block name="order_aritcle_costs"}] +
[{* ++++++Artikelzusammenfassung++++++ *}] - [{* ++++++Zahlenteil der Zusammenfassung der Kosten++++++ *}] -
+
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO"}]
[{if $order->getFormattedDiscount() != 0}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT"}]
@@ -167,11 +240,11 @@
[{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_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}]
@@ -184,21 +257,23 @@
- - - - - - [{* +++++++Individueller Zahlungstext+++++++ *}] - [{if $order->oxorder__d3pdftextbestellbestaetigung->value}] - - [{else}] - - [{/if}] - - - -
 
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USED_PAYMENTMETHOD"}][{$payment->oxpayments__oxdesc->value}]
[{$order->oxorder__d3pdftextbestellbestaetigung->value}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USED_GREETINGSORDER"}]
 
[{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_1"}]
[{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_2"}]
+ [{/block}] + [{block name="order_shop_past_thank"}] + + + + [{* +++++++Individueller Zahlungstext+++++++ *}] + [{if $order->oxorder__d3pdftextbestellbestaetigung->value}] + + [{else}] + + [{/if}] + [{*+++++++++++*}] + + + +
 
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USED_PAYMENTMETHOD"}][{$payment->oxpayments__oxdesc->value}]
[{$order->oxorder__d3pdftextbestellbestaetigung->value}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USED_GREETINGSORDER"}]
 
[{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_1"}]
[{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_2"}]
+ [{/block}]