diff --git a/metadata.php b/metadata.php index 3aa8547..70d5f20 100644 --- a/metadata.php +++ b/metadata.php @@ -42,38 +42,38 @@ $aModule = [ '@' . Constants::OXID_MODULE_ID . '/admin/d3orderoverview_pdfform.tpl' => 'views/smarty/admin/orderoverview_pdfform.tpl', // Frontend - Flow - Deliverynote - '@' . Constants::OXID_MODULE_ID . '/documents/deliverynote/deliverynote.tpl' => 'views/smarty/flow/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/informations.tpl' => 'views/smarty/flow/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/salutation.tpl' => 'views/smarty/flow/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/deliverynote.tpl' => 'views/smarty/documents/deliverynote/deliverynote.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/documents/deliverynote/inc/informations.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/documents/deliverynote/inc/salutation.tpl', + '@' . Constants::OXID_MODULE_ID . '/documents/deliverynote/conclusion.tpl' => 'views/smarty/documents/deliverynote/inc/conclusion.tpl', // Frontend - Flow - Invoice - '@' . Constants::OXID_MODULE_ID . '/documents/invoice/invoice.tpl' => 'views/smarty/flow/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/informations.tpl' => 'views/smarty/flow/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/conclusion.tpl' => 'views/smarty/flow/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/invoice.tpl' => 'views/smarty/documents/invoice/invoice.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/documents/invoice/inc/informations.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/documents/invoice/inc/conclusion.tpl', + '@' . Constants::OXID_MODULE_ID . '/documents/invoice/payinfo.tpl' => 'views/smarty/documents/invoice/inc/payinfo.tpl', // 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/header.tpl' => 'views/smarty/flow/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/returnaddress.tpl' => 'views/smarty/flow/documents/inc/page/returnaddress.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/documents/inc/page/header.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/documents/inc/page/returnaddress.tpl', // 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/recipientAddress.tpl' => 'views/smarty/flow/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/deliveryaddress.tpl' => 'views/smarty/flow/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/articlecostssummary.tpl' => 'views/smarty/flow/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/addressarea.tpl' => 'views/smarty/documents/inc/elements/addressarea.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/documents/inc/elements/informations.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/documents/inc/elements/articlelist.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/documents/inc/elements/foldmarks.tpl', // 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 '@' . 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', 'type' => 'bool', 'value' => false - ], - [ - 'group' => Constants::OXID_MODULE_ID.'main', - 'name' => Constants::OXID_MODULE_ID.'_sAlternativePdfLogoName', - 'type' => 'str', - 'value' => '' ] ] ]; diff --git a/views/smarty/documents/deliverynote/deliverynote.tpl b/views/smarty/documents/deliverynote/deliverynote.tpl index 8bd8d6e..de5a96f 100644 --- a/views/smarty/documents/deliverynote/deliverynote.tpl +++ b/views/smarty/documents/deliverynote/deliverynote.tpl @@ -9,27 +9,27 @@ [{capture append="pdfBlock_header"}] [{block name="pdfHeader"}] - [{include file="@d3PdfDocuments/documents/inc/page/header" showLogo=$showLogo}] + [{include file="@d3PdfDocuments/documents/inc/page/header.tpl" showLogo=$showLogo}] [{/block}] [{/capture}] [{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"}] - [{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 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 name="pdfSalutation"}] - [{include file="@d3PdfDocuments/documents/deliverynote/salutation"}] + [{include file="@d3PdfDocuments/documents/deliverynote/salutation.tpl"}] [{/block}] [{block name="pdfArticleList"}] - [{include file="@d3PdfDocuments/documents/inc/elements/articlelist" showPrices=false}] + [{include file="@d3PdfDocuments/documents/inc/elements/articlelist.tpl" showPrices=false}] [{/block}] [{block name="pdfConclusion"}] @@ -39,8 +39,8 @@ [{capture append="pdfBlock_footer"}] [{block name="pdfFooter"}] - [{include file="@d3PdfDocuments/documents/inc/page/footer" pagePadding=$pagePadding}] + [{include file="@d3PdfDocuments/documents/inc/page/footer.tpl" pagePadding=$pagePadding}] [{/block}] [{/capture}] -[{include file="@d3PdfDocuments/documents/inc/page/base" pagePadding=$pagePadding}] \ No newline at end of file +[{include file="@d3PdfDocuments/documents/inc/page/base.tpl" pagePadding=$pagePadding}] \ No newline at end of file diff --git a/views/smarty/documents/deliverynote/deliverynoteNoLogo.tpl b/views/smarty/documents/deliverynote/deliverynoteNoLogo.tpl index 5daca64..c68baeb 100644 --- a/views/smarty/documents/deliverynote/deliverynoteNoLogo.tpl +++ b/views/smarty/documents/deliverynote/deliverynoteNoLogo.tpl @@ -1 +1 @@ -[{include file="@d3PdfDocuments/documents/deliverynote/deliverynote" showLogo=false}] \ No newline at end of file +[{include file="@d3PdfDocuments/documents/deliverynote/deliverynote.tpl" showLogo=false}] \ No newline at end of file diff --git a/views/smarty/documents/inc/elements/addressarea.tpl b/views/smarty/documents/inc/elements/addressarea.tpl index 7d69c83..167099c 100644 --- a/views/smarty/documents/inc/elements/addressarea.tpl +++ b/views/smarty/documents/inc/elements/addressarea.tpl @@ -1,5 +1,5 @@ -[{assign var="backaddressfile" value=$backaddressfile|default:"@d3PdfDocuments/documents/inc/page/returnaddress"}] -[{assign var="addressfile" value=$addressfile|default:"@d3PdfDocuments/documents/inc/elements/recipientAddress"}] +[{assign var="backaddressfile" value=$backaddressfile|default:"@d3PdfDocuments/documents/inc/page/returnaddress.tpl"}] +[{assign var="addressfile" value=$addressfile|default:"@d3PdfDocuments/documents/inc/elements/recipientAddress.tpl"}]
diff --git a/views/smarty/documents/inc/elements/articlelist.tpl b/views/smarty/documents/inc/elements/articlelist.tpl index 01547dd..897edf8 100644 --- a/views/smarty/documents/inc/elements/articlelist.tpl +++ b/views/smarty/documents/inc/elements/articlelist.tpl @@ -54,7 +54,7 @@ [{block name="d3_article_costs_summary"}] - [{include file="@d3PdfDocuments/documents/inc/elements/articlecostssummary"}] + [{include file="@d3PdfDocuments/documents/inc/elements/articlecostssummary.tpl"}] [{/block}]
diff --git a/views/smarty/documents/invoice/inc/conclusion.tpl b/views/smarty/documents/invoice/inc/conclusion.tpl index 69201e0..706d61d 100644 --- a/views/smarty/documents/invoice/inc/conclusion.tpl +++ b/views/smarty/documents/invoice/inc/conclusion.tpl @@ -5,7 +5,7 @@ [{oxmultilang ident="D3_PDFDOCUMENTS_USED_PAYMENTMETHOD" suffix="COLON"}] [{$payment->getFieldData('oxdesc')}]
- [{include file="@d3PdfDocuments/documents/invoice/payinfo"}] + [{include file="@d3PdfDocuments/documents/invoice/payinfo.tpl"}]
[{/block}] diff --git a/views/smarty/documents/invoice/invoice.tpl b/views/smarty/documents/invoice/invoice.tpl index f4034c8..018b30e 100644 --- a/views/smarty/documents/invoice/invoice.tpl +++ b/views/smarty/documents/invoice/invoice.tpl @@ -9,43 +9,43 @@ [{capture append="pdfBlock_header"}] [{block name="pdfHeader"}] - [{include file="@d3PdfDocuments/documents/inc/page/header" showLogo=$showLogo}] + [{include file="@d3PdfDocuments/documents/inc/page/header.tpl" showLogo=$showLogo}] [{/block}] [{/capture}] [{capture append="pdfBlock_content"}] [{* 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"}] - [{include file="@d3PdfDocuments/documents/inc/elements/addressarea"}] + [{include file="@d3PdfDocuments/documents/inc/elements/addressarea.tpl"}] [{/block}] [{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 name="pdfDeliveryAddress"}] - [{include file="@d3PdfDocuments/documents/inc/elements/deliveryaddress"}] + [{include file="@d3PdfDocuments/documents/inc/elements/deliveryaddress.tpl"}] [{/block}] [{block name="pdfSalutation"}] - [{include file="@d3PdfDocuments/documents/invoice/salutation"}] + [{include file="@d3PdfDocuments/documents/invoice/salutation.tpl"}] [{/block}] [{block name="pdfArticleList"}] - [{include file="@d3PdfDocuments/documents/inc/elements/articlelist"}] + [{include file="@d3PdfDocuments/documents/inc/elements/articlelist.tpl"}] [{/block}] [{block name="pdfConclusion"}] - [{include file="@d3PdfDocuments/documents/invoice/conclusion"}] + [{include file="@d3PdfDocuments/documents/invoice/conclusion.tpl"}] [{/block}] [{/capture}] [{capture append="pdfBlock_footer"}] [{block name="pdfFooter"}] - [{include file="@d3PdfDocuments/documents/inc/page/footer" pagePadding=$pagePadding}] + [{include file="@d3PdfDocuments/documents/inc/page/footer.tpl" pagePadding=$pagePadding}] [{/block}] [{/capture}] -[{include file="@d3PdfDocuments/documents/inc/page/base" pagePadding=$pagePadding}] +[{include file="@d3PdfDocuments/documents/inc/page/base.tpl" pagePadding=$pagePadding}] diff --git a/views/smarty/documents/invoice/invoiceNoLogo.tpl b/views/smarty/documents/invoice/invoiceNoLogo.tpl index f093401..0772c97 100644 --- a/views/smarty/documents/invoice/invoiceNoLogo.tpl +++ b/views/smarty/documents/invoice/invoiceNoLogo.tpl @@ -1 +1 @@ -[{include file="@d3PdfDocuments/documents/invoice/invoice" showLogo=false}] \ No newline at end of file +[{include file="@d3PdfDocuments/documents/invoice/invoice.tpl" showLogo=false}] \ No newline at end of file