use shared templates and template alias names

2020-05-28 14:58:42 +02:00 · 2020-05-28 14:58:42 +02:00 · 85c8d76da3
parent 8437314019
commit 85c8d76da3
8 changed files with 32 additions and 60 deletions
--- a/Application/views/tpl/deliverynote/deliverynote.tpl
+++ b/Application/views/tpl/deliverynote/deliverynote.tpl
@ -2,31 +2,31 @@
 [{assign var= deliveryPrice value= $order->getOrderDeliveryPrice()}]

 <style type="text/css">
-	[{include file=$oViewConf->getModulePath('pdfDocuments', 'out/src/css/deliverynote.css')}],
-	[{include file=$oViewConf->getModulePath('pdfDocuments', 'out/src/css/pdfStyling.css')}]
+	[{include file="d3delnote_pdf_style.css"}],
+	[{include file="d3pdfstyle.css"}]
 </style>

 <page backtop="30mm" backbottom="30mm" backleft="10mm" backright="10mm" pageset="new">
 	<page_header>
        [{block name="pdfTopingFile"}]
-		    [{include file=$oViewConf->getModulePath('pdfDocuments', 'Application/views/tpl/deliverynote/includingFiles/pdfToping.tpl')}]
+		    [{include file="d3pdfheader.tpl"}]
        [{/block}]
 	</page_header>
 	<page_footer>
        [{block name="pdfFooterFile"}]
-            [{include file=$oViewConf->getModulePath('pdfDocuments', 'Application/views/tpl/deliverynote/includingFiles/pdfFooter.tpl')}]
+            [{include file="d3pdffooter.tpl"}]
        [{/block}]
 	</page_footer>

 	[{* +++++ 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"}]
-        <table class="order_article_marginTop10 border-bottom" cellspacing="0">
+        <table class="order_article_marginTop10 border-bottom">
            <tr>
                <td class="border-bottom order_article_PaddingBottom5 "><div class="vertical-a order_article_listing_fontSize deliverynote_width_amount">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_AMOUNT"}]</div></td>
 								<td class="border-bottom order_article_PaddingBottom5 paddingLeft"><div class="order_article_listing_fontSize deliverynote_width_artnum">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}]</div></td>
@ -86,7 +86,7 @@
 		</table>*}]
 	[{/block}]
 	[{block name="pdfPastThankFile"}]
-		[{include file=$oViewConf->getModulePath('pdfDocuments', 'Application/views/tpl/deliveryNote/includingFiles/pdfPastThank.tpl')}]
+        [{include file="d3delnote_pdf_conclusion.tpl"}]
 	[{/block}]
 	</nobreak>
 </page>
--- a/Application/views/tpl/deliverynote/includingFiles/pdfToping.tpl
+++ b/Application/views/tpl/deliverynote/includingFiles/pdfToping.tpl
@ -1,5 +0,0 @@
-[{block name="pdfToping"}]
-    <div class="pdf_header_positioning">
-        <img src="[{$oViewConf->getImageUrl('Elektroversand-Schmidt_Logo_180.jpg')}]">
-    </div>
-[{/block}]
--- a/Application/views/tpl/deliverynote/includingFiles/pdfFooter.tpl
+++ b/Application/views/tpl/deliverynote/includingFiles/pdfFooter.tpl
@ -1,5 +1,5 @@
 [{block name="pdfFooter"}]
-<table class="pdf_footer_table" cellspacing="0">
+<table class="pdf_footer_table">
    <tr>
        [{block name="shop_basic_information"}]
        <td class="footer_parts">
