D3Public
/
pdfdokumente
8
0
Fork 0
Code Pull Requests Releases Activity

adjust invoice layout

This commit is contained in:
Daniel Seifert 2020-06-29 00:28:32 +02:00
parent 484d85e431
commit b73219f6b5
Signed by: DanielS
GPG Key ID: 6A513E13AEE66170
25 changed files with 396 additions and 443 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Application/views/admin/de/pdfdocuments_lang.php
View File

@ -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: ',
);

109
Application/views/tpl/documents/deliverynote/deliverynote.tpl
View File

@ -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}]
<style type="text/css">
[{include file="d3delnote_pdf_style.css"}],
[{include file="d3pdfstyle.css"}]
</style>
<page backtop="30mm" backbottom="30mm" backleft="10mm" backright="10mm" pageset="new">
<page_header>
[{block name="pdfTopingFile"}]
[{include file="d3pdfheader.tpl" showLogo=true}]
[{/block}]
</page_header>
<page_footer>
[{block name="pdfFooterFile"}]
[{include file="d3pdffooter.tpl"}]
[{/block}]
</page_footer>
[{* +++++ 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"}]
<table class="deliveryNote_table border-bottom" cellspacing="0">
<tr>
<td class="dN_width20 order_article_PaddingBottom5 border-bottom">
<div class="vertical-a dN_fontSize12">
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_AMOUNT"}]
</div>
</td>
<td class="dN_width80 order_article_PaddingBottom5 border-bottom">
<div class="dN_fontSize12">
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DESCRIPTION"}]
</div>
</td>
</tr>
[{foreach from=$order->getOrderArticles(true) item=oOrderArticle}]
<tr>
<td class="dN_width20 dN_paddingTopBottom5 vertical-a">
<div class="dN_width20 dN_paddingLeft12 dN_fontSize12">
[{$oOrderArticle->getFieldData('oxamount')}]
</div>
</td>
<td class="dN_width80 dN_paddingTopBottom5 vertical-a">
<div class="dN_fontSize12">
[{$oOrderArticle->getFieldData('oxtitle')}] [{$oOrderArticle->getFieldData('oxselvariant')}]<br>
<span class="dN_fontSize8">
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->getFieldData('oxartnum')}]
</span>
</div>
</td>
</tr>
[{/foreach}]
</table>
[{/capture}]
[{capture append="pdfBlock_header"}]
[{block name="pdfHeader"}]
[{include file="d3pdfheader.tpl" showLogo=$showLogo}]
[{/block}]
<nobreak>
[{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}]
</nobreak>
</page>
[{/block}]
[{/capture}]
[{capture append="pdfBlock_footer"}]
[{block name="pdfFooter"}]
[{include file="d3pdffooter.tpl" pagePadding=$pagePadding}]
[{/block}]
[{/capture}]
[{include file="d3pdfbase.tpl" pagePadding=$pagePadding}]

93
Application/views/tpl/documents/deliverynote/deliverynoteNoLogo.tpl
View File

