diff --git a/Application/views/tpl/deliverynote.tpl b/Application/views/tpl/deliverynote.tpl index f5f364c..f4e505e 100644 --- a/Application/views/tpl/deliverynote.tpl +++ b/Application/views/tpl/deliverynote.tpl @@ -32,7 +32,7 @@ [{$shop->oxshops__oxname->value}] - [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_GESCHAEFTSFUEHRER"}] + [{$shop->oxshops__oxfname->value}][{$shop->oxshops__oxlname->value}] [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_BANKVERBINDUNG"}] @@ -60,37 +60,31 @@ - - - - - - - - - - - - - - - - - - -
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_GET_IN_CONTACT"}]
[{$shop->oxshops__oxname->value}] - [{$shop->oxshops__oxstreet->value}] - [{$shop->oxshops__oxzip->value}] [{$shop->oxshops__oxcity->value}][{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TELEFON"}][{$shop->oxshops__oxtelefon->value}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_FAX"}][{$shop->oxshops__oxtelefax->value}]
[{$shop->oxshops__oxinfoemail->value}]
+ + + + -
+
[{$shop->oxshops__oxname->value}] - [{$shop->oxshops__oxstreet->value}] - [{$shop->oxshops__oxzip->value}] [{$shop->oxshops__oxcity->value}]
+ 		+
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_GET_IN_CONTACT"}]
+
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TELEFON"}][{$shop->oxshops__oxtelefon->value}]
+
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_FAX"}][{$shop->oxshops__oxtelefax->value}]
+
[{$shop->oxshops__oxinfoemail->value}]
+
+ [{if $order->oxorder__oxbillcompany->value}]
[{$order->oxorder__oxbillcompany->value}]
+ [{/if}]
[{$order->oxorder__oxbillfname->value}] [{$order->oxorder__oxbilllname->value}]
[{$order->oxorder__oxbillstreet->value}] [{$order->oxorder__oxbillstreetnr->value}]
[{$order->oxorder__oxbillzip->value}] [{$order->oxorder__oxbillcity->value}]
[{$shop->oxshops__oxcountry->value}]
-[{* +++++Lieferadressen dynamisch++++++ *}] + [{* +++++++Lieferadressen dynamisch+++++++ *}] [{if $order->oxorder__oxdelstreet->value}] -
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYADDRESS"}]
+
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYADDRESS"}]
[{if $order->oxorder__oxdelcompany->value}]
[{$order->oxorder__oxdelcompany->value}]
[{/if}]
[{$order->oxorder__oxdelfname->value}] [{$order->oxorder__oxdellname->value}]
[{$order->oxorder__oxdelstreet->value}] [{$order->oxorder__oxdelstreetnr->value}]
@@ -98,8 +92,13 @@
[{$shop->oxshops__oxcountry->value}]
[{$shop->oxshops__oxdeladdinfo->value}]
[{/if}] + + [{*Bestellnummer,Rechnungsvermerk, 'Ihre bestellung vom...'*}] +
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERNR"}][{$order->oxorder__oxordernr->value}]
+
[{if $order->oxorder__d3pdftextkostenstelle_kunden->value}][{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_INVOICENOTE"}][{$order->oxorder__d3pdftextkostenstelle_kunden->value}][{/if}]
+
[{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSINCERELY"}][{$order->oxorder__oxorderdate->value|date_format:"%d.%m.%Y"}][{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSAT"}]
 +
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_BANKVERBINDUNG"}]
[{$shop->oxshops__oxbankname->value}]
[{oxmultilang ident="ORDER_OVERVIEW_PDF_ACCOUNTNR"}][{$shop->oxshops__oxibannumber->value}]
@@ -111,22 +110,21 @@
- + [{*
-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERNR"}][{$order->oxorder__oxordernr->value}]
[{if $order->oxorder__d3pdftextkostenstelle_kunden->value}][{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_INVOICENOTE"}][{$order->oxorder__d3pdftextkostenstelle_kunden->value}][{/if}]
-
[{if $order->oxorder__oxremark->value }][{$order->oxorder__oxremark->value}][{/if}]
[{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSINCERELY"}][{$order->oxorder__oxorderdate->value|date_format:"%d.%m.%Y"}][{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSAT"}]
+ *}] - + @@ -134,7 +132,7 @@ - + @@ -143,7 +141,7 @@ - + @@ -155,7 +153,7 @@ - + @@ -163,7 +161,7 @@ - + @@ -172,7 +170,7 @@ - + @@ -180,7 +178,7 @@ - + @@ -188,7 +186,7 @@ - + @@ -198,7 +196,7 @@ - + @@ -207,7 +205,7 @@ - + @@ -215,7 +213,7 @@ - + @@ -223,7 +221,7 @@ - + @@ -231,7 +229,7 @@ - + @@ -239,7 +237,7 @@ - + @@ -247,7 +245,7 @@ - + @@ -255,7 +253,7 @@ - + @@ -264,8 +262,13 @@
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_AMOUNT"}] [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}][{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DESCRIPTION"}][{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__oxartnum->value }][{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }][{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }] [{$oOrderArticle->oxorderarticles__oxvat->value }] [{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}] [{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMNETTO"}][{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMNETTO"}] [{$order->getFormattedTotalNetSum()}] [{$currency->name}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT"}][{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT"}] -[{$order->getFormattedDiscount()}] [{$currency->name}]
 [{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"}] [{$lang->formatCurrency($oVat, $currency)}] [{$currency->name}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO"}][{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO"}] [{$order->getFormattedTotalBrutSum()}] [{$currency->name}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DELIVERY"}][{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DELIVERY"}] [{$lang->formatCurrency($deliveryPrice->getNettoPrice(), $currency)}] [{$currency->name}]
 [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAX"}][{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAX"}] [{$lang->formatCurrency($deliveryPrice->getVATValue(), $currency)}] [{$currency->name}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TOTALSUMBRUT"}][{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TOTALSUMBRUT"}] [{$order->getFormattedTotalOrderSum()}] [{$currency->name}]
- [{if $order->oxorder__d3pdftextbestellbestaetigung}][{/if}] + + [{* +++++++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}]
[{$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"}]