From ea290f8bf27f95e96baa6ee7fe8a2450fee9682b Mon Sep 17 00:00:00 2001 From: MaxBUhe Date: Fri, 12 Jun 2020 11:11:56 +0200 Subject: [PATCH] add: css-classes, reordering article listing --- .../documents/deliverynote/deliverynote.tpl | 75 +++++++------------ out/src/css/deliverynote.css | 30 +++++++- 2 files changed, 51 insertions(+), 54 deletions(-) diff --git a/Application/views/tpl/documents/deliverynote/deliverynote.tpl b/Application/views/tpl/documents/deliverynote/deliverynote.tpl index beea02d..5503fab 100644 --- a/Application/views/tpl/documents/deliverynote/deliverynote.tpl +++ b/Application/views/tpl/documents/deliverynote/deliverynote.tpl @@ -26,65 +26,40 @@ [{/block}] [{* +++++Artikeltabelle+++++*}] [{block name="articleListing"}] - +
- - - + + [{foreach from=$order->getOrderArticles(true) item=oOrderArticle}] - [{* - - - - - - *}] - - - + + [{/foreach}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_AMOUNT"}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DESCRIPTION"}]
 +
+ [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_AMOUNT"}] +
+ 		+
+ [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DESCRIPTION"}] +
+
[{$oOrderArticle->oxorderarticles__oxamount->value }]
- [{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }] -
- [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }] -
[{$oOrderArticle->oxorderarticles__oxvat->value }]
[{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}]
[{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}]
[{$oOrderArticle->oxorderarticles__oxamount->value }]
[{$oOrderArticle->oxorderarticles__oxartnum->value }]
[{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{$oOrderArticle->oxorderarticles__oxselvariant->getRawValue()}]
 +
+ [{$oOrderArticle->getFieldData('oxamount')}] +
+ 		+
+ [{$oOrderArticle->getFieldData('oxtitle')}] [{$oOrderArticle->getFieldData('oxselvariant')}]
+ + [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->getFieldData('oxartnum')}] + +
+
[{/block}] - [{block name="articleCosts"}] - [{* - - [{ ++++++Artikelzusammenfassung++++++ }] - - [{ ++++++Kosten der Bestellung++++++ }] - - -
-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO"}]
- [{if $order->getFormattedDiscount() != 0}] -
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT"}]
- [{/if}] -
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMNETTO"}]
- [{foreach from=$order->getVats() key=VatKey item=oVat}] -
[{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_TOTALSUMBRUT"}]
- 		-
[{$order->getFormattedTotalBrutSum()}] [{$currency->name}]
- [{if $order->getFormattedDiscount() != 0}] -
-[{$order->getFormattedDiscount()}] [{$currency->name}]
- [{/if}] -
[{$order->getFormattedTotalNetSum()}] [{$currency->name}]
-
[{$lang->formatCurrency($oVat, $currency)}] [{$currency->name}]
-
[{$lang->formatCurrency($deliveryPrice->getNettoPrice(), $currency)}] [{$currency->name}]
-
[{$lang->formatCurrency($deliveryPrice->getVATValue(), $currency)}] [{$currency->name}]
-
[{$order->getFormattedTotalOrderSum()}] [{$currency->name}]
-
*}] - [{/block}] + [{block name="articleCosts"}][{/block}] [{block name="pdfPastThankFile"}] [{include file="d3delnote_pdf_conclusion.tpl"}] [{/block}] diff --git a/out/src/css/deliverynote.css b/out/src/css/deliverynote.css index 900f0ea..380994a 100644 --- a/out/src/css/deliverynote.css +++ b/out/src/css/deliverynote.css @@ -1,11 +1,33 @@ -.deliverynote_width_amount{ - width: 20px; +.deliveryNote_table{ + width: 678px; +} +.dN_width20{ + width: 20%; +} +.dN_width80{ + width: 80%; +} +.dN_paddingTopBottom5{ + padding-top: 5px; + padding-bottom: 5px; +} +.dN_fontSize12{ + font-size: 12px; +} +.dN_fontSize8{ + font-size: 8px; +} +.dN_paddingRight52{ + padding-right: 52.1px; +} +.dN_paddingLeft12{ + padding-left: 12.5px } .deliverynote_width_artnum{ width: 80px; } -.deliverynote_width_desc{ - width: 469.5px; +.dN_width_658{ + width: 658px; } .textAlignLeft{ text-align: left;