D3Public/pdfdokumente
8
0
Fork 0
Code Pull Requests Releases Activity

adjust Smarty templates

Browse Source
This commit is contained in:
Daniel Seifert 2024-09-10 09:15:51 +02:00
parent 0b4c634352
commit ec7d3f5622
8 changed files with 48 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
metadata.php
View File

@ -42,38 +42,38 @@ $aModule = [
'@' . Constants::OXID_MODULE_ID . '/admin/d3orderoverview_pdfform.tpl' => 'views/smarty/admin/orderoverview_pdfform.tpl', '@' . Constants::OXID_MODULE_ID . '/admin/d3orderoverview_pdfform.tpl' => 'views/smarty/admin/orderoverview_pdfform.tpl',
// Frontend - Flow - Deliverynote // Frontend - Flow - Deliverynote
'@' . Constants::OXID_MODULE_ID . '/documents/deliverynote/deliverynote.tpl' => 'views/smarty/flow/documents/deliverynote/deliverynote.tpl', '@' . Constants::OXID_MODULE_ID . '/documents/deliverynote/deliverynote.tpl' => 'views/smarty/documents/deliverynote/deliverynote.tpl',
'@' . Constants::OXID_MODULE_ID . '/documents/deliverynote/deliverynoteNoLogo.tpl' => 'views/smarty/flow/documents/deliverynote/deliverynoteNoLogo.tpl', '@' . Constants::OXID_MODULE_ID . '/documents/deliverynote/deliverynoteNoLogo.tpl' => 'views/smarty/documents/deliverynote/deliverynoteNoLogo.tpl',
'@' . Constants::OXID_MODULE_ID . '/documents/deliverynote/informations.tpl' => 'views/smarty/flow/documents/deliverynote/inc/informations.tpl', '@' . Constants::OXID_MODULE_ID . '/documents/deliverynote/informations.tpl' => 'views/smarty/documents/deliverynote/inc/informations.tpl',
'@' . Constants::OXID_MODULE_ID . '/documents/deliverynote/recipientAddress.tpl' => 'views/smarty/flow/documents/deliverynote/inc/recipientAddress.tpl', '@' . Constants::OXID_MODULE_ID . '/documents/deliverynote/recipientAddress.tpl' => 'views/smarty/documents/deliverynote/inc/recipientAddress.tpl',
'@' . Constants::OXID_MODULE_ID . '/documents/deliverynote/salutation.tpl' => 'views/smarty/flow/documents/deliverynote/inc/salutation.tpl', '@' . Constants::OXID_MODULE_ID . '/documents/deliverynote/salutation.tpl' => 'views/smarty/documents/deliverynote/inc/salutation.tpl',
'@' . Constants::OXID_MODULE_ID . '/documents/deliverynote/conclusion.tpl' => 'views/smarty/flow/documents/deliverynote/inc/conclusion.tpl', '@' . Constants::OXID_MODULE_ID . '/documents/deliverynote/conclusion.tpl' => 'views/smarty/documents/deliverynote/inc/conclusion.tpl',
// Frontend - Flow - Invoice // Frontend - Flow - Invoice
'@' . Constants::OXID_MODULE_ID . '/documents/invoice/invoice.tpl' => 'views/smarty/flow/documents/invoice/invoice.tpl', '@' . Constants::OXID_MODULE_ID . '/documents/invoice/invoice.tpl' => 'views/smarty/documents/invoice/invoice.tpl',
'@' . Constants::OXID_MODULE_ID . '/documents/invoice/invoiceNoLogo.tpl' => 'views/smarty/flow/documents/invoice/invoiceNoLogo.tpl', '@' . Constants::OXID_MODULE_ID . '/documents/invoice/invoiceNoLogo.tpl' => 'views/smarty/documents/invoice/invoiceNoLogo.tpl',
'@' . Constants::OXID_MODULE_ID . '/documents/invoice/informations.tpl' => 'views/smarty/flow/documents/invoice/inc/informations.tpl', '@' . Constants::OXID_MODULE_ID . '/documents/invoice/informations.tpl' => 'views/smarty/documents/invoice/inc/informations.tpl',
'@' . Constants::OXID_MODULE_ID . '/documents/invoice/salutation.tpl' => 'views/smarty/flow/documents/invoice/inc/salutation.tpl', '@' . Constants::OXID_MODULE_ID . '/documents/invoice/salutation.tpl' => 'views/smarty/documents/invoice/inc/salutation.tpl',
'@' . Constants::OXID_MODULE_ID . '/documents/invoice/conclusion.tpl' => 'views/smarty/flow/documents/invoice/inc/conclusion.tpl', '@' . Constants::OXID_MODULE_ID . '/documents/invoice/conclusion.tpl' => 'views/smarty/documents/invoice/inc/conclusion.tpl',
'@' . Constants::OXID_MODULE_ID . '/documents/invoice/payinfo.tpl' => 'views/smarty/flow/documents/invoice/inc/payinfo.tpl', '@' . Constants::OXID_MODULE_ID . '/documents/invoice/payinfo.tpl' => 'views/smarty/documents/invoice/inc/payinfo.tpl',
// Frontend - Flow - Inc - Page // Frontend - Flow - Inc - Page
'@' . Constants::OXID_MODULE_ID . '/documents/inc/page/base.tpl' => 'views/smarty/flow/documents/inc/page/base.tpl', '@' . Constants::OXID_MODULE_ID . '/documents/inc/page/base.tpl' => 'views/smarty/documents/inc/page/base.tpl',
'@' . Constants::OXID_MODULE_ID . '/documents/inc/page/header.tpl' => 'views/smarty/flow/documents/inc/page/header.tpl', '@' . Constants::OXID_MODULE_ID . '/documents/inc/page/header.tpl' => 'views/smarty/documents/inc/page/header.tpl',
'@' . Constants::OXID_MODULE_ID . '/documents/inc/page/footer.tpl' => 'views/smarty/flow/documents/inc/page/footer.tpl', '@' . Constants::OXID_MODULE_ID . '/documents/inc/page/footer.tpl' => 'views/smarty/documents/inc/page/footer.tpl',
'@' . Constants::OXID_MODULE_ID . '/documents/inc/page/returnaddress.tpl' => 'views/smarty/flow/documents/inc/page/returnaddress.tpl', '@' . Constants::OXID_MODULE_ID . '/documents/inc/page/returnaddress.tpl' => 'views/smarty/documents/inc/page/returnaddress.tpl',
// Frontend - Flow - Inc - Elements // Frontend - Flow - Inc - Elements
'@' . Constants::OXID_MODULE_ID . '/documents/inc/elements/addressarea.tpl' => 'views/smarty/flow/documents/inc/elements/addressarea.tpl', '@' . Constants::OXID_MODULE_ID . '/documents/inc/elements/addressarea.tpl' => 'views/smarty/documents/inc/elements/addressarea.tpl',
'@' . Constants::OXID_MODULE_ID . '/documents/inc/elements/recipientAddress.tpl' => 'views/smarty/flow/documents/inc/elements/recipientAddress.tpl', '@' . Constants::OXID_MODULE_ID . '/documents/inc/elements/recipientAddress.tpl' => 'views/smarty/documents/inc/elements/recipientAddress.tpl',
'@' . Constants::OXID_MODULE_ID . '/documents/inc/elements/informations.tpl' => 'views/smarty/flow/documents/inc/elements/informations.tpl', '@' . Constants::OXID_MODULE_ID . '/documents/inc/elements/informations.tpl' => 'views/smarty/documents/inc/elements/informations.tpl',
'@' . Constants::OXID_MODULE_ID . '/documents/inc/elements/deliveryaddress.tpl' => 'views/smarty/flow/documents/inc/elements/deliveryaddress.tpl', '@' . Constants::OXID_MODULE_ID . '/documents/inc/elements/deliveryaddress.tpl' => 'views/smarty/documents/inc/elements/deliveryaddress.tpl',
'@' . Constants::OXID_MODULE_ID . '/documents/inc/elements/articlelist.tpl' => 'views/smarty/flow/documents/inc/elements/articlelist.tpl', '@' . Constants::OXID_MODULE_ID . '/documents/inc/elements/articlelist.tpl' => 'views/smarty/documents/inc/elements/articlelist.tpl',
'@' . Constants::OXID_MODULE_ID . '/documents/inc/elements/articlecostssummary.tpl' => 'views/smarty/flow/documents/inc/elements/articlecostssummary.tpl', '@' . Constants::OXID_MODULE_ID . '/documents/inc/elements/articlecostssummary.tpl' => 'views/smarty/documents/inc/elements/articlecostssummary.tpl',
'@' . Constants::OXID_MODULE_ID . '/documents/inc/elements/foldmarks.tpl' => 'views/smarty/flow/documents/inc/elements/foldmarks.tpl', '@' . Constants::OXID_MODULE_ID . '/documents/inc/elements/foldmarks.tpl' => 'views/smarty/documents/inc/elements/foldmarks.tpl',
// Frontend - Flow - Inc - Helper // Frontend - Flow - Inc - Helper
'@' . Constants::OXID_MODULE_ID . '/documents/inc/helper/rulers.tpl' => 'views/smarty/flow/documents/inc/helper/rulers.tpl', '@' . Constants::OXID_MODULE_ID . '/documents/inc/helper/rulers.tpl' => 'views/smarty/documents/inc/helper/rulers.tpl',
// Frontend - Flow - Inc - Styles // Frontend - Flow - Inc - Styles
'@' . Constants::OXID_MODULE_ID . '/assets/d3pdfstyles.css.tpl' => 'views/smarty/assets/pdfStyling.css.tpl', '@' . Constants::OXID_MODULE_ID . '/assets/d3pdfstyles.css.tpl' => 'views/smarty/assets/pdfStyling.css.tpl',
@ -92,12 +92,6 @@ $aModule = [
'name' => Constants::OXID_MODULE_ID.'bDev', 'name' => Constants::OXID_MODULE_ID.'bDev',
'type' => 'bool', 'type' => 'bool',
'value' => false 'value' => false
],
[
'group' => Constants::OXID_MODULE_ID.'main',
'name' => Constants::OXID_MODULE_ID.'_sAlternativePdfLogoName',
'type' => 'str',
'value' => ''
] ]
] ]
]; ];

