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

[Fixed] wrong template alias

Browse Source 
former aliases needed to be changed to the new ones too
This commit is contained in:
MaxBuhe01 2024-08-27 15:26:13 +02:00
parent 6da3e99a0e
commit 6ae437ab56
13 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,7 @@ use OxidEsales\Eshop\Core\Base;
use OxidEsales\Eshop\Core\Registry; use OxidEsales\Eshop\Core\Registry;
use OxidEsales\Eshop\Core\UtilsView; use OxidEsales\Eshop\Core\UtilsView;
use OxidEsales\EshopCommunity\Internal\Framework\Templating\TemplateRenderer; use OxidEsales\EshopCommunity\Internal\Framework\Templating\TemplateRenderer;
use OxidEsales\EshopCommunity\Internal\Framework\Templating\TemplateRendererBridgeInterface;
use Smarty; use Smarty;
use Spipu\Html2Pdf\Exception\Html2PdfException; use Spipu\Html2Pdf\Exception\Html2PdfException;
use Spipu\Html2Pdf\Html2Pdf; use Spipu\Html2Pdf\Html2Pdf;
@ -48,7 +49,7 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface
public function __construct() public function __construct()
{ {
parent::__construct(); parent::__construct();
/** @var TemplateRenderer $oTemplateRenderer */ /** @var TemplateRenderer $oTemplateRenderer */
$oTemplateRenderer = $this->getContainer() $oTemplateRenderer = $this->getContainer()
->get(TemplateRendererBridgeInterface::class) ->get(TemplateRendererBridgeInterface::class)

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

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

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

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

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

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

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

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

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

@ -9,39 +9,39 @@
[{capture append="pdfBlock_header"}] [{capture append="pdfBlock_header"}]
[{block name="pdfHeader"}] [{block name="pdfHeader"}]
[{include file="d3pdfheader.tpl" showLogo=$showLogo}] [{include file="@d3PdfDocuments/documents/inc/page/d3pdfheader.tpl" showLogo=$showLogo}]
[{/block}] [{/block}]
[{/capture}] [{/capture}]
[{capture append="pdfBlock_content"}] [{capture append="pdfBlock_content"}]
[{* include file="d3pdfrulers.tpl" pagePadding=$pagePadding *}] [{* include file="@d3PdfDocuments/documents/inc/helper/d3pdfrulers.tpl" pagePadding=$pagePadding *}]
[{include file="d3pdffoldmarks.tpl" pagePadding=$pagePadding}] [{include file="@d3PdfDocuments/documents/inc/elements/d3pdffoldmarks.tpl" pagePadding=$pagePadding}]
[{block name="pdfAddressArea"}] [{block name="pdfAddressArea"}]
[{include file="d3pdfaddressarea.tpl" addressfile="d3delnote_pdf_recipient.tpl"}] [{include file="@d3PdfDocuments/documents/inc/elements/d3pdfaddressarea.tpl" addressfile="@d3PdfDocuments/documents/deliverynote/d3delnote_pdf_recipient.tpl"}]
[{/block}] [{/block}]
[{block name="pdfInformations"}] [{block name="pdfInformations"}]
[{include file="d3pdfinformations.tpl" documentinformationfile="d3delnote_pdf_informations.tpl"}] [{include file="@d3PdfDocuments/documents/inc/elements/d3pdfinformations.tpl" documentinformationfile="@d3PdfDocuments/documents/deliverynote/d3delnote_pdf_informations.tpl"}]
[{/block}] [{/block}]
[{block name="pdfSalutation"}] [{block name="pdfSalutation"}]
[{include file="d3delnote_pdf_salutation.tpl"}] [{include file="@d3PdfDocuments/documents/deliverynote/d3delnote_pdf_salutation.tpl"}]
[{/block}] [{/block}]
[{block name="pdfArticleList"}] [{block name="pdfArticleList"}]
[{include file="d3pdfarticlelist.tpl" showPrices=false}] [{include file="@d3PdfDocuments/documents/inc/elements/d3pdfarticlelist.tpl" showPrices=false}]
[{/block}] [{/block}]
[{block name="pdfConclusion"}] [{block name="pdfConclusion"}]
[{include file="d3delnote_pdf_conclusion.tpl"}] [{include file="@d3PdfDocuments/documents/deliverynote/d3delnote_pdf_conclusion.tpl"}]
[{/block}] [{/block}]
[{/capture}] [{/capture}]
[{capture append="pdfBlock_footer"}] [{capture append="pdfBlock_footer"}]
[{block name="pdfFooter"}] [{block name="pdfFooter"}]
[{include file="d3pdffooter.tpl" pagePadding=$pagePadding}] [{include file="@d3PdfDocuments/documents/inc/page/d3pdffooter.tpl" pagePadding=$pagePadding}]
[{/block}] [{/block}]
[{/capture}] [{/capture}]
[{include file="d3pdfbase.tpl" pagePadding=$pagePadding}] [{include file="@d3PdfDocuments/documents/inc/page/d3pdfbase.tpl" pagePadding=$pagePadding}]

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

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

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

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

2
views/smarty/flow/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="d3pdfarticlecostsummary.tpl"}] [{include file="@d3PdfDocuments/documents/inc/elements/d3pdfarticlecostsummary.tpl"}]
[{/block}] [{/block}]
</table> </table>
</nobreak> </nobreak>

