D3Public/pdfdokumente
8
0
Vork 0
Code Pull-aanvragen Publicaties Activiteit

add: smarty date generation, css-classes; rm unneseccary css-classes, metadata include;

Bladeren bron
This commit is contained in:
MaxBUhe 2020-06-11 10:04:48 +02:00
bovenliggende f566ed025a
commit eb88aaf327
6 gewijzigde bestanden met toevoegingen van 54 en 30 verwijderingen
Statistieken weergeven Download Patch-bestand Download Diff-bestand Expand all files Collapse all files

28
Application/views/tpl/documents/invoice/includingFiles/d3_article_costs_summary.tpl
Bestand weergeven

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

2
Application/views/tpl/documents/invoice/includingFiles/pdfHeader.tpl
Bestand weergeven

@ -47,7 +47,7 @@
<div class="aligning">[{oxmultilang ident="ORDER_OVERVIEW_PDF_BANKCODE_HEADER"}][{$shop->getFieldData('oxbiccode')}]</div>
<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_DATE"}][{$smarty.now|date_format:"%d.%m.%G"}]</div>
<div class="aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTIDNR"}][{$shop->getFieldData('oxvatnumber')}]</div>
</td>
</tr>

2
Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl
Bestand weergeven

@ -1,5 +1,5 @@
[{block name="pdfPastThankFile"}]
<table class="past_thank_width100 borderSpacingUnset">
<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}]

41
Application/views/tpl/documents/invoice/invoice.tpl
Bestand weergeven

@ -36,15 +36,15 @@
</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() }]
<td class="paddingTopBottom5 vertical-a"><div class='fontSize12 aligning order_article_listing_width_amount order_article_listing_paddingRight52'>[{$oOrderArticle->oxorderarticles__oxamount->value }]</div></td>
<td class="paddingTopBottom5 vertical-a"><div class='fontSize12 order_article_listing_width_desc'>
[{$oOrderArticle->getFieldData('oxtitle')}] [{$oOrderArticle->getFieldData('oxselvariant')}]
<br>
<span class="order_article_listing_fontSize9">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }]</span>
<span class="order_article_listing_fontSize9">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->getFieldData('oxartnum')}]</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>
<td class="paddingTopBottom5 vertical-a"><div class='aligning fontSize12 order_article_listing_width_ust'>[{$oOrderArticle->getFieldData('oxvat')}]</div></td>
<td class="paddingTopBottom5 vertical-a"><div class='aligning fontSize12 order_article_listing_width_unitPrice'>[{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}]</div></td>
<td class="paddingTopBottom5 vertical-a"><div class='aligning fontSize12 order_article_listing_width_total_Price'>[{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}]</div></td>
</tr>
[{/foreach}]
</table>
@ -54,7 +54,32 @@
<table class="article_costs_table border-bottom">
<tr>
[{block name="d3_article_costs_summary"}]
[{include file="d3_article_costs_summary.tpl"}]
[{* ++++++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>
[{/block}]
</tr>
</table>

10
Application/views/tpl/documents/invoice/invoiceNoLogo.tpl
Bestand weergeven

@ -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
Bestand weergeven

@ -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',
'd3pdfheader.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/inc/header.tpl',
'd3pdffooter.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/inc/footer.tpl',