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

[Changed] rename file alias

Browse Source
This commit is contained in:
MaxBuhe01 2024-09-03 19:06:16 +02:00
parent 7b898aef8f
commit 7c3eb1895f
16 changed files with 55 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Application/Model/AbstractClasses/pdfdocumentsGeneric.php
View File

@ -17,6 +17,8 @@ use D3\PdfDocuments\Application\Model\Interfaces\pdfdocumentsGenericInterface as
use OxidEsales\Eshop\Core\Base;
use OxidEsales\Eshop\Core\Registry;
use OxidEsales\Eshop\Core\UtilsView;
use OxidEsales\EshopCommunity\Internal\Container\ContainerFactory;
use OxidEsales\EshopCommunity\Internal\Framework\Templating\TemplateEngineInterface;
use OxidEsales\EshopCommunity\Internal\Framework\Templating\TemplateRenderer;
use OxidEsales\EshopCommunity\Internal\Framework\Templating\TemplateRendererBridgeInterface;
use Smarty;
@ -50,15 +52,25 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface
{
parent::__construct();
/** @var TemplateRenderer $oTemplateRenderer */
$oTemplateRenderer = $this->getContainer()
->get(TemplateRendererBridgeInterface::class)
->getTemplateRenderer();
//ToDo: hier nochmal prüfen, wie das mit smarty aussieht!
$this->oTemplateEngine = $oTemplateRenderer->getTemplateEngine();
$this->oTemplateEngine = $this->d3GetTemplateEngine();
}
public function d3GetTemplateEngine() :TemplateEngineInterface
{
$renderer = $this->d3GetTemplateRendererBridge()->getTemplateRenderer();
return $renderer->getTemplateEngine();
}
/**
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
*/
public function d3GetTemplateRendererBridge(): TemplateRendererBridgeInterface
{
return ContainerFactory::getInstance()->getContainer()
->get(TemplateRendererBridgeInterface::class);
}
public function runPreAction()
{
}

2
Application/Model/Documents/deliverynotePdf.php
View File

@ -43,6 +43,6 @@ class deliverynotePdf extends pdfdocumentsOrder
*/
public function getTemplate()
{
return '@d3PdfDocuments/documents/deliverynote/d3deliverynote_pdf.tpl';
return '@d3PdfDocuments/admin/documents/deliverynote/deliverynote';
}
}

2
Application/Model/Documents/deliverynotewithoutlogoPdf.php
View File

@ -41,6 +41,6 @@ class deliverynotewithoutlogoPdf extends deliverynotePdf
*/
public function getTemplate()
{
return '@d3PdfDocuments/documents/deliverynote/d3deliverynoteNoLogo_pdf.tpl';
return '@d3PdfDocuments/admin/documents/deliverynote/deliverynoteNoLogo';
}
}

2
Application/Model/Documents/invoicePdf.php
View File

@ -95,7 +95,7 @@ class invoicePdf extends pdfdocumentsOrder implements pdfdocumentsOrderinvoiceIn
}
public function getTemplate(){
return '@d3PdfDocuments/documents/invoice/d3invoice_pdf.tpl';
return '@d3PdfDocuments/admin/documents/invoice/invoice';
}
/**

2
Application/Model/Documents/invoicewithoutlogoPdf.php
View File

@ -40,6 +40,6 @@ class invoicewithoutlogoPdf extends invoicePdf
* @return string
*/
public function getTemplate(){
return '@d3PdfDocuments/documents/invoice/d3invoiceNoLogo_pdf.tpl';
return '@d3PdfDocuments/admin/documents/invoice/invoiceNoLogo';
}
}

24
metadata.php
View File