16
views/smarty/documents/deliverynote/deliverynote.tpl
View File

@ -9,27 +9,27 @@
[{capture append="pdfBlock_header"}] [{capture append="pdfBlock_header"}]
[{block name="pdfHeader"}] [{block name="pdfHeader"}]
[{include file="@d3PdfDocuments/documents/inc/page/header" showLogo=$showLogo}] [{include file="@d3PdfDocuments/documents/inc/page/header.tpl" showLogo=$showLogo}]
[{/block}] [{/block}]
[{/capture}] [{/capture}]
[{capture append="pdfBlock_content"}] [{capture append="pdfBlock_content"}]
[{include file="@d3PdfDocuments/documents/inc/elements/foldmarks" pagePadding=$pagePadding}] [{include file="@d3PdfDocuments/documents/inc/elements/foldmarks.tpl" pagePadding=$pagePadding}]
[{block name="pdfAddressArea"}] [{block name="pdfAddressArea"}]
[{include file="@d3PdfDocuments/documents/inc/elements/addressarea" addressfile="@d3PdfDocuments/documents/deliverynote/recipientAddress"}] [{include file="@d3PdfDocuments/documents/inc/elements/addressarea.tpl" addressfile="@d3PdfDocuments/documents/deliverynote/recipientAddress.tpl"}]
[{/block}] [{/block}]
[{block name="pdfInformations"}] [{block name="pdfInformations"}]
[{include file="@d3PdfDocuments/documents/inc/elements/informations" documentinformationfile="@d3PdfDocuments/documents/deliverynote/informations"}] [{include file="@d3PdfDocuments/documents/inc/elements/informations.tpl" documentinformationfile="@d3PdfDocuments/documents/deliverynote/informations.tpl"}]
[{/block}] [{/block}]
[{block name="pdfSalutation"}] [{block name="pdfSalutation"}]
[{include file="@d3PdfDocuments/documents/deliverynote/salutation"}] [{include file="@d3PdfDocuments/documents/deliverynote/salutation.tpl"}]
[{/block}] [{/block}]
[{block name="pdfArticleList"}] [{block name="pdfArticleList"}]
[{include file="@d3PdfDocuments/documents/inc/elements/articlelist" showPrices=false}] [{include file="@d3PdfDocuments/documents/inc/elements/articlelist.tpl" showPrices=false}]
[{/block}] [{/block}]
[{block name="pdfConclusion"}] [{block name="pdfConclusion"}]
@ -39,8 +39,8 @@
[{capture append="pdfBlock_footer"}] [{capture append="pdfBlock_footer"}]
[{block name="pdfFooter"}] [{block name="pdfFooter"}]
[{include file="@d3PdfDocuments/documents/inc/page/footer" pagePadding=$pagePadding}] [{include file="@d3PdfDocuments/documents/inc/page/footer.tpl" pagePadding=$pagePadding}]
[{/block}] [{/block}]
[{/capture}] [{/capture}]
[{include file="@d3PdfDocuments/documents/inc/page/base" pagePadding=$pagePadding}] [{include file="@d3PdfDocuments/documents/inc/page/base.tpl" pagePadding=$pagePadding}]

