From 85c8d76da3a683b26e6afce36a54a21455879ac2 Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Thu, 28 May 2020 14:58:42 +0200 Subject: [PATCH] use shared templates and template alias names --- .../views/tpl/deliverynote/deliverynote.tpl | 14 ++++---- .../deliverynote/includingFiles/pdfToping.tpl | 5 --- .../pdfFooter.tpl => inc/footer.tpl} | 2 +- Application/views/tpl/inc/header.tpl | 5 +++ .../tpl/invoice/includingFiles/pdfFooter.tpl | 32 ------------------- .../tpl/invoice/includingFiles/pdfTopping.tpl | 5 --- Application/views/tpl/invoice/invoice.tpl | 14 ++++---- metadata.php | 15 +++++++-- 8 files changed, 32 insertions(+), 60 deletions(-) delete mode 100644 Application/views/tpl/deliverynote/includingFiles/pdfToping.tpl rename Application/views/tpl/{deliverynote/includingFiles/pdfFooter.tpl => inc/footer.tpl} (96%) create mode 100644 Application/views/tpl/inc/header.tpl delete mode 100644 Application/views/tpl/invoice/includingFiles/pdfFooter.tpl delete mode 100644 Application/views/tpl/invoice/includingFiles/pdfTopping.tpl diff --git a/Application/views/tpl/deliverynote/deliverynote.tpl b/Application/views/tpl/deliverynote/deliverynote.tpl index db4cc9c..b243720 100644 --- a/Application/views/tpl/deliverynote/deliverynote.tpl +++ b/Application/views/tpl/deliverynote/deliverynote.tpl @@ -2,31 +2,31 @@ [{assign var= deliveryPrice value= $order->getOrderDeliveryPrice()}] [{block name="pdfTopingFile"}] - [{include file=$oViewConf->getModulePath('pdfDocuments', 'Application/views/tpl/deliverynote/includingFiles/pdfToping.tpl')}] + [{include file="d3pdfheader.tpl"}] [{/block}] [{block name="pdfFooterFile"}] - [{include file=$oViewConf->getModulePath('pdfDocuments', 'Application/views/tpl/deliverynote/includingFiles/pdfFooter.tpl')}] + [{include file="d3pdffooter.tpl"}] [{/block}] [{* +++++ main page part +++++ *}] [{block name="pdfHeadingFile"}] [{block name="pdfHeaderFile"}] - [{include file=$oViewConf->getModulePath('pdfDocuments', 'Application/views/tpl/deliverynote/includingFiles/pdfHeader.tpl')}] + [{include file="d3delnote_pdf_addressarea.tpl"}] [{/block}] [{/block}] [{* +++++Artikeltabelle+++++*}] [{block name="articleListing"}] - +
@@ -86,7 +86,7 @@
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_AMOUNT"}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}]
*}] [{/block}] [{block name="pdfPastThankFile"}] - [{include file=$oViewConf->getModulePath('pdfDocuments', 'Application/views/tpl/deliveryNote/includingFiles/pdfPastThank.tpl')}] + [{include file="d3delnote_pdf_conclusion.tpl"}] [{/block}] \ No newline at end of file diff --git a/Application/views/tpl/deliverynote/includingFiles/pdfToping.tpl b/Application/views/tpl/deliverynote/includingFiles/pdfToping.tpl deleted file mode 100644 index 77a8ed7..0000000 --- a/Application/views/tpl/deliverynote/includingFiles/pdfToping.tpl +++ /dev/null @@ -1,5 +0,0 @@ -[{block name="pdfToping"}] -
- -
-[{/block}] \ No newline at end of file diff --git a/Application/views/tpl/deliverynote/includingFiles/pdfFooter.tpl b/Application/views/tpl/inc/footer.tpl similarity index 96% rename from Application/views/tpl/deliverynote/includingFiles/pdfFooter.tpl rename to Application/views/tpl/inc/footer.tpl index d625e44..0e58a9c 100644 --- a/Application/views/tpl/deliverynote/includingFiles/pdfFooter.tpl +++ b/Application/views/tpl/inc/footer.tpl @@ -1,5 +1,5 @@ [{block name="pdfFooter"}] - +
[{block name="shop_basic_information"}]
diff --git a/Application/views/tpl/inc/header.tpl b/Application/views/tpl/inc/header.tpl new file mode 100644 index 0000000..d5a29f2 --- /dev/null +++ b/Application/views/tpl/inc/header.tpl @@ -0,0 +1,5 @@ +[{block name="pdfToping"}] +
+ +
+[{/block}] \ No newline at end of file diff --git a/Application/views/tpl/invoice/includingFiles/pdfFooter.tpl b/Application/views/tpl/invoice/includingFiles/pdfFooter.tpl deleted file mode 100644 index 2600cc7..0000000 --- a/Application/views/tpl/invoice/includingFiles/pdfFooter.tpl +++ /dev/null @@ -1,32 +0,0 @@ -[{block name="pdfFooter"}] - - - [{block name="shop_basic_information"}] - - [{/block}] - [{block name="owner_basic_information"}] - - [{/block}] - [{block name="bank_basic_information"}] - - [{/block}] - -
-
[{*$shop->oxshops__oxname->value*}][{$pdfdocumentsCSS}]
-
[{$shop->oxshops__oxstreet->value}]
-
[{$shop->oxshops__oxzip->value}] [{$shop->oxshops__oxcity->value}]
-
[{$shop->oxshops__oxcountry->value}]
-
[{$shop->oxshops__oxurl->value}]
-
[{$shop->oxshops__oxinfoemail->value}]
- 		-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_MANAGINGDIRECTOR"}][{$shop->oxshops__oxfname->value}] [{$shop->oxshops__oxlname->value}]
-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_COURT"}] [{$shop->oxshops__oxcourt->value}]
-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_HRBNR"}][{$shop->oxshops__oxhrbnr->value}]
-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTID"}][{$shop->oxshops__oxvatnumber->value}]
- 		-
[{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"}][{$shop->oxshops__oxbiccode->value}]
-
-[{/block}] \ No newline at end of file diff --git a/Application/views/tpl/invoice/includingFiles/pdfTopping.tpl b/Application/views/tpl/invoice/includingFiles/pdfTopping.tpl deleted file mode 100644 index 77a8ed7..0000000 --- a/Application/views/tpl/invoice/includingFiles/pdfTopping.tpl +++ /dev/null @@ -1,5 +0,0 @@ -[{block name="pdfToping"}] -
- -
-[{/block}] \ No newline at end of file diff --git a/Application/views/tpl/invoice/invoice.tpl b/Application/views/tpl/invoice/invoice.tpl index bc51aa4..a22be15 100644 --- a/Application/views/tpl/invoice/invoice.tpl +++ b/Application/views/tpl/invoice/invoice.tpl @@ -2,31 +2,31 @@ [{assign var= deliveryPrice value= $order->getOrderDeliveryPrice()}] [{assign var= productVats value= $order->getProductVats(false)}] - + [{block name="pdfTopingFile"}] - [{include file=$oViewConf->getModulePath('pdfDocuments', 'Application/views/tpl/invoice/includingFiles/pdfTopping.tpl')}] + [{include file="d3pdfheader.tpl"}] [{/block}] [{block name="pdfFooterFile"}] - [{include file=$oViewConf->getModulePath('pdfDocuments', 'Application/views/tpl/invoice/includingFiles/pdfFooter.tpl')}] + [{include file="d3pdffooter.tpl"}] [{/block}] [{* +++++ main page part +++++ *}] [{block name="pdfHeadingFile"}] [{block name="pdfHeaderFile"}] - [{include file=$oViewConf->getModulePath('pdfDocuments', 'Application/views/tpl/invoice/includingFiles/pdfHeader.tpl')}] + [{include file="d3invoice_pdf_addressarea.tpl"}] [{/block}] [{/block}] [{* +++++Artikeltabelle+++++*}] [{block name="articleListing"}] - +
@@ -83,7 +83,7 @@
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_AMOUNT"}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DESCRIPTION"}]
[{/block}] [{block name="pdfPastThankFile"}] - [{include file=$oViewConf->getModulePath('pdfDocuments', 'Application/views/tpl/invoice/includingFiles/pdfPastThank.tpl')}] + [{include file="d3invoice_pdf_conclusion.tpl"}] [{/block}] \ No newline at end of file diff --git a/metadata.php b/metadata.php index 6842c9f..974ccab 100644 --- a/metadata.php +++ b/metadata.php @@ -49,9 +49,18 @@ $aModule = [ ], 'controllers' => [], 'templates' => [ - 'd3deliverynote_pdf.tpl' => 'd3/pdfdocuments/Application/views/tpl/deliverynote/deliverynote.tpl', - 'd3invoice_pdf.tpl' => 'd3/pdfdocuments/Application/views/tpl/invoice/invoice.tpl', - 'd3tplheader.tpl' => 'd3/pdfdocuments/Application/views/tpl/header.tpl' + 'd3deliverynote_pdf.tpl' => 'd3/pdfdocuments/Application/views/tpl/deliverynote/deliverynote.tpl', + 'd3delnote_pdf_addressarea.tpl' => 'd3/pdfdocuments/Application/views/tpl/deliverynote/includingFiles/pdfHeader.tpl', + 'd3delnote_pdf_conclusion.tpl' => 'd3/pdfdocuments/Application/views/tpl/deliverynote/includingFiles/pdfPastThank.tpl', + 'd3delnote_pdf_style.css' => 'd3/pdfdocuments/out/src/css/deliverynote.css', + + 'd3invoice_pdf.tpl' => 'd3/pdfdocuments/Application/views/tpl/invoice/invoice.tpl', + 'd3invoice_pdf_addressarea.tpl' => 'd3/pdfdocuments/Application/views/tpl/invoice/includingFiles/pdfHeader.tpl', + 'd3invoice_pdf_conclusion.tpl' => 'd3/pdfdocuments/Application/views/tpl/invoice/includingFiles/pdfPastThank.tpl', + + 'd3pdfheader.tpl' => 'd3/pdfdocuments/Application/views/tpl/inc/header.tpl', + 'd3pdffooter.tpl' => 'd3/pdfdocuments/Application/views/tpl/inc/footer.tpl', + 'd3pdfstyle.css' => 'd3/pdfdocuments/out/src/css/pdfStyling.css' ], 'events' => [], 'blocks' => [