change small syntax issues
Cette révision appartient à :
@ -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;
|
||||
}
|
||||
}
|
@ -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);
|
||||
|
@ -34,7 +34,7 @@ class deliverynotePdf extends pdfdocumentsOrder
|
||||
*/
|
||||
public function getTitleIdent()
|
||||
{
|
||||
return "ORDER_OVERVIEW_PDF_DNOTE";
|
||||
return "D3_PDFDOCUMENTS_DELIVERYNOTE";
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -32,7 +32,7 @@ class deliverynotewithoutlogoPdf extends deliverynotePdf
|
||||
*/
|
||||
public function getTitleIdent()
|
||||
{
|
||||
return "ORDER_OVERVIEW_PDF_DNOTE_WITHOUT_LOGO";
|
||||
return "D3_PDFDOCUMENTS_DELIVERYNOTE_WITHOUT_LOGO";
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -40,7 +40,7 @@ class invoicePdf extends pdfdocumentsOrder implements pdfdocumentsOrderinvoiceIn
|
||||
*/
|
||||
public function getTitleIdent()
|
||||
{
|
||||
return "ORDER_OVERVIEW_PDF_STANDART";
|
||||
return "D3_PDFDOCUMENTS_INVOICE";
|
||||
}
|
||||
|
||||
/**
|
||||
@ -103,8 +103,6 @@ class invoicePdf extends pdfdocumentsOrder implements pdfdocumentsOrderinvoiceIn
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $sFilename
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public function getFilename()
|
||||
|
@ -33,7 +33,7 @@ class invoicewithoutlogoPdf extends invoicePdf
|
||||
*/
|
||||
public function getTitleIdent()
|
||||
{
|
||||
return "ORDER_OVERVIEW_PDF_STANDART_WITHOUT_LOGO";
|
||||
return "D3_PDFDOCUMENTS_INVOICE_WITHOUT_LOGO";
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -75,6 +75,7 @@ abstract class registryAbstract implements registryGenericInterface
|
||||
|
||||
/**
|
||||
* @param $className * generator fully qualified class name
|
||||
* @return bool
|
||||
*/
|
||||
public function hasGenerator($className)
|
||||
{
|
||||
|
Référencer dans un nouveau ticket
Bloquer un utilisateur