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}]
-
-
-
-
+[{/capture}]
+
+[{capture append="pdfBlock_header"}]
+ [{block name="pdfHeader"}]
+ [{include file="d3pdfheader.tpl" showLogo=$showLogo}]
[{/block}]
-
-
- [{foreach from=$order->getOrderArticles(true) item=oOrderArticle}]
-
-
-
-
-
-
- [{/foreach}]
-
-
-
-
-
-
- [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->getFieldData('oxartnum')}]
-
-
-
- [{/block}]
-
-
- [{foreach from=$order->getOrderArticles(true) item=oOrderArticle}]
- [{*
-
-
-
- *}]
-
-
-
- [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }]
-
-
-
-
-
- [{/foreach}]
-
-
-
-
-
*}]
- [{/block}]
- [{block name="pdfPastThankFile"}]
- [{include file="d3delnote_pdf_conclusion.tpl"}]
- [{/block}]
-
- [{ ++++++Artikelzusammenfassung++++++ }]
-
-
-
- [{ ++++++Kosten der Bestellung++++++ }]
-
-
-
- [{$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"}]
- |
-
[{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"}] - | + [{if $showPrices}] ++ [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTPERCENTAGE"}] + | ++ [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_UNITPRICE"}] + | ++ [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TOTALPRICE"}] + | + [{/if}]
---|---|---|---|---|---|---|---|
- [{$oOrderArticle->oxorderarticles__oxvat->value }] + [{if $showPrices}] + | + [{$oOrderArticle->oxorderarticles__oxvat->value }] + | ++ [{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}] + | ++ [{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}] + | + [{/if}] +||||
+ [{$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}] + | + [{/if}] +|
+ [{$oOrderArticle->oxorderarticles__oxamount->value }] | +
+ [{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }]
+ + + [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }] + + |
+ [{if $showPrices}]
+ + [{$oOrderArticle->oxorderarticles__oxvat->value }] + | ++ [{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}] + | ++ [{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}] + | + [{/if}] +|||
+ [{$oOrderArticle->oxorderarticles__oxamount->value }] + | +
+ [{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }]
+ + + [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }] + + |
+ [{if $showPrices}]
+ + [{$oOrderArticle->oxorderarticles__oxvat->value }] + | ++ [{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}] + | ++ [{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}] + | + [{/if}]
[{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}] |
-
- [{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"}]
- |
- [{* ++++++Kosten der Bestellung++++++ *}]
-
- [{$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}]
- |
-