diff --git a/Application/views/tpl/deliverynote.tpl b/Application/views/tpl/deliverynote.tpl index 30ca4e9..2100c4a 100644 --- a/Application/views/tpl/deliverynote.tpl +++ b/Application/views/tpl/deliverynote.tpl @@ -61,15 +61,15 @@ width: 100%; margin-top: 8mm; } - {* order_aritcle_costs *} - .aritcle_costs_table{ + {* order_article_costs *} + .article_costs_table{ width: 100%; border-top: solid 0.15mm #000; } - .aritcle_costs_table_td_width50{ + .article_costs_table_td_width50{ width: 50%; } - .aritcle_costs_table_paddingRight{ + .article_costs_table_paddingRight{ padding-right: -3px; } @@ -78,26 +78,50 @@ width: 100%; } + {*heading_order_information*} + .heading_order_paddingTop10{ + padding-top: 10px; + } + .heading_order_width35{ + width: 35%; + } + .heading_order_paddingTopSub5{ + padding-top: -5px; + } + + + {*order_article_listing*} .order_article_listing_width_amount{ width: 20px; } .order_article_listing_width_desc{ - width: 418px; + width: 398px; } .order_article_listing_width_ust{ width: 10px; } .order_article_listing_width_unitPrice{ - width: 80px; - } - .order_article_listing_width_total_Price{ width: 90px; } - + .order_article_listing_width_total_Price{ + width: 100px; + } + .order_article_listing_paddingRight52{ + padding-right: 52.1px; + } .order_article_listing_fontSize{ font-size: 11px; } + .order_article_PaddingBottom5{ + padding-bottom: 5px; + } + .order_article_PaddingTop5{ + padding-top: 5px; + } + .order_article_marginTop10{ + margin-top: 10px; + } {* footer styling *} .footer_parts{ width: 33.33%; @@ -186,12 +210,12 @@
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_AMOUNT"}] |
- [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DESCRIPTION"}] |
- [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTPERCENTAGE"}] |
- [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_UNITPRICE"}] |
- [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TOTALPRICE"}] |
+ [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_AMOUNT"}] |
+ [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DESCRIPTION"}] |
+ [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTPERCENTAGE"}] |
+ [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_UNITPRICE"}] |
+ [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TOTALPRICE"}] |
[{$oOrderArticle->oxorderarticles__oxamount->value }] |
-
+ |
+ [{$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__oxvat->value }] |
+ [{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}] [{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}] |
- [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO"}]
+ |
+ [{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"}]
+ [{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_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"}]
+ [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TOTALSUMBRUT"}]
|
- [{* ++++++Zahlenteil der Zusammenfassung der Kosten++++++ *}]
-
- [{$order->getFormattedTotalBrutSum()}] [{$currency->name}]
+ [{* ++++++Kosten der Bestellung++++++ *}]
+ |
+ [{$order->getFormattedTotalBrutSum()}] [{$currency->name}]
[{if $order->getFormattedDiscount() != 0}]
-[{$order->getFormattedDiscount()}] [{$currency->name}]
[{/if}]
- [{$order->getFormattedTotalNetSum()}] [{$currency->name}]
+ [{$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}]
+ [{$lang->formatCurrency($deliveryPrice->getNettoPrice(), $currency)}] [{$currency->name}]
+ [{$lang->formatCurrency($deliveryPrice->getVATValue(), $currency)}] [{$currency->name}]
+ [{$order->getFormattedTotalOrderSum()}] [{$currency->name}]
|