diff --git a/Application/Model/AbstractClasses/pdfdocumentsGeneric.php b/Application/Model/AbstractClasses/pdfdocumentsGeneric.php index d12b675..27c65f5 100644 --- a/Application/Model/AbstractClasses/pdfdocumentsGeneric.php +++ b/Application/Model/AbstractClasses/pdfdocumentsGeneric.php @@ -18,6 +18,7 @@ use OxidEsales\Eshop\Core\Base; use OxidEsales\Eshop\Core\Registry; use OxidEsales\Eshop\Core\UtilsView; use OxidEsales\EshopCommunity\Internal\Framework\Templating\TemplateRenderer; +use OxidEsales\EshopCommunity\Internal\Framework\Templating\TemplateRendererBridgeInterface; use Smarty; use Spipu\Html2Pdf\Exception\Html2PdfException; use Spipu\Html2Pdf\Html2Pdf; @@ -48,7 +49,7 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface public function __construct() { parent::__construct(); - + /** @var TemplateRenderer $oTemplateRenderer */ $oTemplateRenderer = $this->getContainer() ->get(TemplateRendererBridgeInterface::class) diff --git a/Application/Model/Documents/deliverynotePdf.php b/Application/Model/Documents/deliverynotePdf.php index f1e3392..1f2b09b 100644 --- a/Application/Model/Documents/deliverynotePdf.php +++ b/Application/Model/Documents/deliverynotePdf.php @@ -43,6 +43,6 @@ class deliverynotePdf extends pdfdocumentsOrder */ public function getTemplate() { - return 'd3deliverynote_pdf.tpl'; + return '@d3PdfDocuments/documents/deliverynote/d3deliverynote_pdf.tpl'; } } \ No newline at end of file diff --git a/Application/Model/Documents/deliverynotewithoutlogoPdf.php b/Application/Model/Documents/deliverynotewithoutlogoPdf.php index 7e750d0..ebf08e5 100644 --- a/Application/Model/Documents/deliverynotewithoutlogoPdf.php +++ b/Application/Model/Documents/deliverynotewithoutlogoPdf.php @@ -41,6 +41,6 @@ class deliverynotewithoutlogoPdf extends deliverynotePdf */ public function getTemplate() { - return 'd3deliverynoteNoLogo_pdf.tpl'; + return '@d3PdfDocuments/documents/deliverynote/d3deliverynoteNoLogo_pdf.tpl'; } } \ No newline at end of file diff --git a/Application/Model/Documents/invoicePdf.php b/Application/Model/Documents/invoicePdf.php index 599c821..6a5fe08 100644 --- a/Application/Model/Documents/invoicePdf.php +++ b/Application/Model/Documents/invoicePdf.php @@ -95,7 +95,7 @@ class invoicePdf extends pdfdocumentsOrder implements pdfdocumentsOrderinvoiceIn } public function getTemplate(){ - return 'd3invoice_pdf.tpl'; + return '@d3PdfDocuments/documents/invoice/d3invoice_pdf.tpl'; } /** diff --git a/Application/Model/Documents/invoicewithoutlogoPdf.php b/Application/Model/Documents/invoicewithoutlogoPdf.php index 0d3bafa..2c90119 100644 --- a/Application/Model/Documents/invoicewithoutlogoPdf.php +++ b/Application/Model/Documents/invoicewithoutlogoPdf.php @@ -40,6 +40,6 @@ class invoicewithoutlogoPdf extends invoicePdf * @return string */ public function getTemplate(){ - return 'd3invoiceNoLogo_pdf.tpl'; + return '@d3PdfDocuments/documents/invoice/d3invoiceNoLogo_pdf.tpl'; } } \ No newline at end of file diff --git a/views/smarty/flow/documents/deliverynote/deliverynote.tpl b/views/smarty/flow/documents/deliverynote/deliverynote.tpl index 215e32f..9d96b82 100644 --- a/views/smarty/flow/documents/deliverynote/deliverynote.tpl +++ b/views/smarty/flow/documents/deliverynote/deliverynote.tpl @@ -9,39 +9,39 @@ [{capture append="pdfBlock_header"}] [{block name="pdfHeader"}] - [{include file="d3pdfheader.tpl" showLogo=$showLogo}] + [{include file="@d3PdfDocuments/documents/inc/page/d3pdfheader.tpl" showLogo=$showLogo}] [{/block}] [{/capture}] [{capture append="pdfBlock_content"}] - [{* include file="d3pdfrulers.tpl" pagePadding=$pagePadding *}] - [{include file="d3pdffoldmarks.tpl" pagePadding=$pagePadding}] + [{* include file="@d3PdfDocuments/documents/inc/helper/d3pdfrulers.tpl" pagePadding=$pagePadding *}] + [{include file="@d3PdfDocuments/documents/inc/elements/d3pdffoldmarks.tpl" pagePadding=$pagePadding}] [{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 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 name="pdfSalutation"}] - [{include file="d3delnote_pdf_salutation.tpl"}] + [{include file="@d3PdfDocuments/documents/deliverynote/d3delnote_pdf_salutation.tpl"}] [{/block}] [{block name="pdfArticleList"}] - [{include file="d3pdfarticlelist.tpl" showPrices=false}] + [{include file="@d3PdfDocuments/documents/inc/elements/d3pdfarticlelist.tpl" showPrices=false}] [{/block}] [{block name="pdfConclusion"}] - [{include file="d3delnote_pdf_conclusion.tpl"}] + [{include file="@d3PdfDocuments/documents/deliverynote/d3delnote_pdf_conclusion.tpl"}] [{/block}] [{/capture}] [{capture append="pdfBlock_footer"}] [{block name="pdfFooter"}] - [{include file="d3pdffooter.tpl" pagePadding=$pagePadding}] + [{include file="@d3PdfDocuments/documents/inc/page/d3pdffooter.tpl" pagePadding=$pagePadding}] [{/block}] [{/capture}] -[{include file="d3pdfbase.tpl" pagePadding=$pagePadding}] \ No newline at end of file +[{include file="@d3PdfDocuments/documents/inc/page/d3pdfbase.tpl" pagePadding=$pagePadding}] \ No newline at end of file diff --git a/views/smarty/flow/documents/deliverynote/deliverynoteNoLogo.tpl b/views/smarty/flow/documents/deliverynote/deliverynoteNoLogo.tpl index f40d245..28fb43b 100644 --- a/views/smarty/flow/documents/deliverynote/deliverynoteNoLogo.tpl +++ b/views/smarty/flow/documents/deliverynote/deliverynoteNoLogo.tpl @@ -1 +1 @@ -[{include file="d3deliverynote_pdf.tpl" showLogo=false}] \ No newline at end of file +[{include file="@d3PdfDocuments/documents/deliverynote/d3deliverynote_pdf.tpl" showLogo=false}] \ 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 72c3fd3..2f067a6 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:"d3pdfreturnaddress.tpl"}] -[{assign var="addressfile" value=$addressfile|default:"d3pdfrecipientaddress.tpl"}] +[{assign var="backaddressfile" value=$backaddressfile|default:"@d3PdfDocuments/documents/inc/page/d3pdfreturnaddress.tpl"}] +[{assign var="addressfile" value=$addressfile|default:"@d3PdfDocuments/documents/inc/elements/d3pdfrecipientaddress.tpl"}]
diff --git a/views/smarty/flow/documents/inc/elements/articlelist.tpl b/views/smarty/flow/documents/inc/elements/articlelist.tpl index e313798..e6ed201 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="d3pdfarticlecostsummary.tpl"}] + [{include file="@d3PdfDocuments/documents/inc/elements/d3pdfarticlecostsummary.tpl"}] [{/block}]
diff --git a/views/smarty/flow/documents/inc/helper/rulers.tpl b/views/smarty/flow/documents/inc/helper/rulers.tpl index 6fe500c..ba758c1 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="d3pdfrulers.tpl" pagePadding=$pagePadding *}] +[{* include file="@d3PdfDocuments/documents/inc/helper/d3pdfrulers.tpl" pagePadding=$pagePadding *}]