2
views/smarty/documents/deliverynote/deliverynoteNoLogo.tpl
View File

@ -1 +1 @@
[{include file="@d3PdfDocuments/documents/deliverynote/deliverynote" showLogo=false}] [{include file="@d3PdfDocuments/documents/deliverynote/deliverynote.tpl" showLogo=false}]

4
views/smarty/documents/inc/elements/addressarea.tpl
View File

@ -1,5 +1,5 @@
[{assign var="backaddressfile" value=$backaddressfile|default:"@d3PdfDocuments/documents/inc/page/returnaddress"}] [{assign var="backaddressfile" value=$backaddressfile|default:"@d3PdfDocuments/documents/inc/page/returnaddress.tpl"}]
[{assign var="addressfile" value=$addressfile|default:"@d3PdfDocuments/documents/inc/elements/recipientAddress"}] [{assign var="addressfile" value=$addressfile|default:"@d3PdfDocuments/documents/inc/elements/recipientAddress.tpl"}]
<div class="addressarea"> <div class="addressarea">
<div class="returnAddress"> <div class="returnAddress">

2
views/smarty/documents/inc/elements/articlelist.tpl
View File

@ -54,7 +54,7 @@
<nobreak> <nobreak>
<table class="article_costs_table"> <table class="article_costs_table">
[{block name="d3_article_costs_summary"}] [{block name="d3_article_costs_summary"}]
[{include file="@d3PdfDocuments/documents/inc/elements/articlecostssummary"}] [{include file="@d3PdfDocuments/documents/inc/elements/articlecostssummary.tpl"}]
[{/block}] [{/block}]
</table> </table>
</nobreak> </nobreak>

