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

Merge remote-tracking branch 'remotes/current/modules/rel_mod_pdfDocumentsFull' into dev_initial

Browse Source 
# Conflicts:
#	Application/views/tpl/documents/inc/header.tpl
#	Application/views/tpl/documents/invoice/includingFiles/pdfHeader.tpl
#	Application/views/tpl/documents/invoice/invoice.tpl
#	Modules/out/src/pdfStyling.css
#	metadata.php
This commit is contained in:
Daniel Seifert 2020-06-23 09:37:05 +02:00
commit f785f2e2d8
15 changed files with 237 additions and 306 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Application/Model/AbstractClasses/pdfdocumentsGeneric.php
View File

@ -207,10 +207,18 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface
{
// forced filename from setFilename()
if ($this->filename) {
return $this->addFilenameExtension($this->filename);
return $this->addFilenameExtension(
$this->makeValidFileName(
$this->filename
)
);
}
return $this->addFilenameExtension($this->getTypeForFilename());
return $this->addFilenameExtension(
$this->makeValidFileName(
$this->getTypeForFilename()
)
);
}
/**

8
Application/Model/AbstractClasses/pdfdocumentsOrder.php
View File

@ -69,12 +69,17 @@ abstract class pdfdocumentsOrder extends pdfdocumentsGeneric implements orderInt
{
// forced filename from setFilename()
if ($this->filename) {
return $this->addFilenameExtension($this->filename);
return $this->addFilenameExtension(
$this->makeValidFileName(
$this->filename
)
);
}
$sTrimmedBillName = trim($this->getOrder()->getFieldData('oxbilllname'));
return $this->addFilenameExtension(
$this->makeValidFileName(
implode(
'_',
[
@ -83,6 +88,7 @@ abstract class pdfdocumentsOrder extends pdfdocumentsGeneric implements orderInt
$sTrimmedBillName
]
)
)
);
}

4
Application/Model/Documents/invoicePdf.php
View File

@ -111,10 +111,12 @@ class invoicePdf extends pdfdocumentsOrder implements pdfdocumentsOrderinvoiceIn
{
$filename = parent::getFilename();
return str_replace(
$filename = str_replace(
$this->getOrder()->getFieldData('oxordernr'),
$this->getOrder()->getFieldData('oxbillnr'),
$filename
);
return $this->makeValidFileName($filename);
}
}

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

@ -26,65 +26,40 @@
[{/block}]
[{* +++++Artikeltabelle+++++*}]
[{block name="articleListing"}]
<table class="order_article_marginTop10 border-bottom" cellspacing="0">
<table class="deliveryNote_table border-bottom" cellspacing="0">
<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>
<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="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>
<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>
[{/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 spacing_order_info">[{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 spacing_order_info">[{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 spacing_order_info 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="spacing_order_info 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="spacing_order_info 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="articleCosts"}][{/block}]
[{block name="pdfPastThankFile"}]
[{include file="d3delnote_pdf_conclusion.tpl"}]
[{/block}]

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

@ -60,24 +60,24 @@
<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 spacing_order_info">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT"}]</div>
<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 spacing_order_info">[{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 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 spacing_order_info 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="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="spacing_order_info order_sumNum aligning fontSize12 border-bottom">-[{$order->getFormattedDiscount()}] [{$currency->name}]</div>
<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="spacing_order_info order_sumNum aligning fontSize12 border-bottom">[{$lang->formatCurrency($oVat, $currency)}] [{$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>

52
Application/views/tpl/documents/deliverynote/includingFiles/pdfHeader.tpl
View File

@ -5,43 +5,39 @@
<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>
[{*<td class="pdf_heading_width35">
<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->oxshops__oxtelefon->value}]</div>
<div class="aligning fontSize12">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_FAX"}][{$shop->oxshops__oxtelefax->value}]</div>
<div class="aligning fontSize12">[{$shop->oxshops__oxinfoemail->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">
[{if $order->oxorder__oxbillcompany->value}]
<div>[{$order->oxorder__oxbillcompany->value}]</div>
[{/if}]
<div>[{$order->oxorder__oxbillfname->value}] [{$order->oxorder__oxbilllname->value}]</div>
<div>[{$order->oxorder__oxbillstreet->value}] [{$order->oxorder__oxbillstreetnr->value}]</div>
<div><strong>[{$order->oxorder__oxbillzip->value}] [{$order->oxorder__oxbillcity->value}]</strong></div>
<div class="heading_order_paddingBottom15">[{$shop->oxshops__oxcountry->value}]</div>
[{* +++++++Lieferadressen dynamisch+++++++ *}]
[{if $order->oxorder__oxdelstreet->value}]
[{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->oxorder__oxdelcompany->value}]</div>[{/if}]
<div>[{$order->oxorder__oxdelfname->value}] [{$order->oxorder__oxdellname->value}]</div>
<div>[{$order->oxorder__oxdelstreet->value}] [{$order->oxorder__oxdelstreetnr->value}]</div>
<div><strong>[{$order->oxorder__oxdelzip->value}] [{$order->oxorder__oxdelcity->value}]</strong></div>
<div>[{$shop->oxshops__oxcountry->value}]</div>
<div>[{$shop->oxshops__oxdeladdinfo->value}]</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 heading_order_paddingTopSub5 eraseBug" style="margin-bottom: 0">
<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" style="padding-bottom: 50px">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_CUSTOMERNR"}] [{$user->oxuser__oxcustnr->value}]</div>
<div class="aligning">[{$shop->oxshops__oxcity->value}], [{$smarty.now|date_format:"%d.%m.%G"}]</div>
<div class="aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTIDNR"}][{$shop->oxshops__oxvatnumber->value}]</div>
<div class="aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILLNR"}][{$order->oxorder__oxbillnr->value}]</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}]
@ -49,12 +45,12 @@
<table class="fontSize12" cellspacing="0">
<tr>
<td>
<div style="width: 300px" class="eraseBug heading_order_paddingTop22 heading_order_fontSize15"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYNOTE"}][{$order->oxorder__oxordernr->value}]</strong></div>
<div style="width: 300px; padding-bottom: 20px" class="heading_order_paddingTop22 heading_order_fontSize15"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYNOTE"}][{$order->oxorder__oxordernr->value}]</strong></div>
</td>
</tr>
<tr>
<td>
<div class="eraseBug">[{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSINCERELY"}][{$order->oxorder__oxorderdate->value|date_format:"%d.%m.%Y"}][{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSAT"}]</div>
<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>

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

@ -1,26 +1,26 @@
[{* ++++++Beschreibung der Kostensummierung++++++ *}]
<td class="article_costs_table_paddingRight article_costs_table_desc_width70 ">
<div class="order_sum fontSize12 border-bottom order_article_PaddingBottom5">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO"}]</div>
<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 fontSize12 border-bottom spacing_order_info">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT"}]</div>
<div class="order_sum paddingTopBottom5 fontSize12 border-bottom">[{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>
<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 fontSize12 border-bottom spacing_order_info">[{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 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 fontSize12 order_article_PaddingTop5">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DELIVERY"}]</div>
<div class="order_sum fontSize12 border-bottom spacing_order_info">[{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>
<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 aligning fontSize12 border-bottom order_article_PaddingBottom5">[{$order->getFormattedTotalBrutSum()}] [{$currency->name}]</div>
<div class="order_sumNum paddingTopBottom5 aligning fontSize12 border-bottom">[{$order->getFormattedTotalBrutSum()}] [{$currency->name}]</div>
[{if $order->getFormattedDiscount() != 0}]
<div class="spacing_order_info order_sumNum aligning fontSize12 border-bottom">-[{$order->getFormattedDiscount()}] [{$currency->name}]</div>
<div class="order_sumNum paddingTopBottom5 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="spacing_order_info 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>
<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>

22
Application/views/tpl/documents/invoice/includingFiles/heidelpay_bank_data.tpl Normal file
View File

@ -0,0 +1,22 @@
[{block name="heidelpay_bank_data"}]
[{d3modcfgcheck modid="d3heidelpay"}][{/d3modcfgcheck}]
[{if $mod_d3heidelpay}]
[{assign var="oPrePaymentData" value=$order->getHeidelpayBankTransferData()}]
[{if $oPrePaymentData}]
<div>
<h3 style="font-size: 16px; margin-bottom: -10px"><strong>[{oxmultilang ident="BANK_DETAILS"}]</strong></h3>
<p>
[{oxmultilang ident="D3_HEIDELPAY_BANK_INFO"}]<br>
[{oxmultilang ident="D3_HEIDELPAY_PURPOSE_OF_USE"}]<br/><br/>
[{oxmultilang ident="D3HEIDELPAY_EMAIL_PREPAYMENT_ACCOUNTHOLDER"}] [{$oPrePaymentData->Holder}]<br/>
[{oxmultilang ident="D3HEIDELPAY_EMAIL_PREPAYMENT_IBAN"}] [{$oPrePaymentData->Iban}]<br/>
[{oxmultilang ident="D3HEIDELPAY_EMAIL_PREPAYMENT_BIC"}] [{$oPrePaymentData->Bic}]<br/>
<strong>[{oxmultilang ident="D3HEIDELPAY_EMAIL_PREPAYMENT_AMOUNT"}] [{$order->getFormattedTotalOrderSum()}] [{$oPrePaymentData->Currency}]</strong><br/>
<strong class="color">[{oxmultilang ident="D3HEIDELPAY_EMAIL_PREPAYMENT_REASON"}] [{$oPrePaymentData->Reference}]</strong>
</p>
</div>
<br>
[{/if}]
[{/if}]
[{/block}]

43
Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl
View File

@ -1,14 +1,43 @@
[{block name="pdfPastThankFile"}]
<table class="past_thank_width100 borderSpacingUnset">
<tr><td class="paddingTop15 past_thank_width100 fontSize12">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USED_PAYMENTMETHOD"}] [{$payment->getFieldData('oxdesc')}]</td></tr>
<table class="past_thank_width100 borderSpacingUnset paddingTop10">
<tr>
<td class="paddingTop15 past_thank_width100 fontSize12">
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USED_PAYMENTMETHOD"}]
[{$payment->getFieldData('oxdesc')}]
</td>
</tr>
[{* +++++++Individueller Zahlungstext+++++++ *}]
[{if $order->oxorder__d3pdftextbestellbestaetigung->value}]
<tr><td class="past_thank_width100 fontSize12">[{$order->oxorder__d3pdftextbestellbestaetigung->value}]</td></tr>
[{if $order->getFieldData('d3pdftextbestellbestaetigung')}]
<tr>
<td class="past_thank_width100 fontSize12">
[{$order->getFieldData('d3pdftextbestellbestaetigung')|nl2br}]
</td>
</tr>
[{/if}]
[{d3modcfgcheck modid="d3heidelpay"}][{/d3modcfgcheck}]
[{if $order->getHeidelpayBankTransferData()}]
<tr>
<td class="past_thank_width100 paddingTop10 fontSize12">
[{include file="d3Heidelpay_bank_data.tpl"}]
</td>
</tr>
[{else}]
<tr><td class="past_thank_width100 fontSize12">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USED_GREETINGSORDER"}]</td></tr>
<tr>
<td class="past_thank_width100 paddingTop10 fontSize12">
[{$payment->getFieldData('d3shortdescpdf')|nl2br}]
</td>
</tr>
[{/if}]
[{**Schlusstext/ Abschied***}]
<tr><td class="marginTop5 past_thank_width100 fontSize12">[{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_1"}]</td></tr>
<tr><td class="past_thank_width100 fontSize12">[{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_2"}]</td></tr>
<tr>
<td class="past_thank_width100 fontSize12">
[{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_1"}]
</td>
</tr>
<tr>
<td class="past_thank_width100 fontSize12">
[{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_2"}]
</td>
</tr>
</table>
[{/block}]

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

@ -57,24 +57,24 @@
<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 spacing_order_info">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT"}]</div>
<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 spacing_order_info">[{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 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 spacing_order_info 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="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="spacing_order_info order_sumNum aligning fontSize12 border-bottom">-[{$order->getFormattedDiscount()}] [{$currency->name}]</div>
<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="spacing_order_info order_sumNum aligning fontSize12 border-bottom">[{$lang->formatCurrency($oVat, $currency)}] [{$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>

1
metadata.php
View File

@ -60,7 +60,6 @@ $aModule = [
'd3invoiceNoLogo_pdf.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/invoiceNoLogo.tpl',
'd3invoice_pdf_addressarea.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/includingFiles/pdfHeader.tpl',
'd3invoice_pdf_conclusion.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl',
'd3_article_costs_summary.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/includingFiles/d3_article_costs_summary.tpl',
'd3pdfbase.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/inc/page/base.tpl',
'd3pdfheader.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/inc/page/header.tpl',

30
out/src/css/deliverynote.css
View File

@ -1,11 +1,33 @@
.deliverynote_width_amount{
width: 20px;
.deliveryNote_table{
width: 678px;
}
.dN_width20{
width: 20%;
}
.dN_width80{
width: 80%;
}
.dN_paddingTopBottom5{
padding-top: 5px;
padding-bottom: 5px;
}
.dN_fontSize12{
font-size: 12px;
}
.dN_fontSize8{
font-size: 8px;
}
.dN_paddingRight52{
padding-right: 52.1px;
}
.dN_paddingLeft12{
padding-left: 12.5px
}
.deliverynote_width_artnum{
width: 80px;
}
.deliverynote_width_desc{
width: 469.5px;
.dN_width_658{
width: 658px;
}
.textAlignLeft{
text-align: left;

173
out/src/css/deliverynote_.css
View File

@ -1,173 +0,0 @@
/*debug hilfe*/
.eraseBug{
border: dashed blueviolet 1px;
}
table{
font-family: "helvetica";
}
.aligning{
text-align: right;
}
.vertical-a{
vertical-align: top;
}
.fontSize12{
font-size: 12px;
}
.order_sum{
margin-left: 181px;
}
.order_sumNum{
margin-right: -2.2px;
}
.border-bottom{
border-bottom: solid 0.15mm #000;
}
.paddingTop{
padding-top: 5px;
}
.paddingBottom{
padding-bottom: 5px;
}
.spacing_order_info{
padding-bottom: 5px;
padding-top: 5px;
}
/*pdf_header*/
.pdf_header_positioning{
position: absolute;
top: 30px;
right: 44px;
}
/*pdf_footer*/
.pdf_footer_table{
width: 688px;
font-size: 9px;
margin: 0 30px 0 30px;
border-top: solid 1px #000;
}
/*pdf_heading*/
.pdf_heading_table{
width: 100%;
margin-top: 8mm;
}
.pdf_heading_width35{
width: 35%;
}
.pdf_heading_fontSize8{
font-size: 8px;
}
.pdf_heading_width65{
width: 65%;
}
.pdf_heading_fontSize12{
font-size: 12px;
}
/*heading_order_information*/
.heading_order_paddingTop10{
padding-top: 10px;
}
.heading_order_width35{
width: 35%;
}
.heading_order_paddingTopSub5{
padding-top: -5px;
}
.heading_order_paddingTop1{
padding-top: 1mm;
}
.heading_order_fontSize15{
font-size: 15px;
}
.heading_order_paddingTop22{
padding-top: 22px;
}
.heading_order_paddingBottom8{
padding-bottom: 8px;
}
.heading_order_paddingBottom15{
padding-bottom: 15px;
}
.heading_order_fontSize10{
font-size: 10px;
}
.heading_order_paddingTopSub5{
padding-top: -5px;
}
.heading_order_width65{
width: 65%;
}
/*order_article_listing*/
.order_article_listing_width_amount{
width: 20px;
}
.order_article_listing_width_desc{
width: 398px;
}
.order_article_listing_width_ust{
width: 10px;
}
.order_article_listing_width_unitPrice{
width: 90px;
}
.order_article_listing_width_total_Price{
width: 100px;
}
.order_article_listing_paddingRight52{
padding-right: 52.1px;
}
.order_article_listing_fontSize{
font-size: 11px;
}
.order_article_PaddingBottom5{
padding-bottom: 5px;
}
.order_article_PaddingTop5{
padding-top: 5px;
}
.order_article_marginTop10{
margin-top: 10px;
}
.order_article_costs_marginLeftSub3{
margin-left: -3px;
}
.order_article_costs_paddingRight66{
padding-right: 65.9px;
}
.order_article_listing_fontSize9{
font-size: 9px;
}
.order_article_listing_fontSize12{
font-size: 12px;
}
/* order_article_costs */
.article_costs_table{
width: 100%;
border-top: solid 0.15mm #000;
}
.article_costs_table_td_width50{
width: 50%;
}
.article_costs_table_paddingRight{
padding-right: -3px;
}
.order_article_costs_fontSize12{
font-size: 12px;
}
/*order_shop_past_thank*/
.past_thank_width100{
width: 100%;
}
/* footer styling */
.footer_parts{
width: 33.33%;
}