@ -42,20 +42,20 @@ $aModule = [
'@' . Constants::OXID_MODULE_ID . '/admin/d3orderoverview_pdfform.tpl' => 'views/smarty/admin/orderoverview_pdfform.tpl',
// Frontend - Flow - Deliverynote
'@' . Constants::OXID_MODULE_ID . '/documents/deliverynote/d3deliverynote_pdf.tpl' => 'views/smarty/flow/documents/deliverynote/deliverynote.tpl',
'@' . Constants::OXID_MODULE_ID . '/documents/deliverynote/d3deliverynoteNoLogo_pdf.tpl' => 'views/smarty/flow/documents/deliverynote/deliverynoteNoLogo.tpl',
'@' . Constants::OXID_MODULE_ID . '/documents/deliverynote/d3delnote_pdf_informations.tpl' => 'views/smarty/flow/documents/deliverynote/inc/informations.tpl',
'@' . Constants::OXID_MODULE_ID . '/documents/deliverynote/d3delnote_pdf_recipient.tpl' => 'views/smarty/flow/documents/deliverynote/inc/recipientAddress.tpl',
'@' . Constants::OXID_MODULE_ID . '/documents/deliverynote/d3delnote_pdf_salutation.tpl' => 'views/smarty/flow/documents/deliverynote/inc/salutation.tpl',
'@' . Constants::OXID_MODULE_ID . '/documents/deliverynote/d3delnote_pdf_conclusion.tpl' => 'views/smarty/flow/documents/deliverynote/inc/conclusion.tpl',
'@' . 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',
// Frontend - Flow - Invoice
'@' . Constants::OXID_MODULE_ID . '/documents/invoice/d3invoice_pdf.tpl' => 'views/smarty/flow/documents/invoice/invoice.tpl',
'@' . Constants::OXID_MODULE_ID . '/documents/invoice/d3invoiceNoLogo_pdf.tpl' => 'views/smarty/flow/documents/invoice/invoiceNoLogo.tpl',
'@' . Constants::OXID_MODULE_ID . '/documents/invoice/d3invoice_pdf_informations.tpl' => 'views/smarty/flow/documents/invoice/inc/informations.tpl',
'@' . Constants::OXID_MODULE_ID . '/documents/invoice/d3invoice_pdf_salutation.tpl' => 'views/smarty/flow/documents/invoice/inc/salutation.tpl',
'@' . Constants::OXID_MODULE_ID . '/documents/invoice/d3invoice_pdf_conclusion.tpl' => 'views/smarty/flow/documents/invoice/inc/conclusion.tpl',
'@' . Constants::OXID_MODULE_ID . '/documents/invoice/d3invoice_pdf_payinfo.tpl' => 'views/smarty/flow/documents/invoice/inc/payinfo.tpl',
'@' . 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',
// Frontend - Flow - Inc - Page
'@' . Constants::OXID_MODULE_ID . '/documents/inc/page/d3pdfbase.tpl' => 'views/smarty/flow/documents/inc/page/base.tpl',

8
views/smarty/flow/documents/deliverynote/deliverynote.tpl
View File

@ -17,15 +17,15 @@
[{include file="@d3PdfDocuments/documents/inc/elements/d3pdffoldmarks.tpl" pagePadding=$pagePadding}]
[{block name="pdfAddressArea"}]
[{include file="@d3PdfDocuments/documents/inc/elements/d3pdfaddressarea.tpl" addressfile="@d3PdfDocuments/documents/deliverynote/d3delnote_pdf_recipient.tpl"}]
[{include file="@d3PdfDocuments/documents/inc/elements/d3pdfaddressarea.tpl" addressfile="@d3PdfDocuments/documents/deliverynote/delnote_recipient"}]
[{/block}]
[{block name="pdfInformations"}]
[{include file="@d3PdfDocuments/documents/inc/elements/d3pdfinformations.tpl" documentinformationfile="@d3PdfDocuments/documents/deliverynote/d3delnote_pdf_informations.tpl"}]
[{include file="@d3PdfDocuments/documents/inc/elements/d3pdfinformations.tpl" documentinformationfile="@d3PdfDocuments/documents/deliverynote/delnote_informations"}]
[{/block}]
[{block name="pdfSalutation"}]
[{include file="@d3PdfDocuments/documents/deliverynote/d3delnote_pdf_salutation.tpl"}]
[{include file="@d3PdfDocuments/documents/deliverynote/delnote_salutation"}]
[{/block}]
[{block name="pdfArticleList"}]
@ -33,7 +33,7 @@
[{/block}]
[{block name="pdfConclusion"}]
[{include file="@d3PdfDocuments/documents/deliverynote/d3delnote_pdf_conclusion.tpl"}]
[{include file="@d3PdfDocuments/documents/deliverynote/delnote_conclusion.tpl"}]
[{/block}]
[{/capture}]

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

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

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

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

6
views/smarty/flow/documents/invoice/invoice.tpl
View File

@ -22,7 +22,7 @@
[{/block}]
[{block name="pdfInformations"}]
[{include file="@d3PdfDocuments/documents/inc/elements/d3pdfinformations.tpl" documentinformationfile="@d3PdfDocuments/documents/invoice/d3invoice_pdf_informations.tpl"}]
[{include file="@d3PdfDocuments/documents/inc/elements/d3pdfinformations.tpl" documentinformationfile="@d3PdfDocuments/documents/invoice/invoice_informations"}]
[{/block}]
[{block name="pdfDeliveryAddress"}]
@ -30,7 +30,7 @@
[{/block}]
[{block name="pdfSalutation"}]
[{include file="@d3PdfDocuments/documents/invoice/d3invoice_pdf_salutation.tpl"}]
[{include file="@d3PdfDocuments/documents/invoice/invoice_salutation"}]
[{/block}]
[{block name="pdfArticleList"}]
@ -38,7 +38,7 @@
[{/block}]
[{block name="pdfConclusion"}]
[{include file="@d3PdfDocuments/documents/invoice/d3invoice_pdf_conclusion.tpl"}]
[{include file="@d3PdfDocuments/documents/invoice/invoice_conclusion"}]
[{/block}]
[{/capture}]

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

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

8
views/twig/admin/documents/deliverynote/deliverynote.html.twig
View File

@ -17,15 +17,15 @@
{% include "@d3PdfDocuments/documents/inc/elements/d3pdffoldmarks.html.twig" with {pagePadding: pagePadding} %}
{% block pdfAddressArea %}
{% include "@d3PdfDocuments/documents/inc/elements/d3pdfaddressarea.html.twig" with {addressfile: "@d3PdfDocuments/documents/deliverynote/d3delnote_pdf_recipient.tpl"} %}
{% include "@d3PdfDocuments/documents/inc/elements/d3pdfaddressarea.html.twig" with {addressfile: "@d3PdfDocuments/documents/deliverynote/delnote_recipient"} %}
{% endblock %}
{% block pdfInformations %}
{% include "@d3PdfDocuments/documents/inc/elements/d3pdfinformations.html.twig" with {documentinformationfile: "@d3PdfDocuments/documents/deliverynote/d3delnote_pdf_informations.tpl"} %}
{% include "@d3PdfDocuments/documents/inc/elements/d3pdfinformations.html.twig" with {documentinformationfile: "@d3PdfDocuments/documents/deliverynote/delnote_informations"} %}
{% endblock %}
{% block pdfSalutation %}
{% include "@d3PdfDocuments/documents/deliverynote/d3delnote_pdf_salutation.html.twig" %}
{% include "@d3PdfDocuments/documents/deliverynote/delnote_salutation" %}
{% endblock %}
{% block pdfArticleList %}
@ -33,7 +33,7 @@
{% endblock %}
{% block pdfConclusion %}
{% include "@d3PdfDocuments/documents/deliverynote/d3delnote_pdf_conclusion.html.twig" %}
{% include "@d3PdfDocuments/documents/deliverynote/delnote_conclusion" %}
{% endblock %}
{% endcapture %}

2
views/twig/admin/documents/deliverynote/deliverynoteNoLogo.html.twig
View File

@ -1 +1 @@
{% include "@d3PdfDocuments/documents/deliverynote/d3deliverynote_pdf.html.twig" with {showLogo: false} %}
{% include "@d3PdfDocuments/documents/deliverynote/deliverynote" with {showLogo: false} %}

2
views/twig/admin/documents/invoice/inc/conclusion.html.twig
View File

@ -5,7 +5,7 @@
{{ translate({ ident: "D3_PDFDOCUMENTS_USED_PAYMENTMETHOD", suffix: "COLON" }) }}
{{ payment.getFieldData('oxdesc') }}<br>
{% include "@d3PdfDocuments/documents/invoice/d3invoice_pdf_payinfo.html.twig" %}
{% include "@d3PdfDocuments/documents/invoice/invoice_payinfo" %}
</div>
{% endblock %}

6
views/twig/admin/documents/invoice/invoice.html.twig
View File

@ -22,7 +22,7 @@
{% endblock %}
{% block pdfInformations %}
{% include "@d3PdfDocuments/documents/inc/elements/d3pdfinformations.html.twig" with {documentinformationfile: "@d3PdfDocuments/documents/invoice/d3invoice_pdf_informations.tpl"} %}
{% include "@d3PdfDocuments/documents/inc/elements/d3pdfinformations.html.twig" with {documentinformationfile: "@d3PdfDocuments/documents/invoice/invoice_informations"} %}
{% endblock %}
{% block pdfDeliveryAddress %}
@ -30,7 +30,7 @@
{% endblock %}
{% block pdfSalutation %}
{% include "@d3PdfDocuments/documents/invoice/d3invoice_pdf_salutation.html.twig" %}
{% include "@d3PdfDocuments/documents/invoice/invoice_salutation" %}
{% endblock %}
{% block pdfArticleList %}
@ -38,7 +38,7 @@
{% endblock %}
{% block pdfConclusion %}
{% include "@d3PdfDocuments/documents/invoice/d3invoice_pdf_conclusion.html.twig" %}
{% include "@d3PdfDocuments/documents/invoice/invoice_conclusion" %}
{% endblock %}
{% endcapture %}

2
views/twig/admin/documents/invoice/invoiceNoLogo.html.twig
View File

@ -1 +1 @@
{% include "@d3PdfDocuments/documents/invoice/d3invoice_pdf.html.twig" with {showLogo: false} %}
{% include "@d3PdfDocuments/documents/invoice/invoice" with {showLogo: false} %}