2
views/smarty/documents/invoice/inc/conclusion.tpl
View File

@ -5,7 +5,7 @@
[{oxmultilang ident="D3_PDFDOCUMENTS_USED_PAYMENTMETHOD" suffix="COLON"}] [{oxmultilang ident="D3_PDFDOCUMENTS_USED_PAYMENTMETHOD" suffix="COLON"}]
[{$payment->getFieldData('oxdesc')}]<br> [{$payment->getFieldData('oxdesc')}]<br>
[{include file="@d3PdfDocuments/documents/invoice/payinfo"}] [{include file="@d3PdfDocuments/documents/invoice/payinfo.tpl"}]
</div> </div>
[{/block}] [{/block}]

20
views/smarty/documents/invoice/invoice.tpl
View File

@ -9,43 +9,43 @@
[{capture append="pdfBlock_header"}] [{capture append="pdfBlock_header"}]
[{block name="pdfHeader"}] [{block name="pdfHeader"}]
[{include file="@d3PdfDocuments/documents/inc/page/header" showLogo=$showLogo}] [{include file="@d3PdfDocuments/documents/inc/page/header.tpl" showLogo=$showLogo}]
[{/block}] [{/block}]
[{/capture}] [{/capture}]
[{capture append="pdfBlock_content"}] [{capture append="pdfBlock_content"}]
[{* include file="@d3PdfDocuments/documents/inc/helper/rulers" pagePadding=$pagePadding *}] [{* include file="@d3PdfDocuments/documents/inc/helper/rulers" pagePadding=$pagePadding *}]
[{include file="@d3PdfDocuments/documents/inc/elements/foldmarks" pagePadding=$pagePadding}] [{include file="@d3PdfDocuments/documents/inc/elements/foldmarks.tpl" pagePadding=$pagePadding}]
[{block name="pdfAddressArea"}] [{block name="pdfAddressArea"}]
[{include file="@d3PdfDocuments/documents/inc/elements/addressarea"}] [{include file="@d3PdfDocuments/documents/inc/elements/addressarea.tpl"}]
[{/block}] [{/block}]
[{block name="pdfInformations"}] [{block name="pdfInformations"}]
[{include file="@d3PdfDocuments/documents/inc/elements/informations" documentinformationfile="@d3PdfDocuments/documents/invoice/informations"}] [{include file="@d3PdfDocuments/documents/inc/elements/informations.tpl" documentinformationfile="@d3PdfDocuments/documents/invoice/informations.tpl"}]
[{/block}] [{/block}]
[{block name="pdfDeliveryAddress"}] [{block name="pdfDeliveryAddress"}]
[{include file="@d3PdfDocuments/documents/inc/elements/deliveryaddress"}] [{include file="@d3PdfDocuments/documents/inc/elements/deliveryaddress.tpl"}]
[{/block}] [{/block}]
[{block name="pdfSalutation"}] [{block name="pdfSalutation"}]
[{include file="@d3PdfDocuments/documents/invoice/salutation"}] [{include file="@d3PdfDocuments/documents/invoice/salutation.tpl"}]
[{/block}] [{/block}]
[{block name="pdfArticleList"}] [{block name="pdfArticleList"}]
[{include file="@d3PdfDocuments/documents/inc/elements/articlelist"}] [{include file="@d3PdfDocuments/documents/inc/elements/articlelist.tpl"}]
[{/block}] [{/block}]
[{block name="pdfConclusion"}] [{block name="pdfConclusion"}]
[{include file="@d3PdfDocuments/documents/invoice/conclusion"}] [{include file="@d3PdfDocuments/documents/invoice/conclusion.tpl"}]
[{/block}] [{/block}]
[{/capture}] [{/capture}]
[{capture append="pdfBlock_footer"}] [{capture append="pdfBlock_footer"}]
[{block name="pdfFooter"}] [{block name="pdfFooter"}]
[{include file="@d3PdfDocuments/documents/inc/page/footer" pagePadding=$pagePadding}] [{include file="@d3PdfDocuments/documents/inc/page/footer.tpl" pagePadding=$pagePadding}]
[{/block}] [{/block}]
[{/capture}] [{/capture}]
[{include file="@d3PdfDocuments/documents/inc/page/base" pagePadding=$pagePadding}] [{include file="@d3PdfDocuments/documents/inc/page/base.tpl" pagePadding=$pagePadding}]

2
views/smarty/documents/invoice/invoiceNoLogo.tpl
View File

@ -1 +1 @@
[{include file="@d3PdfDocuments/documents/invoice/invoice" showLogo=false}] [{include file="@d3PdfDocuments/documents/invoice/invoice.tpl" showLogo=false}]