- [{block name="articleCosts"}]
- [{*
-
- [{ ++++++Artikelzusammenfassung++++++ }]
-
- [{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"}]
- |
- [{ ++++++Kosten der Bestellung++++++ }]
-
- [{$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/Application/views/tpl/documents/deliverynote/deliverynoteNoLogo.tpl b/Application/views/tpl/documents/deliverynote/deliverynoteNoLogo.tpl
index 66e8e60..1af284c 100644
--- a/Application/views/tpl/documents/deliverynote/deliverynoteNoLogo.tpl
+++ b/Application/views/tpl/documents/deliverynote/deliverynoteNoLogo.tpl
@@ -60,24 +60,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=$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"}]
+ [{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/Application/views/tpl/documents/deliverynote/includingFiles/pdfHeader.tpl b/Application/views/tpl/documents/deliverynote/includingFiles/pdfHeader.tpl
index 86b0c87..91a16ce 100644
--- a/Application/views/tpl/documents/deliverynote/includingFiles/pdfHeader.tpl
+++ b/Application/views/tpl/documents/deliverynote/includingFiles/pdfHeader.tpl
@@ -5,43 +5,39 @@
|
[{$shop->oxshops__oxname->value}] - [{$shop->oxshops__oxstreet->value}] - [{$shop->oxshops__oxzip->value}] [{$shop->oxshops__oxcity->value}]
|
- [{*
- [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_GET_IN_CONTACT"}]
- [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TELEFON"}][{$shop->oxshops__oxtelefon->value}]
- [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_FAX"}][{$shop->oxshops__oxtelefax->value}]
- [{$shop->oxshops__oxinfoemail->value}]
- | *}]
[{/block}]
[{block name="heading_order_information"}]
- [{if $order->oxorder__oxbillcompany->value}]
- [{$order->oxorder__oxbillcompany->value}]
- [{/if}]
- [{$order->oxorder__oxbillfname->value}] [{$order->oxorder__oxbilllname->value}]
- [{$order->oxorder__oxbillstreet->value}] [{$order->oxorder__oxbillstreetnr->value}]
- [{$order->oxorder__oxbillzip->value}] [{$order->oxorder__oxbillcity->value}]
- [{$shop->oxshops__oxcountry->value}]
-
[{* +++++++Lieferadressen dynamisch+++++++ *}]
- [{if $order->oxorder__oxdelstreet->value}]
+ [{if $order->getFieldData('oxdellname')}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYADDRESS"}]
- [{if $order->oxorder__oxdelcompany->value}][{$order->oxorder__oxdelcompany->value}] [{/if}]
- [{$order->oxorder__oxdelfname->value}] [{$order->oxorder__oxdellname->value}]
- [{$order->oxorder__oxdelstreet->value}] [{$order->oxorder__oxdelstreetnr->value}]
- [{$order->oxorder__oxdelzip->value}] [{$order->oxorder__oxdelcity->value}]
- [{$shop->oxshops__oxcountry->value}]
- [{$shop->oxshops__oxdeladdinfo->value}]
+ [{if $order->oxorder__oxdelcompany->value}]
+ [{$order->getFieldData('oxdelcompany')}]
[{/if}]
+ [{$order->getFieldData('oxdelfname')}] [{$order->getFieldData('oxdellname')}]
+ [{$order->getFieldData('oxdelstreet')}] [{$order->getFieldData('oxdelstreetnr')}]
+ [{$order->getFieldData('oxdelzip')}] [{$order->getFieldData('oxdelcity')}]
+ [{$shop->getFieldData('oxcountry')}]
+ [{$shop->getFieldData('oxdeladdinfo')}]
+ [{else}]
+ [{if $order->getFieldData('oxbillcompany')}]
+ [{$order->getFieldData('oxbillcompany')}]
+ [{/if}]
+ [{$order->getFieldData('oxbillfname')}] [{$order->getFieldData('oxbilllname')}]
+ [{$order->getFieldData('oxbillstreet')}] [{$order->getFieldData('oxbillstreetnr')}]
+ [{$order->getFieldData('oxbillzip')}] [{$order->getFieldData('oxbillcity')}]
+ [{$shop->getFieldData('oxcountry')}]
+ [{/if}]
[{*Bestellnummer,Rechnungsvermerk, 'Ihre bestellung vom...'*}]
|
-
+ |
[{oxmultilang ident="D3_DELIVERYNOTE_PDF_QUOTECUSTMNR"}]
- [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_CUSTOMERNR"}] [{$user->oxuser__oxcustnr->value}]
- [{$shop->oxshops__oxcity->value}], [{$smarty.now|date_format:"%d.%m.%G"}]
- [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTIDNR"}][{$shop->oxshops__oxvatnumber->value}]
- [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILLNR"}][{$order->oxorder__oxbillnr->value}]
+ [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_CUSTOMERNR"}] [{$user->getFieldData('oxcustnr')}]
+ [{$shop->getFieldData('oxcity')}], [{$smarty.now|date_format:"%d.%m.%G"}]
+ [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTIDNR"}][{$shop->getFieldData('oxvatnumber')}]
+ [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILLNR"}][{$order->getFieldData('oxbillnr')}]
|
[{/block}]
@@ -49,12 +45,12 @@
- [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYNOTE"}][{$order->oxorder__oxordernr->value}]
+ [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYNOTE"}][{$order->oxorder__oxordernr->value}]
|
- [{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSINCERELY"}][{$order->oxorder__oxorderdate->value|date_format:"%d.%m.%Y"}][{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSAT"}]
+ [{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSINCERELY"}][{$order->oxorder__oxorderdate->value|date_format:"%d.%m.%Y"}][{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSAT"}]
|
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/heidelpay_bank_data.tpl b/Application/views/tpl/documents/invoice/includingFiles/heidelpay_bank_data.tpl
new file mode 100644
index 0000000..2d538eb
--- /dev/null
+++ b/Application/views/tpl/documents/invoice/includingFiles/heidelpay_bank_data.tpl
@@ -0,0 +1,22 @@
+[{block name="heidelpay_bank_data"}]
+ [{d3modcfgcheck modid="d3heidelpay"}][{/d3modcfgcheck}]
+
+ [{if $mod_d3heidelpay}]
+ [{assign var="oPrePaymentData" value=$order->getHeidelpayBankTransferData()}]
+ [{if $oPrePaymentData}]
+
+
[{oxmultilang ident="BANK_DETAILS"}]
+
+ [{oxmultilang ident="D3_HEIDELPAY_BANK_INFO"}]
+ [{oxmultilang ident="D3_HEIDELPAY_PURPOSE_OF_USE"}]
+ [{oxmultilang ident="D3HEIDELPAY_EMAIL_PREPAYMENT_ACCOUNTHOLDER"}] [{$oPrePaymentData->Holder}]
+ [{oxmultilang ident="D3HEIDELPAY_EMAIL_PREPAYMENT_IBAN"}] [{$oPrePaymentData->Iban}]
+ [{oxmultilang ident="D3HEIDELPAY_EMAIL_PREPAYMENT_BIC"}] [{$oPrePaymentData->Bic}]
+ [{oxmultilang ident="D3HEIDELPAY_EMAIL_PREPAYMENT_AMOUNT"}] [{$order->getFormattedTotalOrderSum()}] [{$oPrePaymentData->Currency}]
+ [{oxmultilang ident="D3HEIDELPAY_EMAIL_PREPAYMENT_REASON"}] [{$oPrePaymentData->Reference}]
+
+
+
+ [{/if}]
+ [{/if}]
+[{/block}]
\ No newline at end of file
diff --git a/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl b/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl
index 9f3f61a..3d18639 100644
--- a/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl
+++ b/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl
@@ -1,14 +1,43 @@
[{block name="pdfPastThankFile"}]
-
- [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USED_PAYMENTMETHOD"}] [{$payment->getFieldData('oxdesc')}] |
+
+
+
+ [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USED_PAYMENTMETHOD"}]
+ [{$payment->getFieldData('oxdesc')}]
+ |
+
[{* +++++++Individueller Zahlungstext+++++++ *}]
- [{if $order->oxorder__d3pdftextbestellbestaetigung->value}]
- [{$order->oxorder__d3pdftextbestellbestaetigung->value}] |
- [{else}]
- [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USED_GREETINGSORDER"}] |
+ [{if $order->getFieldData('d3pdftextbestellbestaetigung')}]
+
+
+ [{$order->getFieldData('d3pdftextbestellbestaetigung')|nl2br}]
+ |
+
[{/if}]
+ [{d3modcfgcheck modid="d3heidelpay"}][{/d3modcfgcheck}]
+ [{if $order->getHeidelpayBankTransferData()}]
+
+
+ [{include file="d3Heidelpay_bank_data.tpl"}]
+ |
+
+ [{else}]
+
+
+ [{$payment->getFieldData('d3shortdescpdf')|nl2br}]
+ |
+
+ [{/if}]
[{**Schlusstext/ Abschied***}]
- [{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_1"}] |
- [{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_2"}] |
+
+
+ [{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_1"}]
+ |
+
+
+
+ [{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_2"}]
+ |
+
-[{/block}]
\ No newline at end of file
+[{/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 379b396..b5b1eb1 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',
'd3pdfbase.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/inc/page/base.tpl',
'd3pdfheader.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/inc/page/header.tpl',
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;
diff --git a/out/src/css/deliverynote_.css b/out/src/css/deliverynote_.css
deleted file mode 100644
index fd30784..0000000
--- a/out/src/css/deliverynote_.css
+++ /dev/null
@@ -1,173 +0,0 @@
-/*debug hilfe*/
-.eraseBug{
- border: dashed blueviolet 1px;
-}
-
-table{
- font-family: "helvetica";
-}
-.aligning{
- text-align: right;
-}
-.vertical-a{
- vertical-align: top;
-}
-.fontSize12{
- font-size: 12px;
-}
-.order_sum{
- margin-left: 181px;
-}
-.order_sumNum{
- margin-right: -2.2px;
-}
-.border-bottom{
- border-bottom: solid 0.15mm #000;
-}
-.paddingTop{
- padding-top: 5px;
-}
-.paddingBottom{
- padding-bottom: 5px;
-}
-.spacing_order_info{
- padding-bottom: 5px;
- padding-top: 5px;
-}
-
-/*pdf_header*/
-.pdf_header_positioning{
- position: absolute;
- top: 30px;
- right: 44px;
-}
-
-/*pdf_footer*/
-.pdf_footer_table{
- width: 688px;
- font-size: 9px;
- margin: 0 30px 0 30px;
- border-top: solid 1px #000;
-}
-
-/*pdf_heading*/
-.pdf_heading_table{
- width: 100%;
- margin-top: 8mm;
-}
-.pdf_heading_width35{
- width: 35%;
-}
-.pdf_heading_fontSize8{
- font-size: 8px;
-}
-.pdf_heading_width65{
- width: 65%;
-}
-.pdf_heading_fontSize12{
- font-size: 12px;
-}
-
-/*heading_order_information*/
-.heading_order_paddingTop10{
- padding-top: 10px;
-}
-.heading_order_width35{
- width: 35%;
-}
-.heading_order_paddingTopSub5{
- padding-top: -5px;
-}
-.heading_order_paddingTop1{
- padding-top: 1mm;
-}
-.heading_order_fontSize15{
- font-size: 15px;
-}
-.heading_order_paddingTop22{
- padding-top: 22px;
-}
-.heading_order_paddingBottom8{
- padding-bottom: 8px;
-}
-.heading_order_paddingBottom15{
- padding-bottom: 15px;
-}
-.heading_order_fontSize10{
- font-size: 10px;
-}
-.heading_order_paddingTopSub5{
- padding-top: -5px;
-}
-.heading_order_width65{
- width: 65%;
-}
-
-/*order_article_listing*/
-.order_article_listing_width_amount{
- width: 20px;
-}
-.order_article_listing_width_desc{
- width: 398px;
-}
-.order_article_listing_width_ust{
- width: 10px;
-}
-.order_article_listing_width_unitPrice{
- 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;
-}
-.order_article_costs_marginLeftSub3{
- margin-left: -3px;
-}
-.order_article_costs_paddingRight66{
- padding-right: 65.9px;
-}
-.order_article_listing_fontSize9{
- font-size: 9px;
-}
-.order_article_listing_fontSize12{
- font-size: 12px;
-}
-
-/* order_article_costs */
-.article_costs_table{
- width: 100%;
- border-top: solid 0.15mm #000;
-}
-.article_costs_table_td_width50{
- width: 50%;
-}
-.article_costs_table_paddingRight{
- padding-right: -3px;
-}
-.order_article_costs_fontSize12{
- font-size: 12px;
-}
-
-/*order_shop_past_thank*/
-.past_thank_width100{
- width: 100%;
-}
-
-/* footer styling */
-.footer_parts{
- width: 33.33%;
-}
diff --git a/out/src/css/pdfInvoiceCorrection.css b/out/src/css/pdfInvoiceCorrection.css
index 2c2ec33..18e4cbd 100644
--- a/out/src/css/pdfInvoiceCorrection.css
+++ b/out/src/css/pdfInvoiceCorrection.css
@@ -1,9 +1,27 @@
-.invoiceCorrection_width_40{
- width: 40%;
+.invoiceCorrection_pdf_heading_table{
+ width: 678px;
+ margin-top: 8mm;
}
-.invoiceCorrection_width_60{
+.invoiceCorrection_width_20{
+ width: 20%;
+}
+.invoiceCorrection_width_80{
+ width: 80%
+}
+.iC_width11{
+ width: 11%;
+}
+.iC_width29{
+ width: 29%;
+}
+.iC_width60{
width: 60%;
}
+
+.iC_paddingBottom10{
+ padding-bottom: 10px;
+}
+
.invoiceCorrection_font8{
font-size: 8px;
}
@@ -16,6 +34,9 @@
.invoiceCorrection_spacingLeft20{
margin-left: 73.6px;
}
+.margin-top7{
+ margin-top: 7px;
+}
.invoiceCorrectionPaddingTop4{
padding-top: 4px;
@@ -23,6 +44,9 @@
.invoiceCorrectionPaddingTop5{
padding-top: 5px;
}
+.paddingTop20{
+ padding-top: 20px;
+}
.invoiceCorrectionPaddingBottom20{
padding-bottom: 20px;
diff --git a/out/src/css/pdfStyling.css b/out/src/css/pdfStyling.css
index 5a4fbbd..85d1cca 100644
--- a/out/src/css/pdfStyling.css
+++ b/out/src/css/pdfStyling.css
@@ -93,13 +93,18 @@ table{
.border-bottom{
border-bottom: solid 0.15mm #000;
}
-.hermes{
+.paddingTop10{
+ padding-top: 10px
+}
+
+.paddingTop{
padding-top: 5px;
}
-.mercurius{
+.paddingBottom{
padding-bottom: 5px;
}
-.spacing_order_info{
+
+.paddingTopBottom5{
padding-bottom: 5px;
padding-top: 5px;
}
@@ -112,6 +117,10 @@ table{
width: 100%;
margin-top: 8mm;
}
+.paddingTop10{
+ padding-top: 10px;
+}
+
.pdf_heading_width35{
width: 35%;
}
@@ -227,6 +236,18 @@ table{
.past_thank_width100{
width: 100%;
}
+.paddingBottomSub10{
+ padding-bottom: -10px;
+}
+.marginTop0{
+ margin-top: 0;
+}
+.marginLeftSub3{
+ padding-left: -3.5px;
+}
+.marginLeft3{
+ margin-left: 3px;
+}
/* footer styling */
.footer_parts{
|