outsource article_cost_summary and included it + metadata entry
This commit is contained in:
parent
15f02f45f0
commit
f9a0dd11e2
|
|
@ -0,0 +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>
|
||||
[{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=$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>
|
||||
[{/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>
|
||||
</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>
|
||||
[{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>
|
||||
|
|
@ -18,18 +18,13 @@
|
|||
[{/block}]
|
||||
</page_footer>
|
||||
|
||||
[{* +++++ fold and punch marks +++++ *}]
|
||||
[{block name="pdfDIN5008Markings"}]
|
||||
[{include file="d3din5008.tpl"}]
|
||||
[{/block}]
|
||||
|
||||
[{* +++++ main page part +++++ *}]
|
||||
[{block name="pdfHeadingFile"}]
|
||||
[{block name="pdfHeaderFile"}]
|
||||
[{include file="d3invoice_pdf_addressarea.tpl"}]
|
||||
[{* +++++ main page part +++++ *}]
|
||||
[{block name="pdfHeadingFile"}]
|
||||
[{block name="pdfHeaderFile"}]
|
||||
[{include file="d3invoice_pdf_addressarea.tpl"}]
|
||||
[{/block}]
|
||||
[{/block}]
|
||||
[{/block}]
|
||||
[{* +++++Artikeltabelle+++++*}]
|
||||
[{* +++++Artikeltabelle+++++*}]
|
||||
[{block name="articleListing"}]
|
||||
<table class="order_article_marginTop10" cellspacing="0">
|
||||
<tr>
|
||||
|
|
@ -59,32 +54,7 @@
|
|||
<table class="article_costs_table border-bottom">
|
||||
<tr>
|
||||
[{block name="d3_article_costs_summary"}]
|
||||
[{* ++++++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>
|
||||
[{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=$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>
|
||||
[{/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>
|
||||
</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>
|
||||
[{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>
|
||||
[{include file="d3_article_costs_summary.tpl"}]
|
||||
[{/block}]
|
||||
</tr>
|
||||
</table>
|
||||
|
|
@ -93,4 +63,4 @@
|
|||
[{include file="d3invoice_pdf_conclusion.tpl"}]
|
||||
[{/block}]
|
||||
</nobreak>
|
||||
</page>
|
||||
</page>
|
||||
|
|
|
|||
|
|
@ -60,6 +60,7 @@ $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',
|
||||
|
|
|
|||
Loading…
Reference in New Issue