From 5c0f3b1f77076ee1e80dcea673a52e822de68d67 Mon Sep 17 00:00:00 2001 From: MaxBuhe01 Date: Wed, 4 Sep 2024 21:53:57 +0200 Subject: [PATCH] [Changed] rename file alias adjust alias and metadata-entries for Twig && Smarty --- metadata.php | 40 +++++++++---------- .../documents/deliverynote/deliverynote.tpl | 18 ++++----- .../documents/inc/elements/addressarea.tpl | 4 +- .../documents/inc/elements/articlelist.tpl | 2 +- .../flow/documents/inc/helper/rulers.tpl | 2 +- .../flow/documents/invoice/inc/conclusion.tpl | 2 +- .../smarty/flow/documents/invoice/invoice.tpl | 22 +++++----- .../deliverynote/deliverynote.html.twig | 18 ++++----- .../inc/elements/addressarea.html.twig | 4 +- .../inc/elements/articlelist.html.twig | 2 +- .../documents/inc/helper/rulers.html.twig | 2 +- .../invoice/inc/conclusion.html.twig | 2 +- .../admin/documents/invoice/invoice.html.twig | 22 +++++----- .../admin_twig/order_overview.html.twig | 2 +- 14 files changed, 71 insertions(+), 71 deletions(-) diff --git a/metadata.php b/metadata.php index 126c2a0..169cac9 100644 --- a/metadata.php +++ b/metadata.php @@ -44,36 +44,36 @@ $aModule = [ // 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/delnote_informations.tpl' => 'views/smarty/flow/documents/deliverynote/inc/informations.tpl', - '@' . Constants::OXID_MODULE_ID . '/documents/deliverynote/delnote_recipient.tpl' => 'views/smarty/flow/documents/deliverynote/inc/recipientAddress.tpl', - '@' . Constants::OXID_MODULE_ID . '/documents/deliverynote/delnote_salutation.tpl' => 'views/smarty/flow/documents/deliverynote/inc/salutation.tpl', - '@' . Constants::OXID_MODULE_ID . '/documents/deliverynote/delnote_conclusion.tpl' => 'views/smarty/flow/documents/deliverynote/inc/conclusion.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', // 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/invoice_informations.tpl' => 'views/smarty/flow/documents/invoice/inc/informations.tpl', - '@' . Constants::OXID_MODULE_ID . '/documents/invoice/invoice_salutation.tpl' => 'views/smarty/flow/documents/invoice/inc/salutation.tpl', - '@' . Constants::OXID_MODULE_ID . '/documents/invoice/invoice_conclusion.tpl' => 'views/smarty/flow/documents/invoice/inc/conclusion.tpl', - '@' . Constants::OXID_MODULE_ID . '/documents/invoice/invoice_payinfo.tpl' => 'views/smarty/flow/documents/invoice/inc/payinfo.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', // Frontend - Flow - Inc - Page - '@' . Constants::OXID_MODULE_ID . '/documents/inc/page/d3pdfbase.tpl' => 'views/smarty/flow/documents/inc/page/base.tpl', - '@' . Constants::OXID_MODULE_ID . '/documents/inc/page/d3pdfheader.tpl' => 'views/smarty/flow/documents/inc/page/header.tpl', - '@' . Constants::OXID_MODULE_ID . '/documents/inc/page/d3pdffooter.tpl' => 'views/smarty/flow/documents/inc/page/footer.tpl', - '@' . Constants::OXID_MODULE_ID . '/documents/inc/page/d3pdfreturnaddress.tpl' => 'views/smarty/flow/documents/inc/page/returnaddress.tpl', + '@' . 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', // Frontend - Flow - Inc - Elements - '@' . Constants::OXID_MODULE_ID . '/documents/inc/elements/d3pdfaddressarea.tpl' => 'views/smarty/flow/documents/inc/elements/addressarea.tpl', - '@' . Constants::OXID_MODULE_ID . '/documents/inc/elements/d3pdfrecipientaddress.tpl' => 'views/smarty/flow/documents/inc/elements/recipientAddress.tpl', - '@' . Constants::OXID_MODULE_ID . '/documents/inc/elements/d3pdfinformations.tpl' => 'views/smarty/flow/documents/inc/elements/informations.tpl', - '@' . Constants::OXID_MODULE_ID . '/documents/inc/elements/d3pdfdeladdress.tpl' => 'views/smarty/flow/documents/inc/elements/deliveryaddress.tpl', - '@' . Constants::OXID_MODULE_ID . '/documents/inc/elements/d3pdfarticlelist.tpl' => 'views/smarty/flow/documents/inc/elements/articlelist.tpl', - '@' . Constants::OXID_MODULE_ID . '/documents/inc/elements/d3pdfarticlecostsummary.tpl' => 'views/smarty/flow/documents/inc/elements/articlecostssummary.tpl', - '@' . Constants::OXID_MODULE_ID . '/documents/inc/elements/d3pdffoldmarks.tpl' => 'views/smarty/flow/documents/inc/elements/foldmarks.tpl', + '@' . 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', // Frontend - Flow - Inc - Helper - '@' . Constants::OXID_MODULE_ID . '/documents/inc/helper/d3pdfrulers.tpl' => 'views/smarty/flow/documents/inc/helper/rulers.tpl', + '@' . Constants::OXID_MODULE_ID . '/documents/inc/helper/rulers.tpl' => 'views/smarty/flow/documents/inc/helper/rulers.tpl', // Frontend - Flow - Inc - Styles '@' . Constants::OXID_MODULE_ID . '/assets/d3pdfstyles.css' => 'assets/out/src/css/pdfStyling.css', diff --git a/views/smarty/flow/documents/deliverynote/deliverynote.tpl b/views/smarty/flow/documents/deliverynote/deliverynote.tpl index ecd1d53..76a1b21 100644 --- a/views/smarty/flow/documents/deliverynote/deliverynote.tpl +++ b/views/smarty/flow/documents/deliverynote/deliverynote.tpl @@ -9,38 +9,38 @@ [{capture append="pdfBlock_header"}] [{block name="pdfHeader"}] - [{include file="@d3PdfDocuments/documents/inc/page/d3pdfheader.tpl" showLogo=$showLogo}] + [{include file="@d3PdfDocuments/documents/inc/page/header" showLogo=$showLogo}] [{/block}] [{/capture}] [{capture append="pdfBlock_content"}] - [{include file="@d3PdfDocuments/documents/inc/elements/d3pdffoldmarks.tpl" pagePadding=$pagePadding}] + [{include file="@d3PdfDocuments/documents/inc/elements/foldmarks" pagePadding=$pagePadding}] [{block name="pdfAddressArea"}] - [{include file="@d3PdfDocuments/documents/inc/elements/d3pdfaddressarea.tpl" addressfile="@d3PdfDocuments/documents/deliverynote/delnote_recipient"}] + [{include file="@d3PdfDocuments/documents/inc/elements/addressarea" addressfile="@d3PdfDocuments/documents/deliverynote/recipientAddress"}] [{/block}] [{block name="pdfInformations"}] - [{include file="@d3PdfDocuments/documents/inc/elements/d3pdfinformations.tpl" documentinformationfile="@d3PdfDocuments/documents/deliverynote/delnote_informations"}] + [{include file="@d3PdfDocuments/documents/inc/elements/informations" documentinformationfile="@d3PdfDocuments/documents/deliverynote/informations"}] [{/block}] [{block name="pdfSalutation"}] - [{include file="@d3PdfDocuments/documents/deliverynote/delnote_salutation"}] + [{include file="@d3PdfDocuments/documents/deliverynote/salutation"}] [{/block}] [{block name="pdfArticleList"}] - [{include file="@d3PdfDocuments/documents/inc/elements/d3pdfarticlelist.tpl" showPrices=false}] + [{include file="@d3PdfDocuments/documents/inc/elements/articlelist" showPrices=false}] [{/block}] [{block name="pdfConclusion"}] - [{include file="@d3PdfDocuments/documents/deliverynote/delnote_conclusion.tpl"}] + [{include file="@d3PdfDocuments/documents/deliverynote/conclusion.tpl"}] [{/block}] [{/capture}] [{capture append="pdfBlock_footer"}] [{block name="pdfFooter"}] - [{include file="@d3PdfDocuments/documents/inc/page/d3pdffooter.tpl" pagePadding=$pagePadding}] + [{include file="@d3PdfDocuments/documents/inc/page/footer" pagePadding=$pagePadding}] [{/block}] [{/capture}] -[{include file="@d3PdfDocuments/documents/inc/page/d3pdfbase.tpl" pagePadding=$pagePadding}] \ No newline at end of file +[{include file="@d3PdfDocuments/documents/inc/page/base" pagePadding=$pagePadding}] \ No newline at end of file diff --git a/views/smarty/flow/documents/inc/elements/addressarea.tpl b/views/smarty/flow/documents/inc/elements/addressarea.tpl index 2f067a6..7d69c83 100644 --- a/views/smarty/flow/documents/inc/elements/addressarea.tpl +++ b/views/smarty/flow/documents/inc/elements/addressarea.tpl @@ -1,5 +1,5 @@ -[{assign var="backaddressfile" value=$backaddressfile|default:"@d3PdfDocuments/documents/inc/page/d3pdfreturnaddress.tpl"}] -[{assign var="addressfile" value=$addressfile|default:"@d3PdfDocuments/documents/inc/elements/d3pdfrecipientaddress.tpl"}] +[{assign var="backaddressfile" value=$backaddressfile|default:"@d3PdfDocuments/documents/inc/page/returnaddress"}] +[{assign var="addressfile" value=$addressfile|default:"@d3PdfDocuments/documents/inc/elements/recipientAddress"}]
diff --git a/views/smarty/flow/documents/inc/elements/articlelist.tpl b/views/smarty/flow/documents/inc/elements/articlelist.tpl index e6ed201..01547dd 100644 --- a/views/smarty/flow/documents/inc/elements/articlelist.tpl +++ b/views/smarty/flow/documents/inc/elements/articlelist.tpl @@ -54,7 +54,7 @@ [{block name="d3_article_costs_summary"}] - [{include file="@d3PdfDocuments/documents/inc/elements/d3pdfarticlecostsummary.tpl"}] + [{include file="@d3PdfDocuments/documents/inc/elements/articlecostssummary"}] [{/block}]
diff --git a/views/smarty/flow/documents/inc/helper/rulers.tpl b/views/smarty/flow/documents/inc/helper/rulers.tpl index ba758c1..5f7207e 100644 --- a/views/smarty/flow/documents/inc/helper/rulers.tpl +++ b/views/smarty/flow/documents/inc/helper/rulers.tpl @@ -2,7 +2,7 @@ [{assign var="pagePadding" value=$pagePadding|default:$defaultPagePadding}] [{* rulers *}] -[{* include file="@d3PdfDocuments/documents/inc/helper/d3pdfrulers.tpl" pagePadding=$pagePadding *}] +[{* include file="@d3PdfDocuments/documents/inc/helper/rulers" pagePadding=$pagePadding *}]