2
views/smarty/flow/documents/inc/helper/rulers.tpl
View File

@ -2,7 +2,7 @@
[{assign var="pagePadding" value=$pagePadding|default:$defaultPagePadding}] [{assign var="pagePadding" value=$pagePadding|default:$defaultPagePadding}]
[{* rulers *}] [{* rulers *}]
[{* include file="d3pdfrulers.tpl" pagePadding=$pagePadding *}] [{* include file="@d3PdfDocuments/documents/inc/helper/d3pdfrulers.tpl" pagePadding=$pagePadding *}]
<style> <style>
.rulerItemHorizontal { .rulerItemHorizontal {

2
views/smarty/flow/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="d3invoice_pdf_payinfo.tpl"}] [{include file="@d3PdfDocuments/documents/invoice/d3invoice_pdf_payinfo.tpl"}]
</div> </div>
[{/block}] [{/block}]

22
views/smarty/flow/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="d3pdfheader.tpl" showLogo=$showLogo}] [{include file="@d3PdfDocuments/documents/inc/page/d3pdfheader.tpl" showLogo=$showLogo}]
[{/block}] [{/block}]
[{/capture}] [{/capture}]
[{capture append="pdfBlock_content"}] [{capture append="pdfBlock_content"}]
[{* include file="d3pdfrulers.tpl" pagePadding=$pagePadding *}] [{* include file="@d3PdfDocuments/documents/inc/helper/d3pdfrulers.tpl" pagePadding=$pagePadding *}]
[{include file="d3pdffoldmarks.tpl" pagePadding=$pagePadding}] [{include file="@d3PdfDocuments/documents/inc/elements/d3pdffoldmarks.tpl" pagePadding=$pagePadding}]
[{block name="pdfAddressArea"}] [{block name="pdfAddressArea"}]
[{include file="d3pdfaddressarea.tpl"}] [{include file="@d3PdfDocuments/documents/inc/elements/d3pdfaddressarea.tpl"}]
[{/block}] [{/block}]
[{block name="pdfInformations"}] [{block name="pdfInformations"}]
[{include file="d3pdfinformations.tpl" documentinformationfile="d3invoice_pdf_informations.tpl"}] [{include file="@d3PdfDocuments/documents/inc/elements/d3pdfinformations.tpl" documentinformationfile="@d3PdfDocuments/documents/invoice/d3invoice_pdf_informations.tpl"}]
[{/block}] [{/block}]
[{block name="pdfDeliveryAddress"}] [{block name="pdfDeliveryAddress"}]
[{include file="d3pdfdeladdress.tpl"}] [{include file="@d3PdfDocuments/documents/inc/elements/d3pdfdeladdress.tpl"}]
[{/block}] [{/block}]
[{block name="pdfSalutation"}] [{block name="pdfSalutation"}]
[{include file="d3invoice_pdf_salutation.tpl"}] [{include file="@d3PdfDocuments/documents/invoice/d3invoice_pdf_salutation.tpl"}]
[{/block}] [{/block}]
[{block name="pdfArticleList"}] [{block name="pdfArticleList"}]
[{include file="d3pdfarticlelist.tpl"}] [{include file="@d3PdfDocuments/documents/inc/elements/d3pdfarticlelist.tpl"}]
[{/block}] [{/block}]
[{block name="pdfConclusion"}] [{block name="pdfConclusion"}]
[{include file="d3invoice_pdf_conclusion.tpl"}] [{include file="@d3PdfDocuments/documents/invoice/d3invoice_pdf_conclusion.tpl"}]
[{/block}] [{/block}]
[{/capture}] [{/capture}]
[{capture append="pdfBlock_footer"}] [{capture append="pdfBlock_footer"}]
[{block name="pdfFooter"}] [{block name="pdfFooter"}]
[{include file="d3pdffooter.tpl" pagePadding=$pagePadding}] [{include file="@d3PdfDocuments/documents/inc/page/d3pdffooter.tpl" pagePadding=$pagePadding}]
[{/block}] [{/block}]
[{/capture}] [{/capture}]
[{include file="d3pdfbase.tpl" pagePadding=$pagePadding}] [{include file="@d3PdfDocuments/documents/inc/page/d3pdfbase.tpl" pagePadding=$pagePadding}]

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

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