From 56d4d08f8995b904ea0ed686a3a7fb6919d6d288 Mon Sep 17 00:00:00 2001 From: MaxBUhe Date: Thu, 11 Jun 2020 10:04:48 +0200 Subject: [PATCH 01/17] add: smarty date generation, css-classes; rm unneseccary css-classes, metadata include; --- .../d3_article_costs_summary.tpl | 28 ++++++------- .../invoice/includingFiles/pdfHeader.tpl | 2 +- .../invoice/includingFiles/pdfPastThank.tpl | 2 +- .../views/tpl/documents/invoice/invoice.tpl | 41 +++++++++++++++---- .../tpl/documents/invoice/invoiceNoLogo.tpl | 10 ++--- metadata.php | 1 - 6 files changed, 54 insertions(+), 30 deletions(-) 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"}] - +
[{* +++++++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}] - - + - - - + + + [{/foreach}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USED_PAYMENTMETHOD"}] [{$payment->getFieldData('oxdesc')}]
[{$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}]
@@ -54,7 +54,32 @@ [{block name="d3_article_costs_summary"}] - [{include file="d3_article_costs_summary.tpl"}] + [{* ++++++Beschreibung der Kostensummierung++++++ *}] + + [{* ++++++Kostensummierung++++++ *}] + [{/block}]
+
[{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"}]
+ 		+
[{$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}]
+
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', From adff842b8e2859816bf1ee0d36669dce97970233 Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Thu, 11 Jun 2020 10:07:21 +0200 Subject: [PATCH 02/17] change PDF logo resolution --- Application/views/tpl/documents/inc/header.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/views/tpl/documents/inc/header.tpl b/Application/views/tpl/documents/inc/header.tpl index cb26520..7a46a03 100644 --- a/Application/views/tpl/documents/inc/header.tpl +++ b/Application/views/tpl/documents/inc/header.tpl @@ -3,9 +3,9 @@ [{block name="pdfToping"}]
[{if $showLogo}] - [{assign var="logoUrl" value=$oViewConf->getImageUrl('Elektroversand-Schmidt_Logo_180.jpg')}] + [{assign var="logoUrl" value=$oViewConf->getImageUrl('Elektroversand-Schmidt_Logo_360.jpg')}] [{if $logoUrl}] - + [{/if}] [{/if}]
From 0ea3f0e2019f9a5f2ff25f97fefb2ab26c1a19f9 Mon Sep 17 00:00:00 2001 From: MaxBUhe Date: Thu, 11 Jun 2020 10:19:31 +0200 Subject: [PATCH 03/17] add: database require, nl2br --- .../documents/invoice/includingFiles/pdfPastThank.tpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl b/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl index 476d247..e020a45 100644 --- a/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl +++ b/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl @@ -1,14 +1,14 @@ [{block name="pdfPastThankFile"}] + [{* +++++++Individueller Zahlungstext+++++++ *}] - [{if $order->oxorder__d3pdftextbestellbestaetigung->value}] - - [{else}] - + [{if $order->getFieldData('d3pdftextbestellbestaetigung')}] + [{/if}] + [{**Schlusstext/ Abschied***}] - +
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USED_PAYMENTMETHOD"}] [{$payment->getFieldData('oxdesc')}]
[{$order->oxorder__d3pdftextbestellbestaetigung->value}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USED_GREETINGSORDER"}]
[{$order->getFieldData('d3pdftextbestellbestaetigung')|nl2br}]
[{$payment->getFieldData('d3shortdescpdf')|nl2br}]
[{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_1"}]
[{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_1"}]
[{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_2"}]
[{/block}] \ No newline at end of file From 9ca4b5c4ef51731b9e4fb7c6884a83e5cd6d186e Mon Sep 17 00:00:00 2001 From: MaxBUhe Date: Thu, 11 Jun 2020 10:20:39 +0200 Subject: [PATCH 04/17] add: css-classes; rm: unneseccary css-classes --- .../tpl/documents/deliverynote/deliverynote.tpl | 10 +++++----- .../documents/deliverynote/deliverynoteNoLogo.tpl | 10 +++++----- Modules/out/src/pdfStyling.css | 4 ++-- out/src/css/pdfStyling.css | 15 ++++++++++++--- 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/Application/views/tpl/documents/deliverynote/deliverynote.tpl b/Application/views/tpl/documents/deliverynote/deliverynote.tpl index 6c84a03..beea02d 100644 --- a/Application/views/tpl/documents/deliverynote/deliverynote.tpl +++ b/Application/views/tpl/documents/deliverynote/deliverynote.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/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/Modules/out/src/pdfStyling.css b/Modules/out/src/pdfStyling.css index fd30784..c44fd41 100644 --- a/Modules/out/src/pdfStyling.css +++ b/Modules/out/src/pdfStyling.css @@ -16,7 +16,7 @@ table{ font-size: 12px; } .order_sum{ - margin-left: 181px; + margin-left: 300px; } .order_sumNum{ margin-right: -2.2px; @@ -30,7 +30,7 @@ table{ .paddingBottom{ padding-bottom: 5px; } -.spacing_order_info{ +.paddingTopBottom5{ padding-bottom: 5px; padding-top: 5px; } diff --git a/out/src/css/pdfStyling.css b/out/src/css/pdfStyling.css index 11cf028..6a7e287 100644 --- a/out/src/css/pdfStyling.css +++ b/out/src/css/pdfStyling.css @@ -24,13 +24,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; } @@ -55,6 +60,10 @@ table{ width: 100%; margin-top: 8mm; } +.paddingTop10{ + padding-top: 10px; +} + .pdf_heading_width35{ width: 35%; } From 007ea1a41fad3b13e346ae35909145da0aad09c0 Mon Sep 17 00:00:00 2001 From: MaxBUhe Date: Thu, 11 Jun 2020 11:50:34 +0200 Subject: [PATCH 05/17] add: css-classes --- out/src/css/pdfInvoiceCorrection.css | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/out/src/css/pdfInvoiceCorrection.css b/out/src/css/pdfInvoiceCorrection.css index 2c2ec33..a2a6cfb 100644 --- a/out/src/css/pdfInvoiceCorrection.css +++ b/out/src/css/pdfInvoiceCorrection.css @@ -1,9 +1,17 @@ -.invoiceCorrection_width_40{ - width: 40%; +.invoiceCorrection_pdf_heading_table{ + width: 678px; + margin-top: 8mm; } -.invoiceCorrection_width_60{ - width: 60%; +.invoiceCorrection_width_20{ + width: 20%; } +.invoiceCorrection_width_80{ + width: 80% +} +.iC_paddingBottom10{ + padding-bottom: 10px; +} + .invoiceCorrection_font8{ font-size: 8px; } From 916e0807b4eb59d6fa6a3673a01d772e512e5b7f Mon Sep 17 00:00:00 2001 From: MaxBUhe Date: Fri, 12 Jun 2020 09:45:42 +0200 Subject: [PATCH 06/17] add: include, Line breaks --- .../includingFiles/heidelpay_bank_data.tpl | 23 ++++++++++ .../invoice/includingFiles/pdfPastThank.tpl | 43 ++++++++++++++++--- metadata.php | 4 +- 3 files changed, 62 insertions(+), 8 deletions(-) create mode 100644 Application/views/tpl/documents/invoice/includingFiles/heidelpay_bank_data.tpl 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..a9a11f3 --- /dev/null +++ b/Application/views/tpl/documents/invoice/includingFiles/heidelpay_bank_data.tpl @@ -0,0 +1,23 @@ +[{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}]
+ hier shortID: [{$oPrePaymentData->getShortId()}] + [{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 e020a45..2ffdea5 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"}] - - + + + [{* +++++++Individueller Zahlungstext+++++++ *}] [{if $order->getFieldData('d3pdftextbestellbestaetigung')}] - + + + [{/if}] - + [{d3modcfgcheck modid="d3heidelpay"}][{/d3modcfgcheck}] + [{if $mod_d3heidelpay}] + + + + [{else}] + + + + [{/if}] [{**Schlusstext/ Abschied***}] - - + + + + + +
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USED_PAYMENTMETHOD"}] [{$payment->getFieldData('oxdesc')}]
+ [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USED_PAYMENTMETHOD"}] + [{$payment->getFieldData('oxdesc')}] +
[{$order->getFieldData('d3pdftextbestellbestaetigung')|nl2br}]
+ [{$order->getFieldData('d3pdftextbestellbestaetigung')|nl2br}] +
[{$payment->getFieldData('d3shortdescpdf')|nl2br}]
+ [{include file="d3Heidelpay_bank_data.tpl"}] +
+ [{$payment->getFieldData('d3shortdescpdf')|nl2br}] +
[{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/metadata.php b/metadata.php index 9328a04..dc7a729 100644 --- a/metadata.php +++ b/metadata.php @@ -64,7 +64,9 @@ $aModule = [ 'd3pdfheader.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/inc/header.tpl', 'd3pdffooter.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/inc/footer.tpl', 'd3din5008.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/inc/din5008.tpl', - 'd3pdfstyle.css' => 'd3/pdfdocuments/out/src/css/pdfStyling.css' + 'd3pdfstyle.css' => 'd3/pdfdocuments/out/src/css/pdfStyling.css', + + 'd3Heidelpay_bank_data.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/includingFiles/heidelpay_bank_data.tpl' ], 'events' => [], 'blocks' => [ From 2264fa99ca15aa52c6251526810ad58dd246a09f Mon Sep 17 00:00:00 2001 From: MaxBUhe Date: Fri, 12 Jun 2020 10:27:21 +0200 Subject: [PATCH 07/17] add: code - line breaks; rm unnecessary method --- .../invoice/includingFiles/heidelpay_bank_data.tpl | 1 - Application/views/tpl/documents/invoice/invoice.tpl | 10 +++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Application/views/tpl/documents/invoice/includingFiles/heidelpay_bank_data.tpl b/Application/views/tpl/documents/invoice/includingFiles/heidelpay_bank_data.tpl index a9a11f3..3beb2f2 100644 --- a/Application/views/tpl/documents/invoice/includingFiles/heidelpay_bank_data.tpl +++ b/Application/views/tpl/documents/invoice/includingFiles/heidelpay_bank_data.tpl @@ -12,7 +12,6 @@ [{oxmultilang ident="D3HEIDELPAY_EMAIL_PREPAYMENT_ACCOUNTHOLDER"}] [{$oPrePaymentData->Holder}]
[{oxmultilang ident="D3HEIDELPAY_EMAIL_PREPAYMENT_IBAN"}] [{$oPrePaymentData->Iban}]
[{oxmultilang ident="D3HEIDELPAY_EMAIL_PREPAYMENT_BIC"}] [{$oPrePaymentData->Bic}]
- hier shortID: [{$oPrePaymentData->getShortId()}] [{oxmultilang ident="D3HEIDELPAY_EMAIL_PREPAYMENT_AMOUNT"}] [{$order->getFormattedTotalOrderSum()}] [{$oPrePaymentData->Currency}]
[{oxmultilang ident="D3HEIDELPAY_EMAIL_PREPAYMENT_REASON"}] [{$oPrePaymentData->Reference}]

diff --git a/Application/views/tpl/documents/invoice/invoice.tpl b/Application/views/tpl/documents/invoice/invoice.tpl index fc9b870..6c1b6d2 100644 --- a/Application/views/tpl/documents/invoice/invoice.tpl +++ b/Application/views/tpl/documents/invoice/invoice.tpl @@ -37,11 +37,15 @@ [{foreach from=$order->getOrderArticles(true) item=oOrderArticle}]
[{$oOrderArticle->oxorderarticles__oxamount->value }]
-
+ +
[{$oOrderArticle->getFieldData('oxtitle')}] [{$oOrderArticle->getFieldData('oxselvariant')}]
- [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->getFieldData('oxartnum')}] -
+ + [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->getFieldData('oxartnum')}] + +
+
[{$oOrderArticle->getFieldData('oxvat')}]
[{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}]
[{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}]
From ea290f8bf27f95e96baa6ee7fe8a2450fee9682b Mon Sep 17 00:00:00 2001 From: MaxBUhe Date: Fri, 12 Jun 2020 11:11:56 +0200 Subject: [PATCH 08/17] 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; From b3a8269fcd2239c62e54f0e938e677984e933ad2 Mon Sep 17 00:00:00 2001 From: MaxBUhe Date: Fri, 12 Jun 2020 13:38:07 +0200 Subject: [PATCH 09/17] changed {if} --- .../views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl b/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl index 2ffdea5..59af8bf 100644 --- a/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl +++ b/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl @@ -15,7 +15,7 @@ [{/if}] [{d3modcfgcheck modid="d3heidelpay"}][{/d3modcfgcheck}] - [{if $mod_d3heidelpay}] + [{if $order->getHeidelpayBankTransferData()}] [{include file="d3Heidelpay_bank_data.tpl"}] From 59b11667f80788828a485d86a8bb0212f9ec0bd7 Mon Sep 17 00:00:00 2001 From: MaxBUhe Date: Fri, 12 Jun 2020 13:38:31 +0200 Subject: [PATCH 10/17] add: css-classes --- out/src/css/pdfStyling.css | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/out/src/css/pdfStyling.css b/out/src/css/pdfStyling.css index 6a7e287..eaedeb1 100644 --- a/out/src/css/pdfStyling.css +++ b/out/src/css/pdfStyling.css @@ -179,6 +179,15 @@ table{ .past_thank_width100{ width: 100%; } +.marginTop0{ + margin-top: 0; +} +.marginLeftSub3{ + padding-left: -3.5px; +} +.marginLeft3{ + margin-left: 3px; +} /* footer styling */ .footer_parts{ From 4c64993f03f543cebd8e3f3d751db95eda660098 Mon Sep 17 00:00:00 2001 From: MaxBUhe Date: Fri, 12 Jun 2020 14:51:19 +0200 Subject: [PATCH 11/17] add: css-classes --- out/src/css/pdfInvoiceCorrection.css | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/out/src/css/pdfInvoiceCorrection.css b/out/src/css/pdfInvoiceCorrection.css index a2a6cfb..18e4cbd 100644 --- a/out/src/css/pdfInvoiceCorrection.css +++ b/out/src/css/pdfInvoiceCorrection.css @@ -8,6 +8,16 @@ .invoiceCorrection_width_80{ width: 80% } +.iC_width11{ + width: 11%; +} +.iC_width29{ + width: 29%; +} +.iC_width60{ + width: 60%; +} + .iC_paddingBottom10{ padding-bottom: 10px; } @@ -24,6 +34,9 @@ .invoiceCorrection_spacingLeft20{ margin-left: 73.6px; } +.margin-top7{ + margin-top: 7px; +} .invoiceCorrectionPaddingTop4{ padding-top: 4px; @@ -31,6 +44,9 @@ .invoiceCorrectionPaddingTop5{ padding-top: 5px; } +.paddingTop20{ + padding-top: 20px; +} .invoiceCorrectionPaddingBottom20{ padding-bottom: 20px; From 5db3bca501e8a29cf4de34eaef173dd2bc48833c Mon Sep 17 00:00:00 2001 From: MaxBUhe Date: Fri, 12 Jun 2020 16:22:17 +0200 Subject: [PATCH 12/17] add: css-classes --- .../deliverynote/includingFiles/pdfHeader.tpl | 52 +++++++++---------- 1 file changed, 24 insertions(+), 28 deletions(-) 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"}]
From 21e819afeaced966d432bd21dfd66624c3e3624b Mon Sep 17 00:00:00 2001 From: MaxBUhe Date: Fri, 12 Jun 2020 16:51:25 +0200 Subject: [PATCH 13/17] rm: space --- .../documents/invoice/includingFiles/heidelpay_bank_data.tpl | 4 ++-- .../tpl/documents/invoice/includingFiles/pdfPastThank.tpl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Application/views/tpl/documents/invoice/includingFiles/heidelpay_bank_data.tpl b/Application/views/tpl/documents/invoice/includingFiles/heidelpay_bank_data.tpl index 3beb2f2..2d538eb 100644 --- a/Application/views/tpl/documents/invoice/includingFiles/heidelpay_bank_data.tpl +++ b/Application/views/tpl/documents/invoice/includingFiles/heidelpay_bank_data.tpl @@ -5,7 +5,7 @@ [{assign var="oPrePaymentData" value=$order->getHeidelpayBankTransferData()}] [{if $oPrePaymentData}]
-

[{oxmultilang ident="BANK_DETAILS"}]

+

[{oxmultilang ident="BANK_DETAILS"}]

[{oxmultilang ident="D3_HEIDELPAY_BANK_INFO"}]
[{oxmultilang ident="D3_HEIDELPAY_PURPOSE_OF_USE"}]

@@ -16,7 +16,7 @@ [{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 59af8bf..a43651c 100644 --- a/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl +++ b/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl @@ -17,7 +17,7 @@ [{d3modcfgcheck modid="d3heidelpay"}][{/d3modcfgcheck}] [{if $order->getHeidelpayBankTransferData()}] - + [{include file="d3Heidelpay_bank_data.tpl"}] @@ -30,7 +30,7 @@ [{/if}] [{**Schlusstext/ Abschied***}] - + [{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_1"}] From 83f58d806b3e4ad4ecf6adda127e8b1b45bf8673 Mon Sep 17 00:00:00 2001 From: MaxBUhe Date: Fri, 12 Jun 2020 17:01:27 +0200 Subject: [PATCH 14/17] #9764 rm: bug finding support --- .../tpl/documents/invoice/includingFiles/pdfPastThank.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl b/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl index a43651c..3d18639 100644 --- a/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl +++ b/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl @@ -17,7 +17,7 @@ [{d3modcfgcheck modid="d3heidelpay"}][{/d3modcfgcheck}] [{if $order->getHeidelpayBankTransferData()}] - + [{include file="d3Heidelpay_bank_data.tpl"}] @@ -30,7 +30,7 @@ [{/if}] [{**Schlusstext/ Abschied***}] - + [{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_1"}] From a6b6918827c805b3c97bddefea7abbb7c893d976 Mon Sep 17 00:00:00 2001 From: MaxBUhe Date: Fri, 12 Jun 2020 17:09:31 +0200 Subject: [PATCH 15/17] #9776 rm: spacing --- out/src/css/pdfStyling.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/out/src/css/pdfStyling.css b/out/src/css/pdfStyling.css index eaedeb1..247b774 100644 --- a/out/src/css/pdfStyling.css +++ b/out/src/css/pdfStyling.css @@ -179,6 +179,9 @@ table{ .past_thank_width100{ width: 100%; } +.paddingBottomSub10{ + padding-bottom: -10px; +} .marginTop0{ margin-top: 0; } From b850cd11ec50151eeb37020dae3b5dc65224ad0d Mon Sep 17 00:00:00 2001 From: MaxBUhe Date: Tue, 16 Jun 2020 16:08:09 +0200 Subject: [PATCH 16/17] rm: unnecessary file --- out/src/css/deliverynote_.css | 173 ---------------------------------- 1 file changed, 173 deletions(-) delete mode 100644 out/src/css/deliverynote_.css 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%; -} From bb1073b894ab3db4999d2ef92c9bdd76e082c2ef Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Wed, 17 Jun 2020 09:05:49 +0200 Subject: [PATCH 17/17] make valid filenames --- .../AbstractClasses/pdfdocumentsGeneric.php | 12 ++++++++-- .../AbstractClasses/pdfdocumentsOrder.php | 22 ++++++++++++------- Application/Model/Documents/invoicePdf.php | 4 +++- 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/Application/Model/AbstractClasses/pdfdocumentsGeneric.php b/Application/Model/AbstractClasses/pdfdocumentsGeneric.php index dbb7a54..867d61a 100644 --- a/Application/Model/AbstractClasses/pdfdocumentsGeneric.php +++ b/Application/Model/AbstractClasses/pdfdocumentsGeneric.php @@ -199,10 +199,18 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface { // forced filename from setFilename() if ($this->filename) { - return $this->addFilenameExtension($this->filename); + return $this->addFilenameExtension( + $this->makeValidFileName( + $this->filename + ) + ); } - return $this->addFilenameExtension($this->getTypeForFilename()); + return $this->addFilenameExtension( + $this->makeValidFileName( + $this->getTypeForFilename() + ) + ); } /** diff --git a/Application/Model/AbstractClasses/pdfdocumentsOrder.php b/Application/Model/AbstractClasses/pdfdocumentsOrder.php index cefd14d..3029148 100644 --- a/Application/Model/AbstractClasses/pdfdocumentsOrder.php +++ b/Application/Model/AbstractClasses/pdfdocumentsOrder.php @@ -69,19 +69,25 @@ abstract class pdfdocumentsOrder extends pdfdocumentsGeneric implements orderInt { // forced filename from setFilename() if ($this->filename) { - return $this->addFilenameExtension($this->filename); + return $this->addFilenameExtension( + $this->makeValidFileName( + $this->filename + ) + ); } $sTrimmedBillName = trim($this->getOrder()->getFieldData('oxbilllname')); return $this->addFilenameExtension( - implode( - '_', - [ - $this->getTypeForFilename(), - $this->getOrder()->getFieldData('oxordernr'), - $sTrimmedBillName - ] + $this->makeValidFileName( + implode( + '_', + [ + $this->getTypeForFilename(), + $this->getOrder()->getFieldData('oxordernr'), + $sTrimmedBillName + ] + ) ) ); } diff --git a/Application/Model/Documents/invoicePdf.php b/Application/Model/Documents/invoicePdf.php index 4a7edaf..1761067 100644 --- a/Application/Model/Documents/invoicePdf.php +++ b/Application/Model/Documents/invoicePdf.php @@ -111,10 +111,12 @@ class invoicePdf extends pdfdocumentsOrder implements pdfdocumentsOrderinvoiceIn { $filename = parent::getFilename(); - return str_replace( + $filename = str_replace( $this->getOrder()->getFieldData('oxordernr'), $this->getOrder()->getFieldData('oxbillnr'), $filename ); + + return $this->makeValidFileName($filename); } } \ No newline at end of file