diff --git a/Application/views/tpl/documents/invoice/includingFiles/d3_article_costs_summary.tpl b/Application/views/tpl/documents/invoice/includingFiles/d3_article_costs_summary.tpl
index a25ad8d..a440358 100644
--- a/Application/views/tpl/documents/invoice/includingFiles/d3_article_costs_summary.tpl
+++ b/Application/views/tpl/documents/invoice/includingFiles/d3_article_costs_summary.tpl
@@ -1,26 +1,26 @@
[{* ++++++Beschreibung der Kostensummierung++++++ *}]
|
- [{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"}]
+ [{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=$productVats 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"}]
+ [{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"}]
+ [{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"}]
|
[{* ++++++Kostensummierung++++++ *}]
- [{$order->getFormattedTotalBrutSum()}] [{$currency->name}]
+ [{$order->getFormattedTotalBrutSum()}] [{$currency->name}]
[{if $order->getFormattedDiscount() != 0}]
- -[{$order->getFormattedDiscount()}] [{$currency->name}]
+ -[{$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}]
+ [{$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}]
|
\ No newline at end of file
diff --git a/Application/views/tpl/documents/invoice/includingFiles/pdfHeader.tpl b/Application/views/tpl/documents/invoice/includingFiles/pdfHeader.tpl
index 0b34150..2a6ceba 100644
--- a/Application/views/tpl/documents/invoice/includingFiles/pdfHeader.tpl
+++ b/Application/views/tpl/documents/invoice/includingFiles/pdfHeader.tpl
@@ -47,7 +47,7 @@
[{oxmultilang ident="ORDER_OVERVIEW_PDF_BANKCODE_HEADER"}][{$shop->getFieldData('oxbiccode')}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILLNR"}][{$order->getFieldData('oxbillnr')}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_CUSTOMERNR"}] [{$user->getFieldData('oxcustnr')}]
- [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DATE"}][{$order->getFieldData('oxbilldate')|date_format:"%d.%m.%Y"}]
+ [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DATE"}][{$smarty.now|date_format:"%d.%m.%G"}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTIDNR"}][{$shop->getFieldData('oxvatnumber')}]
diff --git a/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl b/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl
index 9f3f61a..476d247 100644
--- a/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl
+++ b/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl
@@ -1,5 +1,5 @@
[{block name="pdfPastThankFile"}]
-
+
| [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USED_PAYMENTMETHOD"}] [{$payment->getFieldData('oxdesc')}] |
[{* +++++++Individueller Zahlungstext+++++++ *}]
[{if $order->oxorder__d3pdftextbestellbestaetigung->value}]
diff --git a/Application/views/tpl/documents/invoice/invoice.tpl b/Application/views/tpl/documents/invoice/invoice.tpl
index 21d62bf..fc9b870 100644
--- a/Application/views/tpl/documents/invoice/invoice.tpl
+++ b/Application/views/tpl/documents/invoice/invoice.tpl
@@ -36,15 +36,15 @@
[{foreach from=$order->getOrderArticles(true) item=oOrderArticle}]
- [{$oOrderArticle->oxorderarticles__oxamount->value }] |
-
- [{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }]
+ [{$oOrderArticle->oxorderarticles__oxamount->value }] |
+
+ [{$oOrderArticle->getFieldData('oxtitle')}] [{$oOrderArticle->getFieldData('oxselvariant')}]
- [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }]
+ [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->getFieldData('oxartnum')}]
|
- [{$oOrderArticle->oxorderarticles__oxvat->value }] |
- [{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}] |
- [{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}] |
+ [{$oOrderArticle->getFieldData('oxvat')}] |
+ [{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}] |
+ [{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}] |
|
[{/foreach}]
@@ -54,7 +54,32 @@
[{block name="d3_article_costs_summary"}]
- [{include file="d3_article_costs_summary.tpl"}]
+ [{* ++++++Beschreibung der Kostensummierung++++++ *}]
+ |
+ [{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=$productVats 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"}]
+ |
+ [{* ++++++Kostensummierung++++++ *}]
+
+ [{$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}]
diff --git a/Application/views/tpl/documents/invoice/invoiceNoLogo.tpl b/Application/views/tpl/documents/invoice/invoiceNoLogo.tpl
index ec23f7f..5ff8b3a 100644
--- a/Application/views/tpl/documents/invoice/invoiceNoLogo.tpl
+++ b/Application/views/tpl/documents/invoice/invoiceNoLogo.tpl
@@ -57,24 +57,24 @@
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO"}]
[{if $order->getFormattedDiscount() != 0}]
- [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT"}]
+ [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT"}]
[{/if}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMNETTO"}]
[{foreach from=$productVats 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"}]
+ [{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"}]
|
[{* ++++++Kosten der Bestellung++++++ *}]
[{$order->getFormattedTotalBrutSum()}] [{$currency->name}]
[{if $order->getFormattedDiscount() != 0}]
- -[{$order->getFormattedDiscount()}] [{$currency->name}]
+ -[{$order->getFormattedDiscount()}] [{$currency->name}]
[{/if}]
[{$order->getFormattedTotalNetSum()}] [{$currency->name}]
- [{$lang->formatCurrency($oVat, $currency)}] [{$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}]
diff --git a/metadata.php b/metadata.php
index a3bad85..9328a04 100644
--- a/metadata.php
+++ b/metadata.php
@@ -60,7 +60,6 @@ $aModule = [
'd3invoiceNoLogo_pdf.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/invoiceNoLogo.tpl',
'd3invoice_pdf_addressarea.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/includingFiles/pdfHeader.tpl',
'd3invoice_pdf_conclusion.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl',
- 'd3_article_costs_summary.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/includingFiles/d3_article_costs_summary.tpl',
'd3pdfheader.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/inc/header.tpl',
'd3pdffooter.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/inc/footer.tpl',
|