@ -1,92 +1 @@
[{assign var= currency value= $order->getOrderCurrency()}]
[{assign var= deliveryPrice value= $order->getOrderDeliveryPrice()}]
<style type="text/css">
[{include file="d3delnote_pdf_style.css"}],
[{include file="d3pdfstyle.css"}]
</style>
<page backtop="30mm" backbottom="30mm" backleft="10mm" backright="10mm" pageset="new">
<page_header>
[{block name="pdfTopingFile"}]
[{include file="d3pdfheader.tpl" showLogo=false}]
[{/block}]
</page_header>
<page_footer>
[{block name="pdfFooterFile"}]
[{include file="d3pdffooter.tpl"}]
[{/block}]
</page_footer>
[{* +++++ main page part +++++ *}]
[{block name="pdfHeadingFile"}]
[{block name="pdfHeaderFile"}]
[{include file="d3delnote_pdf_addressarea.tpl"}]
[{/block}]
[{/block}]
[{* +++++Artikeltabelle+++++*}]
[{block name="articleListing"}]
<table class="border-bottom">
<tr>
<td class="border-bottom order_article_PaddingBottom5 "><div class="vertical-a order_article_listing_fontSize deliverynote_width_amount">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_AMOUNT"}]</div></td>
<td class="border-bottom order_article_PaddingBottom5 paddingLeft"><div class="order_article_listing_fontSize deliverynote_width_artnum">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}]</div></td>
<td class="border-bottom order_article_PaddingBottom5 "><div class="order_article_listing_fontSize deliverynote_width_desc">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DESCRIPTION"}]</div></td>
</tr>
[{foreach from=$order->getOrderArticles(true) item=oOrderArticle}]
[{*<tr>
<td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='fontSize12 aligning order_article_listing_width_amount order_article_listing_paddingRight52'>[{$oOrderArticle->oxorderarticles__oxamount->value }]</div></td>
<td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='fontSize12 order_article_listing_width_desc'>
[{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }]
<br>
<span class="order_article_listing_fontSize9">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }]</span>
</div></td>
<td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='aligning fontSize12 order_article_listing_width_ust'>[{$oOrderArticle->oxorderarticles__oxvat->value }]</div></td>
<td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='aligning fontSize12 order_article_listing_width_unitPrice'>[{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}]</div></td>
<td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='aligning fontSize12 order_article_listing_width_total_Price'>[{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}]</div></td>
</tr>*}]
<tr>
<td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='fontSize12 aligning deliverynote_width_amount order_article_listing_paddingRight52'>[{$oOrderArticle->oxorderarticles__oxamount->value }]</div></td>
<td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='fontSize12 textAlignLeft deliverynote_width_artnum order_article_listing_paddingRight52'>[{$oOrderArticle->oxorderarticles__oxartnum->value }]</div></td>
<td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='fontSize12 deliverynote_width_desc'>[{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{$oOrderArticle->oxorderarticles__oxselvariant->getRawValue()}]</div></td>
</tr>
[{/foreach}]
</table>
[{/block}]
<nobreak>
[{block name="articleCosts"}]
[{*<table class="article_costs_table border-bottom">
<tr>
[{ ++++++Artikelzusammenfassung++++++ }]
<td class="article_costs_table_paddingRight article_costs_table_td_width50 ">
<div class="order_sum fontSize12 border-bottom order_article_PaddingBottom5">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO"}]</div>
[{if $order->getFormattedDiscount() != 0}]
<div class="order_sum fontSize12 border-bottom paddingTopBottom5">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT"}]</div>
[{/if}]
<div class="order_sum fontSize12 order_article_PaddingTop5">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMNETTO"}]</div>
[{foreach from=$order->getVats() key=VatKey item=oVat}]
<div class="order_sum fontSize12 border-bottom paddingTopBottom5">[{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"}]</div>
[{/foreach}]
<div class="order_sum fontSize12 order_article_PaddingTop5">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DELIVERY"}]</div>
<div class="fontSize12 border-bottom paddingTopBottom5 aligning order_article_costs_paddingRight66 order_article_costs_marginLeftSub3">[{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"}]</div>
<div class="order_sum fontSize12 order_article_PaddingTop5 order_article_PaddingBottom5"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TOTALSUMBRUT"}]</strong></div>
</td>
[{ ++++++Kosten der Bestellung++++++ }]
<td class="article_costs_table_td_width50">
<div class="order_sumNum aligning fontSize12 border-bottom order_article_PaddingBottom5">[{$order->getFormattedTotalBrutSum()}] [{$currency->name}]</div>
[{if $order->getFormattedDiscount() != 0}]
<div class="paddingTopBottom5 order_sumNum aligning fontSize12 border-bottom">-[{$order->getFormattedDiscount()}] [{$currency->name}]</div>
[{/if}]
<div class="order_article_PaddingTop5 order_sumNum aligning fontSize12">[{$order->getFormattedTotalNetSum()}] [{$currency->name}]</div>
<div class="paddingTopBottom5 order_sumNum aligning fontSize12 border-bottom">[{$lang->formatCurrency($oVat, $currency)}] [{$currency->name}]</div>
<div class="order_article_PaddingTop5 order_sumNum aligning fontSize12">[{$lang->formatCurrency($deliveryPrice->getNettoPrice(), $currency)}] [{$currency->name}]</div>
<div class="order_article_PaddingTop5 order_article_PaddingBottom5 order_sumNum aligning fontSize12 border-bottom">[{$lang->formatCurrency($deliveryPrice->getVATValue(), $currency)}] [{$currency->name}]</div>
<div class="order_article_PaddingTop5 order_article_PaddingBottom5 order_sumNum aligning fontSize12"><strong>[{$order->getFormattedTotalOrderSum()}] [{$currency->name}]</strong></div>
</td>
</tr>
</table>*}]
[{/block}]
[{block name="pdfPastThankFile"}]
[{include file="d3delnote_pdf_conclusion.tpl"}]
[{/block}]
</nobreak>
</page>
[{include file="d3deliverynote_pdf.tpl" showLogo=false}]

9
Application/views/tpl/documents/deliverynote/includingFiles/informations.tpl Normal file
View File

@ -0,0 +1,9 @@
[{block name="informations"}]
<div class="documentinformations">
[{block name="pdfDocumentInformations"}]
<div>
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DATE"}][{$smarty.now|date_format:"%d.%m.%Y"}]
</div>
[{/block}]
</div>
[{/block}]

80
Application/views/tpl/documents/deliverynote/includingFiles/recipientAddress.tpl
View File

@ -1,57 +1,25 @@
[{block name="pdfHeading"}]
<table class="fontSize12 pdf_heading_table" cellspacing="0">
[{block name="heading_owner_information"}]
<tr>
<td class="pdf_heading_width65">
<div class="pdf_heading_fontSize8">[{$shop->oxshops__oxname->value}] - [{$shop->oxshops__oxstreet->value}] - [{$shop->oxshops__oxzip->value}] [{$shop->oxshops__oxcity->value}]</div>
</td>
</tr>
[{/block}]
[{block name="heading_order_information"}]
<tr>
<td class="vertical-a heading_order_width65 heading_order_paddingTopSub5" style="padding-top: 5px">
[{* +++++++Lieferadressen dynamisch+++++++ *}]
[{if $order->getFieldData('oxdellname')}]
<div class="heading_order_fontSize10 heading_order_paddingBottom8">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYADDRESS"}]</div>
[{if $order->oxorder__oxdelcompany->value}]
<div>[{$order->getFieldData('oxdelcompany')}]</div>
[{/if}]
<div>[{$order->getFieldData('oxdelfname')}] [{$order->getFieldData('oxdellname')}]</div>
<div>[{$order->getFieldData('oxdelstreet')}] [{$order->getFieldData('oxdelstreetnr')}]</div>
<div><strong>[{$order->getFieldData('oxdelzip')}] [{$order->getFieldData('oxdelcity')}]</strong></div>
<div>[{$shop->getFieldData('oxcountry')}]</div>
<div>[{$shop->getFieldData('oxdeladdinfo')}]</div>
[{else}]
[{if $order->getFieldData('oxbillcompany')}]
<div>[{$order->getFieldData('oxbillcompany')}]</div>
[{/if}]
<div>[{$order->getFieldData('oxbillfname')}] [{$order->getFieldData('oxbilllname')}]</div>
<div>[{$order->getFieldData('oxbillstreet')}] [{$order->getFieldData('oxbillstreetnr')}]</div>
<div><strong>[{$order->getFieldData('oxbillzip')}] [{$order->getFieldData('oxbillcity')}]</strong></div>
<div class="heading_order_paddingBottom15">[{$shop->getFieldData('oxcountry')}]</div>
[{/if}]
[{*Bestellnummer,Rechnungsvermerk, 'Ihre bestellung vom...'*}]
</td>
<td class="vertical-a heading_order_width35" style="padding-bottom: -30px">
<div class="aligning" style="font-size: 7px; padding-top: 50px">[{oxmultilang ident="D3_DELIVERYNOTE_PDF_QUOTECUSTMNR"}]</div>
<div class="aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_CUSTOMERNR"}] [{$user->getFieldData('oxcustnr')}]</div>
<div class="aligning" style="padding-top: 50px">[{$shop->getFieldData('oxcity')}], [{$smarty.now|date_format:"%d.%m.%G"}]</div>
<div class="aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTIDNR"}][{$shop->getFieldData('oxvatnumber')}]</div>
<div class="aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILLNR"}][{$order->getFieldData('oxbillnr')}]</div>
</td>
</tr>
[{/block}]
</table>
<table class="fontSize12" cellspacing="0">
<tr>
<td>
<div style="width: 300px; padding-bottom: 20px"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYNOTE"}][{$order->oxorder__oxordernr->value}]</strong></div>
</td>
</tr>
<tr>
<td>
<div style="padding-bottom: 20px">[{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSINCERELY"}][{$order->oxorder__oxorderdate->value|date_format:"%d.%m.%Y"}][{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSAT"}]</div>
</td>
</tr>
</table>
[{block name="recipientaddress"}]
[{if $order->getFieldData('oxdellname')}]
[{if $order->getFieldData('oxdelcompany')}]
<div>[{$order->getFieldData('oxdelcompany')}]</div>
[{/if}]
<div>[{$order->getFieldData('oxdelfname')}] [{$order->getFieldData('oxdellname')}]</div>
[{if $order->getFieldData('oxdeladdinfo')}]
<div>[{$order->getFieldData('oxdeladdinfo')}]</div>
[{/if}]
<div>[{$order->getFieldData('oxdelstreet')}] [{$order->getFieldData('oxdelstreetnr')}]</div>
<div><strong>[{$order->getFieldData('oxdelzip')}] [{$order->getFieldData('oxdelcity')}]</strong></div>
<div class="heading_order_paddingBottom15">[{$order->getFieldData('oxdelcountry')}]</div>
[{else}]
[{if $order->getFieldData('oxbillcompany')}]
<div>[{$order->getFieldData('oxbillcompany')}]</div>
[{/if}]
<div>[{$order->getFieldData('oxbillfname')}] [{$order->getFieldData('oxbilllname')}]</div>
[{if $order->getFieldData('oxbilladdinfo')}]
<div>[{$order->getFieldData('oxbilladdinfo')}]</div>
[{/if}]
<div>[{$order->getFieldData('oxbillstreet')}] [{$order->getFieldData('oxbillstreetnr')}]</div>
<div><strong>[{$order->getFieldData('oxbillzip')}] [{$order->getFieldData('oxbillcity')}]</strong></div>
<div class="heading_order_paddingBottom15">[{$order->getFieldData('oxbillcountry')}]</div>
[{/if}]
[{/block}]

