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

prevent module extension from new method in other module extension 

(depends difficult right order in extension list)
This commit is contained in:
Daniel Seifert 2020-05-29 09:41:17 +02:00
parent 61f0823051
commit aa2072d985
Signed by: DanielS
GPG Key ID: 8A7C4C6ED1915C6F
3 changed files with 99 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
Application/Controller/orderPdfGenerator.php Normal file
View File

@ -0,0 +1,75 @@
<?php
/**
* This Software is the property of Data Development and is protected
* by copyright law - it is NOT Freeware.
* Any unauthorized use of this software without a valid license
* is a violation of the license agreement and will be prosecuted by
* civil and criminal law.
* http://www.shopmodule.com
*
* @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
* @author D3 Data Development - Daniel Seifert <support@shopmodule.com>
* @link http://www.oxidmodule.com
*/
namespace D3\PdfDocuments\Application\Controller;
use D3\PdfDocuments\Application\Model\Documents\deliverynotePdf;
use D3\PdfDocuments\Application\Model\Documents\invoicePdf;
use D3\PdfDocuments\Application\Model\Interfaces\pdfdocuments_order_interface as OrderPdfInterface;
use OxidEsales\Eshop\Application\Model\Order;
use OxidEsales\Eshop\Core\Registry;
class orderPdfGenerator
{
/**
* @param Order $order
* @param $sFilename
* @param int $iSelLang
* @param string $target
*/
public function generatePdf(Order $order, $sFilename, $iSelLang = 0, $target = 'I')
{
$Pdf= $this->getPdfClass($order);
$Pdf->setOrder($order);
$Pdf->genPdf($sFilename, $iSelLang, $target);
}
public function getPdfClass(Order $order)
{
echo __CLASS__." - ".__FUNCTION__." - ".__LINE__."<br>";
switch (Registry::getRequest()->getRequestParameter('pdftype')) {
case ('dnote'):
case ('dnote_without_logo'):
echo __CLASS__." - ".__FUNCTION__." - ".__LINE__."<br>";
$pdfInstance= oxNew(deliverynotePdf::class);
$pdfInstance->setOrder($order);
return $pdfInstance;
case ('standart'):
case('standart_without_logo'):
echo __CLASS__." - ".__FUNCTION__." - ".__LINE__."<br>";
$pdfInvoice= oxNew(invoicePdf::class);
$pdfInvoice->setOrder($order);
return $pdfInvoice;
default:
echo __CLASS__." - ".__FUNCTION__." - ".__LINE__."<br>";
return $this->getCustomPdfClass($order);
}
}
/**
* @return OrderPdfInterface
* @throws \OxidEsales\Eshop\Core\Exception\SystemComponentException
* @throws \oxSystemComponentException
*/
public function getCustomPdfClass(Order $order)
{
echo __CLASS__." - ".__FUNCTION__." - ".__LINE__."<br>";
$pdfInvoice= oxNew(invoicePdf::class);
$pdfInvoice->setOrder($order);
return $pdfInvoice;
}
}

21
IntelliSenseHelper.php Normal file
View File

@ -0,0 +1,21 @@
<?php
/**
* This Software is the property of Data Development and is protected
* by copyright law - it is NOT Freeware.
* Any unauthorized use of this software without a valid license
* is a violation of the license agreement and will be prosecuted by
* civil and criminal law.
* http://www.shopmodule.com
*
* @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
* @author D3 Data Development - Daniel Seifert <support@shopmodule.com>
* @link http://www.oxidmodule.com
*/
namespace D3\PdfDocuments\Modules\Application\controllers {
use OxidEsales\Eshop\Application\Controller\Admin\OrderOverview;
class d3_overview_controller_pdfdocuments_parent extends OrderOverview {}
}

44
Modules/Application/Model/d3_Order_PdfDocuments.php
View File

@ -17,11 +17,7 @@
namespace D3\PdfDocuments\Modules\Application\Model;
use D3\PdfDocuments\Application\Model\Interfaces\pdfdocuments_order_interface as OrderPdfInterface;
use D3\PdfDocuments\Application\Model\Documents\invoicePdf;
use D3\PdfDocuments\Application\Model\Documents\deliverynotePdf;
use OxidEsales\Eshop\Core\Registry;
use Spipu\Html2Pdf\Exception\Html2PdfException;
use D3\PdfDocuments\Application\Controller\orderPdfGenerator;
class d3_Order_PdfDocuments extends d3_Order_PdfDocuments_parent
{
@ -29,44 +25,10 @@ class d3_Order_PdfDocuments extends d3_Order_PdfDocuments_parent
* @param string $sFilename
* @param int $iSelLang
* @param string $target
* @throws Html2PdfException
*/
public function genPdf($sFilename, $iSelLang = 0, $target = 'I')
{
$Pdf= $this->getPdfClass();
$Pdf->setOrder($this);
$Pdf->genPdf($sFilename, $iSelLang = 0, $target = 'I');
}
public function getPdfClass()
{
switch (Registry::getRequest()->getRequestParameter('pdftype')) {
case ('dnote'):
case ('dnote_without_logo'):
$pdfInstance= oxNew(deliverynotePdf::class);
$pdfInstance->setOrder($this);
return $pdfInstance;
case ('standart'):
case('standart_without_logo'):
$pdfInvoice= oxNew(invoicePdf::class);
$pdfInvoice->setOrder($this);
return $pdfInvoice;
default:
return $this->getCustomPdfClass();
}
}
/**
* @return OrderPdfInterface
* @throws \OxidEsales\Eshop\Core\Exception\SystemComponentException
* @throws \oxSystemComponentException
*/
public function getCustomPdfClass()
{
$pdfInvoice= oxNew(invoicePdf::class);
$pdfInvoice->setOrder($this);
return $pdfInvoice;
$generator = oxNew( orderPdfGenerator::class );
$generator->generatePdf($this, $sFilename, $iSelLang, $target);
}
}