30
out/src/css/pdfInvoiceCorrection.css
View File

@ -1,9 +1,27 @@
.invoiceCorrection_width_40{
width: 40%;
.invoiceCorrection_pdf_heading_table{
width: 678px;
margin-top: 8mm;
}
.invoiceCorrection_width_60{
.invoiceCorrection_width_20{
width: 20%;
}
.invoiceCorrection_width_80{
width: 80%
}
.iC_width11{
width: 11%;
}
.iC_width29{
width: 29%;
}
.iC_width60{
width: 60%;
}
.iC_paddingBottom10{
padding-bottom: 10px;
}
.invoiceCorrection_font8{
font-size: 8px;
}
@ -16,6 +34,9 @@
.invoiceCorrection_spacingLeft20{
margin-left: 73.6px;
}
.margin-top7{
margin-top: 7px;
}
.invoiceCorrectionPaddingTop4{
padding-top: 4px;
@ -23,6 +44,9 @@
.invoiceCorrectionPaddingTop5{
padding-top: 5px;
}
.paddingTop20{
padding-top: 20px;
}
.invoiceCorrectionPaddingBottom20{
padding-bottom: 20px;

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

@ -93,13 +93,18 @@ table{
.border-bottom{
border-bottom: solid 0.15mm #000;
}
.hermes{
.paddingTop10{
padding-top: 10px
}
.paddingTop{
padding-top: 5px;
}
.mercurius{
.paddingBottom{
padding-bottom: 5px;
}
.spacing_order_info{
.paddingTopBottom5{
padding-bottom: 5px;
padding-top: 5px;
}
@ -112,6 +117,10 @@ table{
width: 100%;
margin-top: 8mm;
}
.paddingTop10{
padding-top: 10px;
}
.pdf_heading_width35{
width: 35%;
}
@ -227,6 +236,18 @@ table{
.past_thank_width100{
width: 100%;
}
.paddingBottomSub10{
padding-bottom: -10px;
}
.marginTop0{
margin-top: 0;
}
.marginLeftSub3{
padding-left: -3.5px;
}
.marginLeft3{
margin-left: 3px;
}
/* footer styling */
.footer_parts{