From 95a73b8ef812570229e09c3ccf74d60ec6e6cdac Mon Sep 17 00:00:00 2001 From: MaxBUhe Date: Fri, 5 Jun 2020 14:33:43 +0200 Subject: [PATCH 1/5] adding new css classes and config spaces --- .../invoice/includingFiles/pdfPastThank.tpl | 10 ++++------ out/src/css/deliverynote_.css | 4 ++-- out/src/css/pdfStyling.css | 16 ++++++++++++++-- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl b/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl index 907388c..9f3f61a 100644 --- a/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl +++ b/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl @@ -1,16 +1,14 @@ [{block name="pdfPastThankFile"}] - - - +
 
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USED_PAYMENTMETHOD"}][{$payment->oxpayments__oxdesc->value}]
+ [{* +++++++Individueller Zahlungstext+++++++ *}] [{if $order->oxorder__d3pdftextbestellbestaetigung->value}] [{else}] [{/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"}]
 
[{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 diff --git a/out/src/css/deliverynote_.css b/out/src/css/deliverynote_.css index 8b9c9a1..fd30784 100644 --- a/out/src/css/deliverynote_.css +++ b/out/src/css/deliverynote_.css @@ -24,10 +24,10 @@ table{ .border-bottom{ border-bottom: solid 0.15mm #000; } -.hermes{ +.paddingTop{ padding-top: 5px; } -.mercurius{ +.paddingBottom{ padding-bottom: 5px; } .spacing_order_info{ diff --git a/out/src/css/pdfStyling.css b/out/src/css/pdfStyling.css index 8b9c9a1..aa36b1b 100644 --- a/out/src/css/pdfStyling.css +++ b/out/src/css/pdfStyling.css @@ -24,12 +24,20 @@ table{ .border-bottom{ border-bottom: solid 0.15mm #000; } -.hermes{ +.paddingTop{ padding-top: 5px; } -.mercurius{ +.paddingBottom{ padding-bottom: 5px; } + +.paddingTop15{ + padding-top: 10px; +} +.marginTop5{ + padding-top: 5px; +} + .spacing_order_info{ padding-bottom: 5px; padding-top: 5px; @@ -50,6 +58,10 @@ table{ border-top: solid 1px #000; } +.borderSpacingUnset{ + border-spacing: 0; +} + /*pdf_heading*/ .pdf_heading_table{ width: 100%; From b37280fcbf472bff6f9690cea753c0c9870b1791 Mon Sep 17 00:00:00 2001 From: MaxBUhe Date: Fri, 5 Jun 2020 15:54:16 +0200 Subject: [PATCH 2/5] added getFieldData() and spacing --- .../invoice/includingFiles/pdfHeader.tpl | 54 +++++++++---------- Modules/out/src/pdfStyling.css | 4 +- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Application/views/tpl/documents/invoice/includingFiles/pdfHeader.tpl b/Application/views/tpl/documents/invoice/includingFiles/pdfHeader.tpl index a4aaa3c..88de701 100644 --- a/Application/views/tpl/documents/invoice/includingFiles/pdfHeader.tpl +++ b/Application/views/tpl/documents/invoice/includingFiles/pdfHeader.tpl @@ -3,52 +3,52 @@ [{block name="heading_owner_information"}] -
[{$shop->oxshops__oxname->value}] - [{$shop->oxshops__oxstreet->value}] - [{$shop->oxshops__oxzip->value}] [{$shop->oxshops__oxcity->value}]
+
[{$shop->getFielddata('oxname')}] - [{$shop->getFielddata('oxstreet')}] - [{$shop->getFielddata('oxzip')}] [{$shop->getFielddata('oxcity')}]
[{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}]
+
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TELEFON"}][{$shop->getFieldData('oxtelefon')}]
+
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_FAX"}][{$shop->getFieldData('oxtelefax')}]
+
[{$shop->getFieldData('oxinfoemail')}]
[{/block}] [{block name="heading_order_information"}] - [{if $order->oxorder__oxbillcompany->value}] -
[{$order->oxorder__oxbillcompany->value}]
+ [{if $order->getFieldData('oxbillcompany')}] +
[{$order->getFieldData('oxbillcompany')}]
[{/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}]
+
[{$order->getFieldData('oxbillfname')}] [{$order->getFieldData('oxbilllname')}]
+
[{$order->getFieldData('oxbillstreet')}] [{$order->getFieldData('oxbillstreetnr')}]
+
[{$order->getFieldData('oxbillzip')}] [{$order->getFieldData('oxbillcity')}]
+
[{$shop->getFieldData('oxcountry')}]
[{* +++++++Lieferadressen dynamisch+++++++ *}] - [{if $order->oxorder__oxdelstreet->value}] + [{if $order->getFieldData('oxdelstreet')}]
[{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->getFieldData('oxdelcompany')}]
[{$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')}]
[{/if}] [{*Bestellnummer,Rechnungsvermerk, 'Ihre bestellung vom...'*}] -
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERNR"}][{$order->oxorder__oxordernr->value}]
-
[{if $order->oxorder__d3pdftextkostenstelle_kunden->value}][{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_INVOICENOTE"}][{$order->oxorder__d3pdftextkostenstelle_kunden->value}][{/if}]
-
[{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSINCERELY"}][{$order->oxorder__oxorderdate->value|date_format:"%d.%m.%Y"}][{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSAT"}]
+
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERNR"}][{$order->getFieldData('oxordernr')}]
+ [{if $order->getFieldData('d3pdftextkostenstelle_kunden')}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_INVOICENOTE"}][{$order->getFieldData('d3pdftextkostenstelle_kunden')}]
[{/if}] +
[{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSINCERELY"}][{$order->getFieldData('oxorderdate')|date_format:"%d.%m.%Y"}][{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSAT"}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_BANKVERBINDUNG"}]
-
[{$shop->oxshops__oxbankname->value}]
-
[{oxmultilang ident="ORDER_OVERVIEW_PDF_ACCOUNTNR"}][{$shop->oxshops__oxibannumber->value}]
-
[{oxmultilang ident="ORDER_OVERVIEW_PDF_BANKCODE_HEADER"}][{$shop->oxshops__oxbiccode->value}]
-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILLNR"}][{$order->oxorder__oxbillnr->value}]
-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_CUSTOMERNR"}] [{$user->oxuser__oxcustnr->value}]
-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DATE"}][{$order->oxorder__oxbilldate->value|date_format:"%d.%m.%Y"}]
-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTIDNR"}][{$shop->oxshops__oxvatnumber->value}]
+
[{$shop->getFieldData('oxbankname')}]
+
[{oxmultilang ident="ORDER_OVERVIEW_PDF_ACCOUNTNR"}][{$shop->getFieldData('oxibannumber')}]
+
[{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_USTIDNR"}][{$shop->getFieldData('oxvatnumber')}]
[{/block}] diff --git a/Modules/out/src/pdfStyling.css b/Modules/out/src/pdfStyling.css index 8b9c9a1..fd30784 100644 --- a/Modules/out/src/pdfStyling.css +++ b/Modules/out/src/pdfStyling.css @@ -24,10 +24,10 @@ table{ .border-bottom{ border-bottom: solid 0.15mm #000; } -.hermes{ +.paddingTop{ padding-top: 5px; } -.mercurius{ +.paddingBottom{ padding-bottom: 5px; } .spacing_order_info{ From bdec638f140a23de5aca83dd794d9e79589138ee Mon Sep 17 00:00:00 2001 From: MaxBUhe Date: Fri, 5 Jun 2020 16:06:35 +0200 Subject: [PATCH 3/5] implementation of smarty.now --- .../tpl/documents/deliverynote/includingFiles/pdfHeader.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/views/tpl/documents/deliverynote/includingFiles/pdfHeader.tpl b/Application/views/tpl/documents/deliverynote/includingFiles/pdfHeader.tpl index 93f2d94..8344fb7 100644 --- a/Application/views/tpl/documents/deliverynote/includingFiles/pdfHeader.tpl +++ b/Application/views/tpl/documents/deliverynote/includingFiles/pdfHeader.tpl @@ -42,7 +42,7 @@
[{oxmultilang ident="D3_DELIVERYNOTE_PDF_QUOTECUSTMNR"}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_CUSTOMERNR"}] [{$user->oxuser__oxcustnr->value}]
-
[{$shop->oxshops__oxcity->value}], [{$order->oxorder__oxbilldate->value|date_format:"%d.%m.%Y"}]
+
[{$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}]
From c5ef48d2fccf8e21c4661833a160211773061cce Mon Sep 17 00:00:00 2001 From: MaxBUhe Date: Mon, 8 Jun 2020 08:45:47 +0200 Subject: [PATCH 4/5] added margin-bottom class --- .../views/tpl/documents/invoice/includingFiles/pdfHeader.tpl | 2 +- out/src/css/pdfStyling.css | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Application/views/tpl/documents/invoice/includingFiles/pdfHeader.tpl b/Application/views/tpl/documents/invoice/includingFiles/pdfHeader.tpl index 88de701..0b34150 100644 --- a/Application/views/tpl/documents/invoice/includingFiles/pdfHeader.tpl +++ b/Application/views/tpl/documents/invoice/includingFiles/pdfHeader.tpl @@ -1,5 +1,5 @@ [{block name="pdfHeading"}] - +
[{block name="heading_owner_information"}] - [{/block}]
diff --git a/out/src/css/pdfStyling.css b/out/src/css/pdfStyling.css index aa36b1b..334554e 100644 --- a/out/src/css/pdfStyling.css +++ b/out/src/css/pdfStyling.css @@ -67,6 +67,9 @@ table{ width: 100%; margin-top: 8mm; } +.marginBottom15{ + margin-bottom: 15px; +} .pdf_heading_width35{ width: 35%; } From 0fedcf4d9fb8295b0b1e94fc31f349342b3ece13 Mon Sep 17 00:00:00 2001 From: MaxBUhe Date: Mon, 8 Jun 2020 10:30:35 +0200 Subject: [PATCH 5/5] reordering header --- .../deliverynote/includingFiles/pdfHeader.tpl | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Application/views/tpl/documents/deliverynote/includingFiles/pdfHeader.tpl b/Application/views/tpl/documents/deliverynote/includingFiles/pdfHeader.tpl index 8344fb7..86b0c87 100644 --- a/Application/views/tpl/documents/deliverynote/includingFiles/pdfHeader.tpl +++ b/Application/views/tpl/documents/deliverynote/includingFiles/pdfHeader.tpl @@ -34,12 +34,9 @@
[{$shop->oxshops__oxcountry->value}]
[{$shop->oxshops__oxdeladdinfo->value}]
[{/if}] - [{*Bestellnummer,Rechnungsvermerk, 'Ihre bestellung vom...'*}] -
[{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="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"}]
@@ -49,4 +46,16 @@
+ + + + + + + +
+
[{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"}]
+
[{/block}] \ No newline at end of file