7
Application/views/tpl/documents/deliverynote/includingFiles/salutation.tpl Normal file
View File

@ -0,0 +1,7 @@
[{block name="salutation"}]
<div class="salutation">
<div class="documenttype">Rechnung</div>
<div class="documentnumber">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERNR"}][{$order->getFieldData('oxordernr')}]</div>
<div>[{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSINCERELY"}][{$order->getFieldData('oxorderdate')|date_format:"%d.%m.%Y"}][{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSAT"}] [{$shop->oxshops__oxname->value}]</div>
</div>
[{/block}]

1
Application/views/tpl/documents/inc/elements/addressarea.tpl
View File

@ -1,4 +1,5 @@
[{assign var="backaddressfile" value=$backaddressfile|default:"d3pdfreturnaddress.tpl"}]
[{assign var="addressfile" value=$addressfile|default:"d3pdfrecipientaddress.tpl"}]
<div class="addressarea">
<div class="returnAddress">

133
Application/views/tpl/documents/inc/elements/articlelist.tpl
View File

@ -1,5 +1,7 @@
[{assign var="showPrices" value=$showPrices|default:true}]
[{block name="articlelist"}]
<table class="article_table">
<table class="article_table[{if $showPrices}]_prices[{/if}]">
<tr>
<th class="amount">
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_AMOUNT"}]
@ -7,15 +9,17 @@
<th class="description">
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DESCRIPTION"}]
</th>
<th class="tax">
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTPERCENTAGE"}]
</th>
<th class="unitPrice">
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_UNITPRICE"}]
</th>
<th class="totalPrice">
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TOTALPRICE"}]
</th>
[{if $showPrices}]
<th class="tax">
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTPERCENTAGE"}]
</th>
<th class="unitPrice">
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_UNITPRICE"}]
</th>
<th class="totalPrice">
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TOTALPRICE"}]
</th>
[{/if}]
</tr>
[{foreach from=$order->getOrderArticles(true) item=oOrderArticle}]
<tr>
@ -29,25 +33,104 @@
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }]
</span>
</td>
<td class="tax">
[{$oOrderArticle->oxorderarticles__oxvat->value }]
[{if $showPrices}]
<td class="tax">
[{$oOrderArticle->oxorderarticles__oxvat->value }]
</td>
<td class="unitPrice">
[{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}]
</td>
<td class="totalPrice">
[{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}]
</td>
[{/if}]
</tr>
[{/foreach}]
[{foreach from=$order->getOrderArticles(true) item=oOrderArticle}]
<tr>
<td class="amount">
[{$oOrderArticle->oxorderarticles__oxamount->value }]
</td>
<td class="unitPrice">
[{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}]
<td class="description">
[{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }]
<br>
<span class="artnr">
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }]
</span>
</td>
<td class="totalPrice">
[{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}]
[{if $showPrices}]
<td class="tax">
[{$oOrderArticle->oxorderarticles__oxvat->value }]
</td>
<td class="unitPrice">
[{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}]
</td>
<td class="totalPrice">
[{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}]
</td>
[{/if}]
</tr>
[{/foreach}]
[{foreach from=$order->getOrderArticles(true) item=oOrderArticle}]
<tr>
<td class="amount">
[{$oOrderArticle->oxorderarticles__oxamount->value }]
</td>
<td class="description">
[{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }]
<br>
<span class="artnr">
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }]
</span>
</td>
[{if $showPrices}]
<td class="tax">
[{$oOrderArticle->oxorderarticles__oxvat->value }]
</td>
<td class="unitPrice">
[{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}]
</td>
<td class="totalPrice">
[{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}]
</td>
[{/if}]
</tr>
[{/foreach}]
[{foreach from=$order->getOrderArticles(true) item=oOrderArticle}]
<tr>
<td class="amount">
[{$oOrderArticle->oxorderarticles__oxamount->value }]
</td>
<td class="description">
[{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }]
<br>
<span class="artnr">
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }]
</span>
</td>
[{if $showPrices}]
<td class="tax">
[{$oOrderArticle->oxorderarticles__oxvat->value }]
</td>
<td class="unitPrice">
[{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}]
</td>
<td class="totalPrice">
[{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}]
</td>
[{/if}]
</tr>
[{/foreach}]
</table>
[{/block}]
[{block name="articleCosts"}]
<table class="article_costs_table border-bottom">
<tr>
[{block name="d3_article_costs_summary"}]
[{include file="d3pdfarticlecostsummary.tpl"}]
[{/block}]
</tr>
</table>
[{/block}]
[{if $showPrices}]
[{block name="articleCosts"}]
<table class="article_costs_table">
<tr>
[{block name="d3_article_costs_summary"}]
[{include file="d3pdfarticlecostsummary.tpl"}]
[{/block}]
</tr>
</table>
[{/block}]
[{/if}]

