diff --git a/Application/views/tpl/documents/inc/elements/articlecostssummary.tpl b/Application/views/tpl/documents/inc/elements/articlecostssummary.tpl
index 09eaf89..e79926e 100644
--- a/Application/views/tpl/documents/inc/elements/articlecostssummary.tpl
+++ b/Application/views/tpl/documents/inc/elements/articlecostssummary.tpl
@@ -1,54 +1,73 @@
-
-
- [{oxmultilang ident="D3_PDFDOCUMENTS_SUMBRUTTO" suffix="COLON"}]
-
+[{block name="sumbrutto"}]
+ |
+
+ [{oxmultilang ident="D3_PDFDOCUMENTS_SUMBRUTTO" suffix="COLON"}]
+ |
+
+ [{$order->getFormattedTotalBrutSum()}] [{$currency->name}]
+ |
+
+[{/block}]
+[{block name="discount"}]
[{if $order->getFormattedDiscount() != 0}]
-
- [{oxmultilang ident="D3_PDFDOCUMENTS_DISCOUNT" suffix="COLON"}]
-
+
+
+ [{oxmultilang ident="D3_PDFDOCUMENTS_DISCOUNT" suffix="COLON"}]
+ |
+
+ -[{$order->getFormattedDiscount()}] [{$currency->name}]
+ |
+
[{/if}]
-
- [{oxmultilang ident="D3_PDFDOCUMENTS_SUMNETTO" suffix="COLON"}]
-
+[{/block}]
+[{block name="sumnetto"}]
+
+
+ [{oxmultilang ident="D3_PDFDOCUMENTS_SUMNETTO" suffix="COLON"}]
+ |
+
+ [{$order->getFormattedTotalNetSum()}] [{$currency->name}]
+ |
+
+[{/block}]
+[{block name="producttax"}]
[{foreach from=$productVats key=VatKey item=oVat}]
-
- [{oxmultilang ident="D3_PDFDOCUMENTS_TAX" args=$VatKey suffix="COLON"}]
-
+
+
+ [{oxmultilang ident="D3_PDFDOCUMENTS_TAX" args=$VatKey suffix="COLON"}]
+ |
+
+ [{$lang->formatCurrency($oVat, $currency)}] [{$currency->name}]
+ |
+
[{/foreach}]
-
- [{oxmultilang ident="D3_PDFDOCUMENTS_DELIVERY" suffix="COLON"}]
-
-
- [{oxmultilang ident="D3_PDFDOCUMENTS_TAX" args=$VatKey suffix="COLON"}]
-
-
- [{oxmultilang ident="D3_PDFDOCUMENTS_TOTALSUMBRUT" suffix="COLON"}]
-
-
-
-
- [{$order->getFormattedTotalBrutSum()}] [{$currency->name}]
-
- [{if $order->getFormattedDiscount() != 0}]
-
- -[{$order->getFormattedDiscount()}] [{$currency->name}]
-
- [{/if}]
-
- [{$order->getFormattedTotalNetSum()}] [{$currency->name}]
-
-[{* ToDo: kein foreach wie oben ??? *}]
-
- [{$lang->formatCurrency($oVat, $currency)}] [{$currency->name}]
-
-
- [{$lang->formatCurrency($deliveryPrice->getNettoPrice(), $currency)}] [{$currency->name}]
-
-
- [{$lang->formatCurrency($deliveryPrice->getVATValue(), $currency)}] [{$currency->name}]
-
+[{/block}]
+[{block name="delivery"}]
+ |
+
+ [{oxmultilang ident="D3_PDFDOCUMENTS_DELIVERY" suffix="COLON"}]
+ |
+
+ [{$lang->formatCurrency($deliveryPrice->getNettoPrice(), $currency)}] [{$currency->name}]
+ |
+
+
+
+ [{oxmultilang ident="D3_PDFDOCUMENTS_TAX" args=$VatKey suffix="COLON"}]
+ |
+
+ [{$lang->formatCurrency($deliveryPrice->getVATValue(), $currency)}] [{$currency->name}]
+ |
+
+[{/block}]
[{* ToDo: keine payment costs ??? *}]
-
- [{$order->getFormattedTotalOrderSum()}] [{$currency->name}]
-
-
\ No newline at end of file
+[{block name="totalsum"}]
+
+
+ [{oxmultilang ident="D3_PDFDOCUMENTS_TOTALSUMBRUT" suffix="COLON"}]
+ |
+
+ [{$order->getFormattedTotalOrderSum()}] [{$currency->name}]
+ |
+
+[{/block}]
\ No newline at end of file
diff --git a/Application/views/tpl/documents/inc/elements/articlelist.tpl b/Application/views/tpl/documents/inc/elements/articlelist.tpl
index 21a8592..ecde677 100644
--- a/Application/views/tpl/documents/inc/elements/articlelist.tpl
+++ b/Application/views/tpl/documents/inc/elements/articlelist.tpl
@@ -126,11 +126,9 @@
[{if $showPrices}]
[{block name="articleCosts"}]
-
- [{block name="d3_article_costs_summary"}]
- [{include file="d3pdfarticlecostsummary.tpl"}]
- [{/block}]
-
+ [{block name="d3_article_costs_summary"}]
+ [{include file="d3pdfarticlecostsummary.tpl"}]
+ [{/block}]
[{/block}]
[{/if}]
\ No newline at end of file
diff --git a/out/src/css/pdfStyling.css b/out/src/css/pdfStyling.css
index e86320f..1f87933 100644
--- a/out/src/css/pdfStyling.css
+++ b/out/src/css/pdfStyling.css
@@ -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;
}