From d13dda978d768a597da0770bbbcd4d316684f2ca Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Fri, 5 Jun 2020 09:37:11 +0200 Subject: [PATCH] allow forced filename --- .../Model/AbstractClasses/pdfdocumentsGeneric.php | 11 +++++++++++ .../Model/AbstractClasses/pdfdocumentsOrder.php | 5 +++++ .../Model/Interfaces/pdfdocumentsGenericInterface.php | 5 +++++ 3 files changed, 21 insertions(+) diff --git a/Application/Model/AbstractClasses/pdfdocumentsGeneric.php b/Application/Model/AbstractClasses/pdfdocumentsGeneric.php index b2b9292..eb70aa5 100644 --- a/Application/Model/AbstractClasses/pdfdocumentsGeneric.php +++ b/Application/Model/AbstractClasses/pdfdocumentsGeneric.php @@ -39,6 +39,9 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface /** @var Smarty */ public $oSmarty; + /** @var string */ + public $filename; + /** * pdfDocumentsGeneric constructor. */ @@ -126,6 +129,14 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface return [self::PDF_ORIENTATION_PORTRAIT, 'A4', 'de']; } + /** + * @param $filename + */ + public function setFilename($filename) + { + $this->filename = $filename; + } + /** * Gets proper file name * diff --git a/Application/Model/AbstractClasses/pdfdocumentsOrder.php b/Application/Model/AbstractClasses/pdfdocumentsOrder.php index b719dd8..14f7b1c 100644 --- a/Application/Model/AbstractClasses/pdfdocumentsOrder.php +++ b/Application/Model/AbstractClasses/pdfdocumentsOrder.php @@ -66,6 +66,11 @@ abstract class pdfdocumentsOrder extends pdfdocumentsGeneric implements orderInt */ public function getFilename() { + // forced filename from setFilename() + if ($this->filename) { + return $this->filename; + } + $sTrimmedBillName = trim($this->getOrder()->getFieldData('oxbilllname')); return implode( diff --git a/Application/Model/Interfaces/pdfdocumentsGenericInterface.php b/Application/Model/Interfaces/pdfdocumentsGenericInterface.php index acc0751..b8b1a97 100644 --- a/Application/Model/Interfaces/pdfdocumentsGenericInterface.php +++ b/Application/Model/Interfaces/pdfdocumentsGenericInterface.php @@ -56,6 +56,11 @@ interface pdfdocumentsGenericInterface */ public function genPdf($sFilename, $iSelLang = 0, $target = 'I'); + /** + * @param string $filename + */ + public function setFilename($filename); + /** * @return string */