16
Application/views/tpl/documents/inc/elements/deliveryaddress.tpl
View File

@ -1,17 +1,19 @@
[{block name="deliveryaddress"}]
[{if $order->getFieldData('oxdelstreet')}]
<div class="deliveryaddress">
<div class="heading_order_fontSize10 heading_order_paddingBottom8">
<div class="headline">
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYADDRESS"}]
</div>
[{if $order->getFieldData('oxdelcompany')}]
<div>[{$order->getFieldData('oxdelcompany')}]</div>
<div class="company">[{$order->getFieldData('oxdelcompany')}]</div>
[{/if}]
<div>[{$order->getFieldData('oxdelfname')}] [{$order->getFieldData('oxdellname')}]</div>
<div>[{$order->getFieldData('oxdelstreet')}] [{$order->getFieldData('oxdelstreetnr')}]</div>
<div><strong>[{$order->getFieldData('oxdelzip')}] [{$order->getFieldData('oxdelcity')}]</strong></div>
<div>[{$shop->getFieldData('oxcountry')}]</div>
<div>[{$shop->getFieldData('oxdeladdinfo')}]</div>
<div class="name">[{$order->getFieldData('oxdelfname')}] [{$order->getFieldData('oxdellname')}]</div>
[{if $order->getFieldData('oxdeladdinfo')}]
<div class="addinfo">[{$order->getFieldData('oxdeladdinfo')}]</div>
[{/if}]
<div class="street">[{$order->getFieldData('oxdelstreet')}] [{$order->getFieldData('oxdelstreetnr')}]</div>
<div class="location">[{$order->getFieldData('oxdelzip')}] [{$order->getFieldData('oxdelcity')}]</div>
<div class="country">[{$order->getFieldData('oxdelcountry')}]</div>
</div>
[{/if}]
[{/block}]

