D3Public/pdfdokumente
8
0
Vork 0
Code Pull-aanvragen Publicaties Activiteit

change small syntax issues

Bladeren bron
This commit is contained in:
Daniel Seifert
2020-07-03 20:04:21 +02:00
bovenliggende 242610a8cf
commit 5541acaab0
16 gewijzigde bestanden met toevoegingen van 96 en 74 verwijderingen
Download Patch-bestand Download Diff-bestand Expand all files Collapse all files

22
Application/Model/AbstractClasses/pdfdocumentsGeneric.php
Bestand weergeven

@ -58,11 +58,10 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface
}
/**
* @param $sFilename
* @param int $iSelLang
* @param $sFilename
* @param int $iSelLang
* @param string $target
*
* @return mixed|string
* @return mixed|string|null
* @throws Html2PdfException
*/
public function genPdf($sFilename, $iSelLang = 0, $target = self::PDF_DESTINATION_STDOUT)
@ -80,6 +79,7 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface
/**
* @param int $iLanguage
* @throws Html2PdfException
*/
public function downloadPdf($iLanguage = 0)
{
@ -204,8 +204,6 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface
}
/**
* @param string $sFilename
*
* @return string
*/
public function getFilename()
@ -265,6 +263,14 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface
return false;
}
/**
* @param Html2Pdf $oPdf
* @param $sFilename
* @param $target
* @param $html
* @return string|null
* @throws Html2PdfException
*/
public function output(Html2Pdf $oPdf, $sFilename, $target, $html)
{
if ((bool) Registry::getConfig()->getConfigParam('d3PdfDocumentsbDev') === true) {
@ -279,7 +285,7 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface
* @param $sFilename
* @param $target
* @param $html
* @return mixed
* @return null
*/
public function outputDev(Html2Pdf $oPdf, $sFilename, $target, $html)
{
@ -350,5 +356,7 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface
$oPdf->pdf->Error('Incorrect output destination: '.$target);
}
}
return null;
}
}

15
Application/Model/AbstractClasses/pdfdocumentsOrder.php
Bestand weergeven

@ -23,7 +23,6 @@ use \OxidEsales\Eshop\Application\Model\Order;
use OxidEsales\Eshop\Application\Model\Payment;
use OxidEsales\Eshop\Application\Model\User;
use OxidEsales\Eshop\Core\Registry;
use Spipu\Html2Pdf\Exception\Html2PdfException;
abstract class pdfdocumentsOrder extends pdfdocumentsGeneric implements orderInterface
{
@ -65,8 +64,6 @@ abstract class pdfdocumentsOrder extends pdfdocumentsGeneric implements orderInt
}
/**
* @param string $sFilename
*
* @return string
*/
public function getFilename()
@ -97,19 +94,15 @@ abstract class pdfdocumentsOrder extends pdfdocumentsGeneric implements orderInt
}
/**
* @param $sFilename
* @param int $iSelLang
* @param $sFilename
* @param int $iSelLang
* @param string $target
*
* @return mixed|string|void
* @throws Html2PdfException
* @throws noBaseObjectSetException
* @return mixed|string|null
*/
public function genPdf($sFilename, $iSelLang = 0, $target = 'I')
{
if (false == $this->getOrder()) {
$e = oxNew(noBaseObjectSetException::class);
throw $e;
throw oxNew(noBaseObjectSetException::class);
}
return parent::genPdf($sFilename, $iSelLang, $target);