--- a/Application/views/tpl/inc/header.tpl
+++ b/Application/views/tpl/inc/header.tpl
@ -0,0 +1,5 @@
+[{block name="pdfToping"}]
+    <div class="pdf_header_positioning">
+        <img alt="" src="[{$oViewConf->getImageUrl('Elektroversand-Schmidt_Logo_180.jpg')}]">
+    </div>
+[{/block}]
--- a/Application/views/tpl/invoice/includingFiles/pdfFooter.tpl
+++ b/Application/views/tpl/invoice/includingFiles/pdfFooter.tpl
@ -1,32 +0,0 @@
-[{block name="pdfFooter"}]
-<table class="pdf_footer_table" cellspacing="0">
-    <tr>
-        [{block name="shop_basic_information"}]
-        <td class="footer_parts">
-            <div>[{*$shop->oxshops__oxname->value*}][{$pdfdocumentsCSS}]</div>
-            <div>[{$shop->oxshops__oxstreet->value}]</div>
-            <div>[{$shop->oxshops__oxzip->value}] [{$shop->oxshops__oxcity->value}]</div>
-            <div>[{$shop->oxshops__oxcountry->value}]</div>
-            <div>[{$shop->oxshops__oxurl->value}]</div>
-            <div>[{$shop->oxshops__oxinfoemail->value}]</div>
-        </td>
-        [{/block}]
-        [{block name="owner_basic_information"}]
-        <td class="vertical-a footer_parts">
-            <div>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_MANAGINGDIRECTOR"}][{$shop->oxshops__oxfname->value}] [{$shop->oxshops__oxlname->value}]</div>
-            <div>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_COURT"}] [{$shop->oxshops__oxcourt->value}]</div>
-            <div>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_HRBNR"}][{$shop->oxshops__oxhrbnr->value}]</div>
-            <div>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTID"}][{$shop->oxshops__oxvatnumber->value}]</div>
-        </td>
-        [{/block}]
-        [{block name="bank_basic_information"}]
-        <td class="vertical-a footer_parts">
-            <div>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_BANKVERBINDUNG"}]</div>
-            <div>[{$shop->oxshops__oxbankname->value}]</div>
-            <div>[{oxmultilang ident="ORDER_OVERVIEW_PDF_ACCOUNTNR"}][{$shop->oxshops__oxibannumber->value}]</div>
-            <div>[{oxmultilang ident="ORDER_OVERVIEW_PDF_BANKCODE"}][{$shop->oxshops__oxbiccode->value}]</div>
-        </td>
-        [{/block}]
-    </tr>
-</table>
-[{/block}]
--- a/Application/views/tpl/invoice/includingFiles/pdfTopping.tpl
+++ b/Application/views/tpl/invoice/includingFiles/pdfTopping.tpl
@ -1,5 +0,0 @@
-[{block name="pdfToping"}]
-    <div class="pdf_header_positioning">
-        <img src="[{$oViewConf->getImageUrl('Elektroversand-Schmidt_Logo_180.jpg')}]">
-    </div>
-[{/block}]
--- 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)}]

-
 <style type="text/css">
-[{include file=$oViewConf->getModulePath('pdfDocuments', 'out/src/css/pdfStyling.css')}]
+	[{include file="d3pdfstyle.css"}]
 </style>
+
 <page backtop="30mm" backbottom="30mm" backleft="10mm" backright="10mm" pageset="new">
 	<page_header>
        [{block name="pdfTopingFile"}]
-            [{include file=$oViewConf->getModulePath('pdfDocuments', 'Application/views/tpl/invoice/includingFiles/pdfTopping.tpl')}]
+			[{include file="d3pdfheader.tpl"}]
        [{/block}]
 	</page_header>
 	<page_footer>
        [{block name="pdfFooterFile"}]
-            [{include file=$oViewConf->getModulePath('pdfDocuments', 'Application/views/tpl/invoice/includingFiles/pdfFooter.tpl')}]
+			[{include file="d3pdffooter.tpl"}]
        [{/block}]
 	</page_footer>

 	[{* +++++ 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"}]
-        <table class="order_article_marginTop10" cellspacing="0">
+        <table class="order_article_marginTop10">
            <tr>
                <td class="border-bottom order_article_PaddingBottom5 "><div class="vertical-a order_article_listing_fontSize order_article_listing_width_amount">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_AMOUNT"}]</div></td>
                <td class="border-bottom order_article_PaddingBottom5 "><div class="order_article_listing_fontSize order_article_listing_width_desc">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DESCRIPTION"}]</div></td>
@ -83,7 +83,7 @@
 		</table>
 	[{/block}]
 	[{block name="pdfPastThankFile"}]
-		[{include file=$oViewConf->getModulePath('pdfDocuments', 'Application/views/tpl/invoice/includingFiles/pdfPastThank.tpl')}]
+		[{include file="d3invoice_pdf_conclusion.tpl"}]
 	[{/block}]
 	</nobreak>
 </page>
--- 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'                => [