From 334122ff3a8f173232c7a00f465a2a8ab3d26e56 Mon Sep 17 00:00:00 2001 From: MaxBUhe Date: Wed, 10 Jun 2020 11:42:47 +0200 Subject: [PATCH] adding new classes, changed classes --- .../views/tpl/documents/invoice/invoice.tpl | 12 ++++---- out/src/css/pdfStyling.css | 29 ++++++------------- 2 files changed, 16 insertions(+), 25 deletions(-) diff --git a/Application/views/tpl/documents/invoice/invoice.tpl b/Application/views/tpl/documents/invoice/invoice.tpl index 71075d8..4d44aba 100644 --- a/Application/views/tpl/documents/invoice/invoice.tpl +++ b/Application/views/tpl/documents/invoice/invoice.tpl @@ -53,8 +53,9 @@ [{block name="articleCosts"}] - [{* ++++++Artikelzusammenfassung++++++ *}] - - [{* ++++++Kosten der Bestellung++++++ *}] - + {/block}
+ [{block name="d3_article_costs_summary"}] + [{* ++++++Beschreibung der Kostensummierung++++++ *}] +
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO"}]
[{if $order->getFormattedDiscount() != 0}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT"}]
@@ -64,11 +65,11 @@
[{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"}]
[{/foreach}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DELIVERY"}]
-
[{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"}]
+
[{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"}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TOTALSUMBRUT"}]
+ [{* ++++++Kostensummierung++++++ *}] +
[{$order->getFormattedTotalBrutSum()}] [{$currency->name}]
[{if $order->getFormattedDiscount() != 0}]
-[{$order->getFormattedDiscount()}] [{$currency->name}]
@@ -79,6 +80,7 @@
[{$lang->formatCurrency($deliveryPrice->getVATValue(), $currency)}] [{$currency->name}]
[{$order->getFormattedTotalOrderSum()}] [{$currency->name}]
[{/block}] diff --git a/out/src/css/pdfStyling.css b/out/src/css/pdfStyling.css index 334554e..11cf028 100644 --- a/out/src/css/pdfStyling.css +++ b/out/src/css/pdfStyling.css @@ -16,7 +16,7 @@ table{ font-size: 12px; } .order_sum{ - margin-left: 181px; + margin-left: 300px; } .order_sumNum{ margin-right: -2.2px; @@ -24,20 +24,12 @@ table{ .border-bottom{ border-bottom: solid 0.15mm #000; } -.paddingTop{ +.hermes{ padding-top: 5px; } -.paddingBottom{ +.mercurius{ padding-bottom: 5px; } - -.paddingTop15{ - padding-top: 10px; -} -.marginTop5{ - padding-top: 5px; -} - .spacing_order_info{ padding-bottom: 5px; padding-top: 5px; @@ -58,18 +50,11 @@ table{ border-top: solid 1px #000; } -.borderSpacingUnset{ - border-spacing: 0; -} - /*pdf_heading*/ .pdf_heading_table{ width: 100%; margin-top: 8mm; } -.marginBottom15{ - margin-bottom: 15px; -} .pdf_heading_width35{ width: 35%; } @@ -167,9 +152,13 @@ table{ width: 100%; border-top: solid 0.15mm #000; } -.article_costs_table_td_width50{ - width: 50%; +.article_costs_table_desc_width70{ + width: 70%; } +.article_costs_table_sum_width30{ + width: 30%; +} + .article_costs_table_paddingRight{ padding-right: -3px; }