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

change HTML structure for article costs area

This commit is contained in:
Daniel Seifert 2020-06-30 23:14:26 +02:00
parent 2f1c256779
commit 2cf6ce6f4f
Signed by: DanielS
GPG Key ID: 6A513E13AEE66170
3 changed files with 84 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
Application/views/tpl/documents/inc/elements/articlecostssummary.tpl
View File

@ -1,54 +1,73 @@
<td class="description">
<div class="sumbrutto">
[{oxmultilang ident="D3_PDFDOCUMENTS_SUMBRUTTO" suffix="COLON"}]
</div>
[{block name="sumbrutto"}]
<tr class="sumbrutto">
<td class="description">
[{oxmultilang ident="D3_PDFDOCUMENTS_SUMBRUTTO" suffix="COLON"}]
</td>
<td class="values">
[{$order->getFormattedTotalBrutSum()}] [{$currency->name}]
</td>
</tr>
[{/block}]
[{block name="discount"}]
[{if $order->getFormattedDiscount() != 0}]
<div class="discount">
[{oxmultilang ident="D3_PDFDOCUMENTS_DISCOUNT" suffix="COLON"}]
</div>
<tr class="discount">
<td class="description">
[{oxmultilang ident="D3_PDFDOCUMENTS_DISCOUNT" suffix="COLON"}]
</td>
<td class="values">
-[{$order->getFormattedDiscount()}] [{$currency->name}]
</td>
</tr>
[{/if}]
<div class="sumnetto">
[{oxmultilang ident="D3_PDFDOCUMENTS_SUMNETTO" suffix="COLON"}]
</div>
[{/block}]
[{block name="sumnetto"}]
<tr class="sumnetto">
<td class="description">
[{oxmultilang ident="D3_PDFDOCUMENTS_SUMNETTO" suffix="COLON"}]
</td>
<td class="values">
[{$order->getFormattedTotalNetSum()}] [{$currency->name}]
</td>
</tr>
[{/block}]
[{block name="producttax"}]
[{foreach from=$productVats key=VatKey item=oVat}]
<div class="producttax">
[{oxmultilang ident="D3_PDFDOCUMENTS_TAX" args=$VatKey suffix="COLON"}]
</div>
<tr class="producttax">
<td class="description">
[{oxmultilang ident="D3_PDFDOCUMENTS_TAX" args=$VatKey suffix="COLON"}]
</td>
<td class="values">
[{$lang->formatCurrency($oVat, $currency)}] [{$currency->name}]
</td>
</tr>
[{/foreach}]
<div class="delivery">
[{oxmultilang ident="D3_PDFDOCUMENTS_DELIVERY" suffix="COLON"}]
</div>
<div class="deliverytax">
[{oxmultilang ident="D3_PDFDOCUMENTS_TAX" args=$VatKey suffix="COLON"}]
</div>
<div class="totalsum">
[{oxmultilang ident="D3_PDFDOCUMENTS_TOTALSUMBRUT" suffix="COLON"}]
</div>
</td>
<td class="values">
<div class="sumbrutto">
[{$order->getFormattedTotalBrutSum()}] [{$currency->name}]
</div>
[{if $order->getFormattedDiscount() != 0}]
<div class="discount">
-[{$order->getFormattedDiscount()}] [{$currency->name}]
</div>
[{/if}]
<div class="sumnetto">
[{$order->getFormattedTotalNetSum()}] [{$currency->name}]
</div>
[{* ToDo: kein foreach wie oben ??? *}]
<div class="producttax">
[{$lang->formatCurrency($oVat, $currency)}] [{$currency->name}]
</div>
<div class="delivery">
[{$lang->formatCurrency($deliveryPrice->getNettoPrice(), $currency)}] [{$currency->name}]
</div>
<div class="deliverytax">
[{$lang->formatCurrency($deliveryPrice->getVATValue(), $currency)}] [{$currency->name}]
</div>
[{/block}]
[{block name="delivery"}]
<tr class="delivery">
<td class="description">
[{oxmultilang ident="D3_PDFDOCUMENTS_DELIVERY" suffix="COLON"}]
</td>
<td class="values">
[{$lang->formatCurrency($deliveryPrice->getNettoPrice(), $currency)}] [{$currency->name}]
</td>
</tr>
<tr class="deliverytax">
<td class="description">
[{oxmultilang ident="D3_PDFDOCUMENTS_TAX" args=$VatKey suffix="COLON"}]
</td>
<td class="values">
[{$lang->formatCurrency($deliveryPrice->getVATValue(), $currency)}] [{$currency->name}]
</td>
</tr>
[{/block}]
[{* ToDo: keine payment costs ??? *}]
<div class="totalsum">
[{$order->getFormattedTotalOrderSum()}] [{$currency->name}]
</div>
</td>
[{block name="totalsum"}]
<tr class="totalsum">
<td class="description">
[{oxmultilang ident="D3_PDFDOCUMENTS_TOTALSUMBRUT" suffix="COLON"}]
</td>
<td class="values">
[{$order->getFormattedTotalOrderSum()}] [{$currency->name}]
</td>
</tr>
[{/block}]

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

@ -126,11 +126,9 @@
[{if $showPrices}]
[{block name="articleCosts"}]
<table class="article_costs_table">
<tr>
[{block name="d3_article_costs_summary"}]
[{include file="d3pdfarticlecostsummary.tpl"}]
[{/block}]
</tr>
[{block name="d3_article_costs_summary"}]
[{include file="d3pdfarticlecostsummary.tpl"}]
[{/block}]
</table>
[{/block}]
[{/if}]

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

@ -153,35 +153,35 @@ table{
.article_costs_table{
width: 100%;
border-top: solid 0.15mm #000;
border-bottom: solid 0.15mm #000;
padding-left: 300px;
border-spacing: 0;
border-collapse: collapse;
}
.article_costs_table .description {
padding-right: -3px;
width: 70%;
}
.article_costs_table div {
.article_costs_table td {
padding-bottom: 5px;
padding-top: 5px;
font-size: 12px;
}
.article_costs_table .description div {
margin-left: 300px;
}
.article_costs_table .values {
width: 30%;
}
.article_costs_table .values div {
margin-right: -2.2px;
text-align: right;
}
.article_costs_table .sumbrutto,
.article_costs_table .discount,
.article_costs_table .producttax,
.article_costs_table .deliverytax {
.article_costs_table .sumbrutto td {
border-top: solid 0.15mm #000;
}
.article_costs_table .sumbrutto td,
.article_costs_table .discount td,
.article_costs_table .producttax td,
.article_costs_table .deliverytax td,
.article_costs_table .totalsum td {
border-bottom: solid 0.15mm #000;
}
.article_costs_table .totalsum {
.article_costs_table .totalsum td {
font-weight: bold;
}