2
Application/views/tpl/documents/inc/elements/foldmarks.tpl
View File

@ -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}]
<style type="text/css">

48
Application/views/tpl/documents/inc/elements/informations.tpl
View File

@ -1,27 +1,39 @@
<div class="informations">
<div>
<div class="contactinformations">
[{block name="pdfContactInformations"}]
<div class="aligning"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_GET_IN_CONTACT"}]</strong></div>
<div class="aligning fontSize12">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TELEFON"}][{$shop->getFieldData('oxtelefon')}]</div>
<div class="aligning fontSize12">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_FAX"}][{$shop->getFieldData('oxtelefax')}]</div>
<div class="aligning fontSize12">[{$shop->getFieldData('oxinfoemail')}]</div>
<div class="headline">
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_GET_IN_CONTACT"}]
</div>
<div>
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TELEFON"}][{$shop->getFieldData('oxtelefon')}]
</div>
<div>
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_FAX"}][{$shop->getFieldData('oxtelefax')}]
</div>
<div>
[{$shop->getFieldData('oxinfoemail')}]
</div>
[{/block}]
</div>
<div>
<div class="bankaccountinformations">
[{block name="pdfBankaccountInformations"}]
<div class="aligning heading_order_paddingTop10"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_BANKVERBINDUNG"}]</strong></div>
<div class="aligning">[{$shop->getFieldData('oxbankname')}]</div>
<div class="aligning">[{oxmultilang ident="ORDER_OVERVIEW_PDF_ACCOUNTNR"}][{$shop->getFieldData('oxibannumber')}]</div>
<div class="aligning">[{oxmultilang ident="ORDER_OVERVIEW_PDF_BANKCODE_HEADER"}][{$shop->getFieldData('oxbiccode')}]</div>
[{/block}]
</div>
<div>
[{block name="pdfDocumentInformations"}]
<div class="aligning heading_order_paddingTop10">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILLNR"}][{$order->getFieldData('oxbillnr')}]</div>
<div class="aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_CUSTOMERNR"}] [{$user->getFieldData('oxcustnr')}]</div>
<div class="aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DATE"}][{$order->getFieldData('oxbilldate')|date_format:"%d.%m.%Y"}]</div>
<div class="aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTIDNR"}][{$shop->getFieldData('oxvatnumber')}]</div>
<div class="headline">
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_BANKVERBINDUNG"}]
</div>
<div>
[{$shop->getFieldData('oxbankname')}]
</div>
<div>
[{oxmultilang ident="ORDER_OVERVIEW_PDF_ACCOUNTNR"}][{$shop->getFieldData('oxibannumber')}]
</div>
<div>
[{oxmultilang ident="ORDER_OVERVIEW_PDF_BANKCODE_HEADER"}][{$shop->getFieldData('oxbiccode')}]
</div>
[{/block}]
</div>
[{if $documentinformationfile}]
[{include file=$documentinformationfile}]
[{/if}]
</div>

12
Application/views/tpl/documents/inc/elements/recipientAddress.tpl Normal file
View File

@ -0,0 +1,12 @@
[{block name="recipientaddress"}]
[{if $order->getFieldData('oxbillcompany')}]
<div class="company">[{$order->getFieldData('oxbillcompany')}]</div>
[{/if}]
<div class="name">[{$order->getFieldData('oxbillfname')}] [{$order->getFieldData('oxbilllname')}]</div>
[{if $order->getFieldData('oxbilladdinfo')}]
<div class="addinfo">[{$order->getFieldData('oxbilladdinfo')}]</div>
[{/if}]
<div class="street">[{$order->getFieldData('oxbillstreet')}] [{$order->getFieldData('oxbillstreetnr')}]</div>
<div class="location">[{$order->getFieldData('oxbillzip')}] [{$order->getFieldData('oxbillcity')}]</div>
<div class="country">[{$order->getFieldData('oxbillcountry')}]</div>
[{/block}]

8
Application/views/tpl/documents/inc/helper/rulers.tpl
View File

@ -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}]
[{* rulers *}]
@ -7,7 +7,7 @@
<style type="text/css">
.rulerItemHorizontal {
position: absolute;
top: 0;
top: -[{$pagePadding.0}]mm;
width: 0;
height: 7px;
color: blue;
@ -33,7 +33,9 @@
[{* vertical *}]
[{section name=rulerItemsVertical start=0 step=10 loop=600}]
<div class="rulerItemVertical" style="top: [{$smarty.section.rulerItemsVe.index}]mm">[{$smarty.section.rulerItemsVertical.index}]</div>
<div class="rulerItemVertical" style="top: [{math equation="top - padding" top=$smarty.section.rulerItemsVertical.index padding=$pagePadding.0}]mm">
[{$smarty.section.rulerItemsVertical.index}]
</div>
[{/section}]

2
Application/views/tpl/documents/inc/page/base.tpl
View File

@ -1,7 +1,7 @@
[{assign var="pageset" value=$pageset|default:"new"}]
[{assign var="orientation" value=$orientation|default:"P"}]
[{assign var="format" value=$format|default:"A4"}]
[{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}]
<style type="text/css">

4
Application/views/tpl/documents/inc/page/footer.tpl
View File

@ -1,8 +1,8 @@
[{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="pdfFooter"}]
<div class="footer" style="margin: 0 [{$pagePadding.1}]mm [{$pagePadding.2}]mm [{$pagePadding.3}]mm">
<div class="footer" style="margin: 0 [{$pagePadding.1}]mm 10mm [{$pagePadding.3}]mm">
<table>
<tr>
[{block name="pdfFooterLeft"}]

2
Application/views/tpl/documents/inc/page/returnaddress.tpl
View File

@ -1 +1 @@
[{$shop->getFielddata('oxname')}] - [{$shop->getFielddata('oxstreet')}] - [{$shop->getFielddata('oxzip')}] [{$shop->getFielddata('oxcity')}]
[{$shop->getFielddata('oxname')}] - [{$shop->getFielddata('oxstreet')}] - [{$shop->getFielddata('oxzip')}] [{$shop->getFielddata('oxcity')}] - [{$shop->getFieldData('oxcountry')}]

18
Application/views/tpl/documents/invoice/includingFiles/conclusion.tpl
View File

@ -1,20 +1,20 @@
[{block name="conclusion"}]
<table class="past_thank_width100 borderSpacingUnset paddingTop10">
<tr>
<td class="paddingTop15 past_thank_width100 fontSize12">
[{block name="conclusion_paymethod"}]
<table class="conclusion_table">
[{block name="conclusion_paymethod"}]
<tr>
<td>
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USED_PAYMENTMETHOD"}]
[{$payment->getFieldData('oxdesc')}]
[{/block}]
</td>
</tr>
</td>
</tr>
[{/block}]
<tr>
<td class="past_thank_width100 fontSize12">
<td>
[{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_1"}]
</td>
</tr>
<tr>
<td class="past_thank_width100 fontSize12">
<td>
[{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_2"}] [{$shop->oxshops__oxname->value}]
</td>
</tr>

26
Application/views/tpl/documents/invoice/includingFiles/d3_article_costs_summary.tpl
View File

@ -1,26 +0,0 @@
[{* ++++++Beschreibung der Kostensummierung++++++ *}]
<td class="article_costs_table_paddingRight article_costs_table_desc_width70 ">
<div class="order_sum paddingTopBottom5 fontSize12 border-bottom">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO"}]</div>
[{if $order->getFormattedDiscount() != 0}]
<div class="order_sum paddingTopBottom5 fontSize12 border-bottom">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT"}]</div>
[{/if}]
<div class="order_sum order_article_PaddingTop5 fontSize12">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMNETTO"}]</div>
[{foreach from=$productVats key=VatKey item=oVat}]
<div class="order_sum paddingTopBottom5 fontSize12 border-bottom">[{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"}]</div>
[{/foreach}]
<div class="order_sum order_article_PaddingTop5 fontSize12">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DELIVERY"}]</div>
<div class="order_sum paddingTopBottom5 fontSize12 border-bottom">[{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"}]</div>
<div class="order_sum paddingTopBottom5 fontSize12"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TOTALSUMBRUT"}]</strong></div>
</td>
[{* ++++++Kostensummierung++++++ *}]
<td class="article_costs_table_sum_width30">
<div class="order_sumNum paddingTopBottom5 aligning fontSize12 border-bottom">[{$order->getFormattedTotalBrutSum()}] [{$currency->name}]</div>
[{if $order->getFormattedDiscount() != 0}]
<div class="order_sumNum paddingTopBottom5 aligning fontSize12 border-bottom">-[{$order->getFormattedDiscount()}] [{$currency->name}]</div>
[{/if}]
<div class="order_sumNum order_article_PaddingTop5 aligning fontSize12">[{$order->getFormattedTotalNetSum()}] [{$currency->name}]</div>
<div class="order_sumNum paddingTopBottom5 aligning fontSize12 border-bottom">[{$lang->formatCurrency($oVat, $currency)}] [{$currency->name}]</div>
<div class="order_sumNum order_article_PaddingTop5 aligning fontSize12">[{$lang->formatCurrency($deliveryPrice->getNettoPrice(), $currency)}] [{$currency->name}]</div>
<div class="order_sumNum paddingTopBottom5 aligning fontSize12 border-bottom">[{$lang->formatCurrency($deliveryPrice->getVATValue(), $currency)}] [{$currency->name}]</div>
<div class="order_sumNum paddingTopBottom5 aligning fontSize12"><strong>[{$order->getFormattedTotalOrderSum()}] [{$currency->name}]</strong></div>
</td>

18
Application/views/tpl/documents/invoice/includingFiles/informations.tpl Normal file
View File

@ -0,0 +1,18 @@
[{block name="informations"}]
<div class="documentinformations">
[{block name="pdfDocumentInformations"}]
<div>
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILLNR"}][{$order->getFieldData('oxbillnr')}]
</div>
<div>
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_CUSTOMERNR"}] [{$user->getFieldData('oxcustnr')}]
</div>
<div>
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DATE"}][{$order->getFieldData('oxbilldate')|date_format:"%d.%m.%Y"}]
</div>
<div>
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTIDNR"}][{$shop->getFieldData('oxvatnumber')}]
</div>
[{/block}]
</div>
[{/block}]

17
Application/views/tpl/documents/invoice/includingFiles/recipientAddress.tpl
View File

@ -1,9 +1,12 @@
[{block name="recipientaddress"}]
[{if $order->getFieldData('oxbillcompany')}]
<div>[{$order->getFieldData('oxbillcompany')}]</div>
[{/if}]
<div>[{$order->getFieldData('oxbillfname')}] [{$order->getFieldData('oxbilllname')}]</div>
<div>[{$order->getFieldData('oxbillstreet')}] [{$order->getFieldData('oxbillstreetnr')}]</div>
<div><strong>[{$order->getFieldData('oxbillzip')}] [{$order->getFieldData('oxbillcity')}]</strong></div>
<div class="heading_order_paddingBottom15">[{$shop->getFieldData('oxcountry')}]</div>
[{if $order->getFieldData('oxbillcompany')}]
<div class="company">[{$order->getFieldData('oxbillcompany')}]</div>
[{/if}]
<div class="name">[{$order->getFieldData('oxbillfname')}] [{$order->getFieldData('oxbilllname')}]</div>
[{if $order->getFieldData('oxbilladdinfo')}]
<div class="addinfo">[{$order->getFieldData('oxbilladdinfo')}]</div>
[{/if}]
<div class="street">[{$order->getFieldData('oxbillstreet')}] [{$order->getFieldData('oxbillstreetnr')}]</div>
<div class="location">[{$order->getFieldData('oxbillzip')}] [{$order->getFieldData('oxbillcity')}]</div>
<div class="country">[{$shop->getFieldData('oxcountry')}]</div>
[{/block}]

1
Application/views/tpl/documents/invoice/includingFiles/salutation.tpl
View File

@ -1,5 +1,6 @@
[{block name="salutation"}]
<div class="salutation">
<div class="documenttype">zu übersetzen: Rechnung</div>
<div class="documentnumber">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERNR"}][{$order->getFieldData('oxordernr')}]</div>
<div>[{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSINCERELY"}][{$order->getFieldData('oxorderdate')|date_format:"%d.%m.%Y"}][{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSAT"}] [{$shop->oxshops__oxname->value}]</div>
</div>

15
Application/views/tpl/documents/invoice/invoice.tpl
View File

@ -1,7 +1,8 @@
[{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,10,25"}] [{* top, right, bottom, left *}]
[{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 append="pdfBlock_style"}]
[{block name="pdfStyles"}]
@ -11,20 +12,20 @@
[{capture append="pdfBlock_header"}]
[{block name="pdfHeader"}]
[{include file="d3pdfheader.tpl" showLogo=true}]
[{include file="d3pdfheader.tpl" showLogo=$showLogo}]
[{/block}]
[{/capture}]
[{capture append="pdfBlock_content"}]
[{*include file="d3pdfrulers.tpl" pagePadding=$pagePadding*}]
[{* include file="d3pdfrulers.tpl" pagePadding=$pagePadding *}]
[{include file="d3pdffoldmarks.tpl" pagePadding=$pagePadding}]
[{block name="pdfAddressArea"}]
[{include file="d3pdfaddressarea.tpl" addressfile="d3invoice_pdf_addressarea.tpl"}]
[{include file="d3pdfaddressarea.tpl"}]
[{/block}]
[{block name="pdfInformations"}]
[{include file="d3pdfinformations.tpl"}]
[{include file="d3pdfinformations.tpl" documentinformationfile="d3invoice_pdf_informations.tpl"}]
[{/block}]
[{block name="pdfDeliveryAddress"}]

90
Application/views/tpl/documents/invoice/invoiceNoLogo.tpl
View File

@ -1,89 +1 @@
[{assign var="currency" value=$order->getOrderCurrency()}]
[{assign var="deliveryPrice" value= $order->getOrderDeliveryPrice()}]
[{assign var="productVats" value= $order->getProductVats(false)}]
<style type="text/css">
[{include file="d3pdfstyle.css"}]
</style>
<page backtop="30mm" backbottom="30mm" backleft="10mm" backright="10mm" pageset="new">
<page_header>
[{block name="pdfTopingFile"}]
[{include file="d3pdfheader.tpl" showLogo=false}]
[{/block}]
</page_header>
<page_footer>
[{block name="pdfFooterFile"}]
[{include file="d3pdffooter.tpl"}]
[{/block}]
</page_footer>
[{* +++++ main page part +++++ *}]
[{block name="pdfHeadingFile"}]
[{block name="pdfHeaderFile"}]
[{include file="d3invoice_pdf_addressarea.tpl"}]
[{/block}]
[{/block}]
[{* +++++Artikeltabelle+++++*}]
[{block name="articleListing"}]
<table class="order_article_marginTop10">
<tr>
<td class="border-bottom order_article_PaddingBottom5 "><div class="vertical-a order_article_listing_fontSize order_article_listing_width_amount">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_AMOUNT"}]</div></td>
<td class="border-bottom order_article_PaddingBottom5 "><div class="order_article_listing_fontSize order_article_listing_width_desc">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DESCRIPTION"}]</div></td>
<td class="border-bottom order_article_PaddingBottom5 "><div class="aligning order_article_listing_fontSize order_article_listing_width_ust">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTPERCENTAGE"}]</div></td>
<td class="border-bottom order_article_PaddingBottom5 "><div class="aligning order_article_listing_fontSize order_article_listing_width_unitPrice">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_UNITPRICE"}]</div></td>
<td class="border-bottom order_article_PaddingBottom5 "><div class="aligning order_article_listing_fontSize order_article_listing_width_total_Price">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TOTALPRICE"}]</div></td>
</tr>
[{foreach from=$order->getOrderArticles(true) item=oOrderArticle}]
<tr>
<td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='fontSize12 aligning order_article_listing_width_amount order_article_listing_paddingRight52'>[{$oOrderArticle->oxorderarticles__oxamount->value }]</div></td>
<td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='fontSize12 order_article_listing_width_desc'>
[{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }]
<br>
<span class="order_article_listing_fontSize9">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }]</span>
</div></td>
<td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='aligning fontSize12 order_article_listing_width_ust'>[{$oOrderArticle->oxorderarticles__oxvat->value }]</div></td>
<td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='aligning fontSize12 order_article_listing_width_unitPrice'>[{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}]</div></td>
<td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='aligning fontSize12 order_article_listing_width_total_Price'>[{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}]</div></td>
</tr>
[{/foreach}]
</table>
[{/block}]
<nobreak>
[{block name="articleCosts"}]
<table class="article_costs_table border-bottom">
<tr>
[{* ++++++Artikelzusammenfassung++++++ *}]
<td class="article_costs_table_paddingRight article_costs_table_td_width50 ">
<div class="order_sum fontSize12 border-bottom order_article_PaddingBottom5">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO"}]</div>
[{if $order->getFormattedDiscount() != 0}]
<div class="order_sum fontSize12 border-bottom paddingTopBottom5">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT"}]</div>
[{/if}]
<div class="order_sum fontSize12 order_article_PaddingTop5">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMNETTO"}]</div>
[{foreach from=$productVats key=VatKey item=oVat}]
<div class="order_sum fontSize12 border-bottom paddingTopBottom5">[{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"}]</div>
[{/foreach}]
<div class="order_sum fontSize12 order_article_PaddingTop5">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DELIVERY"}]</div>
<div class="fontSize12 border-bottom paddingTopBottom5 aligning order_article_costs_paddingRight66 order_article_costs_marginLeftSub3">[{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"}]</div>
<div class="order_sum fontSize12 order_article_PaddingTop5 order_article_PaddingBottom5"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TOTALSUMBRUT"}]</strong></div>
</td>
[{* ++++++Kosten der Bestellung++++++ *}]
<td class="article_costs_table_td_width50">
<div class="order_sumNum aligning fontSize12 border-bottom order_article_PaddingBottom5">[{$order->getFormattedTotalBrutSum()}] [{$currency->name}]</div>
[{if $order->getFormattedDiscount() != 0}]
<div class="paddingTopBottom5 order_sumNum aligning fontSize12 border-bottom">-[{$order->getFormattedDiscount()}] [{$currency->name}]</div>
[{/if}]
<div class="order_article_PaddingTop5 order_sumNum aligning fontSize12">[{$order->getFormattedTotalNetSum()}] [{$currency->name}]</div>
<div class="paddingTopBottom5 order_sumNum aligning fontSize12 border-bottom">[{$lang->formatCurrency($oVat, $currency)}] [{$currency->name}]</div>
<div class="order_article_PaddingTop5 order_sumNum aligning fontSize12">[{$lang->formatCurrency($deliveryPrice->getNettoPrice(), $currency)}] [{$currency->name}]</div>
<div class="order_article_PaddingTop5 order_article_PaddingBottom5 order_sumNum aligning fontSize12 border-bottom">[{$lang->formatCurrency($deliveryPrice->getVATValue(), $currency)}] [{$currency->name}]</div>
<div class="order_article_PaddingTop5 order_article_PaddingBottom5 order_sumNum aligning fontSize12"><strong>[{$order->getFormattedTotalOrderSum()}] [{$currency->name}]</strong></div>
</td>
</tr>
</table>
[{/block}]
[{block name="pdfPastThankFile"}]
[{include file="d3invoice_pdf_conclusion.tpl"}]
[{/block}]
</nobreak>
</page>
[{include file="d3invoice_pdf.tpl" showLogo=false}]

7
metadata.php
View File

@ -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',

87
out/src/css/pdfStyling.css
View File

@ -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%;