[Fixed] missing docs adjustments

[Added] metadata setting for alternative PDF-Logo filename; translations
[Changed] img-handling in documentsGeneric and header.html.twig

I didn't check for smarty yet!

Application/Model/AbstractClasses/pdfdocumentsGeneric.php

@@ -10,15 +10,26 @@
 
 namespace D3\PdfDocuments\Application\Model\AbstractClasses;
 
+use Assert\InvalidArgumentException;
 use D3\ModCfg\Application\Model\d3filesystem;
+use D3\PdfDocuments\Application\Model\Constants;
 use D3\PdfDocuments\Application\Model\Exceptions\pdfGeneratorExceptionAbstract;
 use D3\PdfDocuments\Application\Model\Interfaces\pdfdocumentsGenericInterface as genericInterface;
 use OxidEsales\Eshop\Core\Base;
+use OxidEsales\Eshop\Core\Exception\StandardException;
 use OxidEsales\Eshop\Core\Registry;
 use OxidEsales\Eshop\Core\UtilsView;
+use OxidEsales\EshopCommunity\Core\Di\ContainerFacade;
+use OxidEsales\EshopCommunity\Internal\Container\ContainerFactory;
+use OxidEsales\EshopCommunity\Internal\Framework\Module\Facade\ModuleSettingServiceInterface;
+use OxidEsales\EshopCommunity\Internal\Framework\Templating\TemplateEngineInterface;
+use OxidEsales\EshopCommunity\Internal\Framework\Templating\TemplateRenderer;
+use OxidEsales\EshopCommunity\Internal\Framework\Templating\TemplateRendererBridgeInterface;
+use OxidEsales\Twig\Resolver\TemplateChain\TemplateNotInChainException;
 use Smarty;
 use Spipu\Html2Pdf\Exception\Html2PdfException;
 use Spipu\Html2Pdf\Html2Pdf;
+use Twig\Error\Error;
 
 abstract class pdfdocumentsGeneric extends Base implements genericInterface
 {
@@ -35,7 +46,7 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface
     public $filenameExtension = 'pdf';
 
     /** @var Smarty  */
-    public $oSmarty;
+    public $oTemplateEngine;
 
     /** @var string */
     public $filename;
@@ -46,11 +57,26 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface
     public function __construct()
     {
         parent::__construct();
-
-        /** @var Smarty $oSmarty */
-        $this->oSmarty = Registry::getUtilsView()->getSmarty(true);
+	    
+	    $this->oTemplateEngine =  $this->d3GetTemplateEngine();
     }
 
+	public function d3GetTemplateEngine() :TemplateEngineInterface
+	{
+		$renderer = $this->d3GetTemplateRendererBridge()->getTemplateRenderer();
+		return $renderer->getTemplateEngine();
+	}
+	
+	/**
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
+	 */
+	public function d3GetTemplateRendererBridge(): TemplateRendererBridgeInterface
+	{
+		return ContainerFactory::getInstance()->getContainer()
+			->get(TemplateRendererBridgeInterface::class);
+	}
+	
     public function runPreAction()
     {
     }
@@ -94,6 +120,9 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface
         } catch (pdfGeneratorExceptionAbstract $e) {
             Registry::get(UtilsView::class)->addErrorToDisplay($e);
             Registry::getLogger()->error($e);
+        } catch (InvalidArgumentException $e) {
+            Registry::get(UtilsView::class)->addErrorToDisplay($e);
+            Registry::getLogger()->error($e);
         }
     }
 
@@ -117,6 +146,9 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface
         } catch (pdfGeneratorExceptionAbstract $e) {
             Registry::get(UtilsView::class)->addErrorToDisplay($e);
             Registry::getLogger()->error($e);
+        } catch (InvalidArgumentException $e) {
+            Registry::get(UtilsView::class)->addErrorToDisplay($e);
+            Registry::getLogger()->error($e);
         }
     }
 
@@ -137,6 +169,9 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface
         } catch (pdfGeneratorExceptionAbstract $e) {
             Registry::get(UtilsView::class)->addErrorToDisplay($e);
             Registry::getLogger()->error($e);
+        } catch (InvalidArgumentException $e) {
+            Registry::get(UtilsView::class)->addErrorToDisplay($e);
+            Registry::getLogger()->error($e);
         }
 
         return null;
@@ -145,20 +180,47 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface
     /**
      * @param int $iSelLang
      */
-    public function setSmartyVars($iSelLang)
+    public function setTemplateEngineVars($iSelLang)
     {
         unset($iSelLang);
-        $this->oSmarty->assign('config', Registry::getSession()->getConfig());
-        $this->oSmarty->assign('viewConfig', Registry::getSession()->getConfig()->getActiveView()->getViewConfig());
-        $this->oSmarty->assign('shop', Registry::getSession()->getConfig()->getActiveShop());
-        $this->oSmarty->assign('lang', Registry::getLang());
-        $this->oSmarty->assign('document', $this);
+		
+        $this->oTemplateEngine->addGlobal('config', Registry::getConfig());
+        $this->oTemplateEngine->addGlobal('sAlternativePdfLogo', $this->getAlternativePdfLogoFileName());
+        $this->oTemplateEngine->addGlobal('oViewConf', Registry::getConfig()->getActiveView()->getViewConfig());
+        $this->oTemplateEngine->addGlobal('shop', Registry::getConfig()->getActiveShop());
+        $this->oTemplateEngine->addGlobal('lang', Registry::getLang());
+        $this->oTemplateEngine->addGlobal('document', $this);
     }
-
+	
+	/**
+	 * @return string
+	 */
+	public function getAlternativePdfLogoFileName() :string
+	{
+		$sStandardLogoFile = 'pdf_logo.jpg';
+		$oViewConf = Registry::getConfig()->getActiveView()->getViewConfig();
+		$moduleSettingService = ContainerFacade::get(ModuleSettingServiceInterface::class);
+		$sAlternativePdfLogoName = $moduleSettingService->getString(Constants::OXID_MODULE_ID."_sAlternativePdfLogoName", Constants::OXID_MODULE_ID);
+		
+		$sAlternativePdfLogoName = trim($sAlternativePdfLogoName) ?: $sStandardLogoFile;
+		
+		$bAlternativeFileExists = file_exists(Registry::getConfig()->getImagePath($sAlternativePdfLogoName));
+		$bFileExists = file_exists(Registry::getConfig()->getImagePath($sStandardLogoFile));
+		
+		return $bAlternativeFileExists
+						? $oViewConf->getImageUrl($sAlternativePdfLogoName, true)
+						: (
+							$bFileExists
+							? $oViewConf->getImageUrl($sStandardLogoFile, true)
+							: ""
+						);
+	}
+	
     /**
      * @param int $iSelLang
      *
      * @return mixed
+     * @throws InvalidArgumentException
      */
     public function getHTMLContent($iSelLang = 0)
     {
@@ -170,11 +232,19 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface
         $currTplLang = $lang->getTplLanguage();
         $lang->setTplLanguage($iSelLang);
 
-        $this->setSmartyVars($iSelLang);
-
-        $content = $this->oSmarty->fetch($this->getTemplate());
-
-        $lang->setTplLanguage($currTplLang);
+        $this->setTemplateEngineVars($iSelLang);
+		
+	    try {
+		    $content = $this->oTemplateEngine->render($this->getTemplate(), $this->d3GetTemplateEngine()->getGlobals());
+	    } catch (Error|TemplateNotInChainException $error) {
+		    
+		    //Registry::getLogger()->error(dumpVar(__METHOD__." ".__LINE__), [$error->getFile()]);
+			
+		    $error = oxNew(StandardException::class, $error->getMessage());
+		    throw $error;
+	    }
+	    
+	    $lang->setTplLanguage($currTplLang);
 
         self::$_blIsAdmin = $blCurrentRenderFromAdmin;
 
@@ -242,7 +312,7 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface
     {
         $extension = $this->filenameExtension;
         $extensionLength = (strlen($extension) + 1) * -1;
-        if ((bool) strlen($extension) && substr($filename, $extensionLength) != '.'.$extension) {
+        if (strlen($extension) && substr($filename, $extensionLength) != '.'.$extension) {
             $filename .= '.'.$extension;
         }
 

Application/Model/AbstractClasses/pdfdocumentsOrder.php

@@ -10,9 +10,10 @@
 
 namespace D3\PdfDocuments\Application\Model\AbstractClasses;
 
-use D3\PdfDocuments\Application\Model\Exceptions\noBaseObjectSetException;
+use Assert\Assert;
+use Assert\InvalidArgumentException;
 use D3\PdfDocuments\Application\Model\Interfaces\pdfdocumentsOrderInterface as orderInterface;
-use \OxidEsales\Eshop\Application\Model\Order;
+use OxidEsales\Eshop\Application\Model\Order;
 use OxidEsales\Eshop\Application\Model\Payment;
 use OxidEsales\Eshop\Application\Model\User;
 use OxidEsales\Eshop\Core\Registry;
@@ -22,6 +23,14 @@ abstract class pdfdocumentsOrder extends pdfdocumentsGeneric implements orderInt
     /** @var Order */
     public $oOrder;
 
+    /**
+     * don't use order as constructor argument because of same method interface for all document types
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
     /**
      * @param Order $order
      */
@@ -31,33 +40,41 @@ abstract class pdfdocumentsOrder extends pdfdocumentsGeneric implements orderInt
     }
 
     /**
+     * @throws InvalidArgumentException
      * @return Order
      */
     public function getOrder()
     {
+        Assert::lazy()
+            ->that($this->oOrder)->isInstanceOf(Order::class, 'no order for pdf generator set')
+            ->that($this->oOrder->isLoaded())->true('given order is not loaded')
+            ->verifyNow();
+
         return $this->oOrder;
     }
 
     /**
      * @param int $iSelLang
+     * @throws InvalidArgumentException
      */
-    public function setSmartyVars($iSelLang)
+    public function setTemplateEngineVars($iSelLang)
     {
-        parent::setSmartyVars($iSelLang);
+        parent::setTemplateEngineVars($iSelLang);
 
-        $this->oSmarty->assign('order', $this->getOrder());
+        $this->oTemplateEngine->addGlobal('order', $this->getOrder());
 
         $oUser = oxNew(User::Class);
         $oUser->load($this->getOrder()->getFieldData('oxuserid'));
-        $this->oSmarty->assign('user', $oUser);
+        $this->oTemplateEngine->addGlobal('user', $oUser);
 
         $oPayment = oxNew(Payment::class);
         $oPayment->loadInLang($iSelLang, $this->getOrder()->getFieldData('oxpaymenttype'));
-        $this->oSmarty->assign('payment', $oPayment);
+        $this->oTemplateEngine->addGlobal('payment', $oPayment);
     }
 
     /**
      * @return string
+     * @throws InvalidArgumentException
      */
     public function getFilename()
     {
@@ -86,21 +103,6 @@ abstract class pdfdocumentsOrder extends pdfdocumentsGeneric implements orderInt
         );
     }
 
-    /**
-     * @param $sFilename
-     * @param int $iSelLang
-     * @param string $target
-     * @return mixed|string|null
-     */
-    public function genPdf($sFilename, $iSelLang = 0, $target = 'I')
-    {
-        if (false == $this->getOrder()) {
-            throw oxNew(noBaseObjectSetException::class);
-        }
-
-        return parent::genPdf($sFilename, $iSelLang, $target);
-    }
-
     /**
      * @return int
      */
@@ -115,6 +117,7 @@ abstract class pdfdocumentsOrder extends pdfdocumentsGeneric implements orderInt
 
     /**
      * @return false|string
+     * @throws InvalidArgumentException
      */
     public function getPayableUntilDate()
     {

Application/Model/Constants.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace D3\PdfDocuments\Application\Model;
+
+
+class Constants
+{
+    public const OXID_MODULE_ID = 'd3PdfDocuments';
+}

Application/Model/Documents/deliverynotePdf.php

@@ -43,6 +43,6 @@ class deliverynotePdf extends pdfdocumentsOrder
      */
     public function getTemplate()
     {
-        return 'd3deliverynote_pdf.tpl';
+        return '@d3PdfDocuments/documents/deliverynote/deliverynote';
     }
 }

Application/Model/Documents/deliverynotewithoutlogoPdf.php

@@ -41,6 +41,6 @@ class deliverynotewithoutlogoPdf extends deliverynotePdf
      */
     public function getTemplate()
     {
-        return 'd3deliverynoteNoLogo_pdf.tpl';
+        return '@d3PdfDocuments/documents/deliverynote/deliverynoteNoLogo';
     }
 }

Application/Model/Documents/invoicePdf.php

@@ -10,10 +10,9 @@
 
 namespace D3\PdfDocuments\Application\Model\Documents;
 
+use Assert\InvalidArgumentException;
 use D3\PdfDocuments\Application\Model\AbstractClasses\pdfdocumentsOrder;
-use D3\PdfDocuments\Application\Model\Exceptions\noBaseObjectSetException;
 use D3\PdfDocuments\Application\Model\Interfaces\pdfdocumentsOrderinvoiceInterface;
-use Spipu\Html2Pdf\Exception\Html2PdfException;
 
 class invoicePdf extends pdfdocumentsOrder implements pdfdocumentsOrderinvoiceInterface
 {
@@ -43,6 +42,10 @@ class invoicePdf extends pdfdocumentsOrder implements pdfdocumentsOrderinvoiceIn
         return 'invoice';
     }
 
+    /**
+     * @return void
+     * @throws InvalidArgumentException
+     */
     public function runPreAction()
     {
         parent::runPreAction();
@@ -52,6 +55,10 @@ class invoicePdf extends pdfdocumentsOrder implements pdfdocumentsOrderinvoiceIn
         $this->saveOrderOnChanges();
     }
 
+    /**
+     * @return void
+     * @throws InvalidArgumentException
+     */
     public function setInvoiceNumber()
     {
         if (!$this->getOrder()->getFieldData('oxbillnr')) {
@@ -61,6 +68,10 @@ class invoicePdf extends pdfdocumentsOrder implements pdfdocumentsOrderinvoiceIn
         }
     }
 
+    /**
+     * @return void
+     * @throws InvalidArgumentException
+     */
     public function setInvoiceDate()
     {
         if ($this->getOrder()->getFieldData('oxbilldate') == '0000-00-00') {
@@ -72,6 +83,10 @@ class invoicePdf extends pdfdocumentsOrder implements pdfdocumentsOrderinvoiceIn
         }
     }
 
+    /**
+     * @return void
+     * @throws InvalidArgumentException
+     */
     public function saveOrderOnChanges()
     {
         if ($this->blIsNewOrder) {
@@ -80,11 +95,12 @@ class invoicePdf extends pdfdocumentsOrder implements pdfdocumentsOrderinvoiceIn
     }
 
     public function getTemplate(){
-        return 'd3invoice_pdf.tpl';
+        return '@d3PdfDocuments/documents/invoice/invoice';
     }
 
     /**
      * @return string
+     * @throws InvalidArgumentException
      */
     public function getFilename()
     {

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/invoiceNoLogo';
     }
 }

Application/Model/Exceptions/noBaseObjectSetException.php

@@ -1,21 +0,0 @@
-<?php
-
-/**
- * See LICENSE file for license details.
- * 
- * @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\Model\Exceptions;
-
-use Exception;
-
-class noBaseObjectSetException extends pdfGeneratorExceptionAbstract
-{
-    public function __construct( $sMessage = "no base object (e.g. order) for pdf generator set", $iCode = 0, Exception $previous = null )
-    {
-        parent::__construct( $sMessage, $iCode, $previous );
-    }
-}

Application/Model/Interfaces/pdfdocumentsGenericInterface.php

@@ -10,8 +10,6 @@
 
 namespace D3\PdfDocuments\Application\Model\Interfaces;
 
-use D3\PdfDocuments\Application\Model\Exceptions\noBaseObjectSetException;
-
 interface pdfdocumentsGenericInterface
 {
     /**
@@ -58,7 +56,6 @@ interface pdfdocumentsGenericInterface
      * @param string $target
      *
      * @return mixed
-     * @throws noBaseObjectSetException
      */
     public function genPdf($sFilename, $iSelLang = 0, $target = 'I');
 

Application/Model/Interfaces/pdfdocumentsOrderInterface.php

@@ -10,6 +10,7 @@
 
 namespace D3\PdfDocuments\Application\Model\Interfaces;
 
+use Assert\InvalidArgumentException;
 use OxidEsales\Eshop\Application\Model\Order;
 
 interface pdfdocumentsOrderInterface extends pdfdocumentsGenericInterface
@@ -20,6 +21,7 @@ interface pdfdocumentsOrderInterface extends pdfdocumentsGenericInterface
     public function setOrder(Order $order);
 
     /**
+     * @throws InvalidArgumentException
      * @return Order
      */
     public function getOrder();

Application/views/admin/blocks/order_overview.tpl

@@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="d3orderoverview_pdfform.tpl"}]

Application/views/admin_smarty/de/pdfdocuments_lang.php

@@ -13,7 +13,11 @@ $aLang     = array(
     'charset'                                            => 'utf-8',
 
     'SHOP_MODULE_GROUP_d3PdfDocumentsmain'               => 'Grundeinstellungen',
-    'SHOP_MODULE_d3PdfDocumentsbDev'                     => 'Entwicklermodus',
+	'SHOP_MODULE_'. Constants::OXID_MODULE_ID.'bDev'                     => 'Entwicklermodus',
+	'SHOP_MODULE_'. Constants::OXID_MODULE_ID.'_sAlternativePdfLogoName'                     => 'Alternativer PDF-Logo Name<br><br>
+																																									Ohne Angabe ( leer ) wird <u style="color: orangered">automatisch</u> folgender Datei-Name gewählt: <b>pdf_logo.jpg</b><br>
+																																									Diese Datei muss sich im <b>source/out/THEME/img/</b> Ordner befinden <b>und muss aus technischen Gründen PNG/ JPG sein</b>.<br><br>
+																																									<u>Notfalls wird kein Bild eingefügt!</u>',
 
     'D3_PDFDOCUMENTS'                                    => 'PDF-Dokumente',
     'D3_PDFDOCUMENTS_INVOICE'                            => 'Rechnung',

Application/views/admin_smarty/en/pdfdocuments_lang.php

@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * See LICENSE file for license details.
+ * 
+ * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
+ * @author        D3 Data Development - Daniel Seifert <support@shopmodule.com>
+ * @link          http://www.oxidmodule.com
+ */
+
+$sLangName = "English";
+$aLang     = array(
+    'charset'                                            => 'utf-8',
+
+    'SHOP_MODULE_GROUP_d3PdfDocumentsmain'               => 'Basic settings',
+	'SHOP_MODULE_'. Constants::OXID_MODULE_ID.'bDev'                     => 'Developer mode',
+	'SHOP_MODULE_'. Constants::OXID_MODULE_ID.'_sAlternativePdfLogoName'                     => 'Alternative PDF Logo Name<br><br>
+																																									Without specification (empty) the following file name will be <u style="color: orangered">automatically</u> selected: <b>pdf_logo.jpg</b><br>
+																																									This file must be located in the <b>source/out/THEME/img/</b> folder <b>and must be PNG or JPG for technical reasons</b>.<br><br>
+																																									<u>If necessary, no image will be inserted!</u>',
+
+    'D3_PDFDOCUMENTS'                                    => 'PDF Documents',
+    'D3_PDFDOCUMENTS_INVOICE'                            => 'Invoice',
+    'D3_PDFDOCUMENTS_INVOICE_WITHOUT_LOGO'               => 'Invoice without logo',
+    'D3_PDFDOCUMENTS_DELIVERYNOTE'                       => 'Deliverynote',
+    'D3_PDFDOCUMENTS_DELIVERYNOTE_WITHOUT_LOGO'          => 'Deliverynote without logo',
+
+    'D3_PDFDOCUMENTS_PDF_TYPE'                           => 'Document',
+    'D3_PDFDOCUMENTS_LANGUAGE'                           => 'Language',
+    'D3_PDFDOCUMENTS_PDF_GENERATE'                       => 'Create Document',
+);

Application/views/admin_twig/de/pdfdocuments_lang.php

@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * See LICENSE file for license details.
+ * 
+ * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
+ * @author        D3 Data Development - Daniel Seifert <support@shopmodule.com>
+ * @link          http://www.oxidmodule.com
+ */
+	
+	use D3\PdfDocuments\Application\Model\Constants;
+	
+	$sLangName = "Deutsch";
+$aLang     = array(
+    'charset'                                            => 'utf-8',
+
+    'SHOP_MODULE_GROUP_d3PdfDocumentsmain'               => 'Grundeinstellungen',
+    'SHOP_MODULE_'. Constants::OXID_MODULE_ID.'bDev'                     => 'Entwicklermodus',
+    'SHOP_MODULE_'. Constants::OXID_MODULE_ID.'_sAlternativePdfLogoName'                     => 'Alternativer PDF-Logo Name<br><br>
+																																									Ohne Angabe ( leer ) wird <u style="color: orangered">automatisch</u> folgender Datei-Name gewählt: <b>pdf_logo.jpg</b><br>
+																																									Diese Datei muss sich im <b>source/out/THEME/img/</b> Ordner befinden <b>und muss aus technischen Gründen PNG oder JPG sein</b>.<br><br>
+																																									<u>Notfalls wird kein Bild eingefügt!</u>',
+
+    'D3_PDFDOCUMENTS'                                    => 'PDF-Dokumente',
+    'D3_PDFDOCUMENTS_INVOICE'                            => 'Rechnung',
+    'D3_PDFDOCUMENTS_INVOICE_WITHOUT_LOGO'               => 'Rechnung ohne Logo',
+    'D3_PDFDOCUMENTS_DELIVERYNOTE'                       => 'Lieferschein',
+    'D3_PDFDOCUMENTS_DELIVERYNOTE_WITHOUT_LOGO'          => 'Lieferschein ohne Logo',
+
+    'D3_PDFDOCUMENTS_PDF_TYPE'                           => 'Dokument',
+    'D3_PDFDOCUMENTS_LANGUAGE'                           => 'Sprache',
+    'D3_PDFDOCUMENTS_PDF_GENERATE'                       => 'Dokument erstellen',
+);

Application/views/admin_twig/en/pdfdocuments_lang.php

@@ -13,7 +13,11 @@ $aLang     = array(
     'charset'                                            => 'utf-8',
 
     'SHOP_MODULE_GROUP_d3PdfDocumentsmain'               => 'Basic settings',
-    'SHOP_MODULE_d3PdfDocumentsbDev'                     => 'Developer mode',
+	'SHOP_MODULE_'. Constants::OXID_MODULE_ID.'bDev'                     => 'Developer mode',
+	'SHOP_MODULE_'. Constants::OXID_MODULE_ID.'_sAlternativePdfLogoName'                     => 'Alternative PDF Logo Name<br><br>
+																																									Without specification (empty) the following file name will be <u style="color: orangered">automatically</u> selected: <b>pdf_logo.jpg</b><br>
+																																									This file must be located in the <b>source/out/THEME/img/</b> folder <b>and must be PNG/ JPG for technical reasons</b>.<br><br>
+																																									<u>If necessary, no image will be inserted!</u>',
 
     'D3_PDFDOCUMENTS'                                    => 'PDF Documents',
     'D3_PDFDOCUMENTS_INVOICE'                            => 'Invoice',

Application/views/tpl/documents/deliverynote/deliverynote.tpl

@@ -1,47 +0,0 @@
-[{assign var="pagePadding"   value=","|explode:"45,15,30,25"}] [{* top, right, bottom, left *}]
-[{assign var="showLogo"      value=$showLogo|default:true}]
-
-[{capture append="pdfBlock_style"}]
-    [{block name="pdfStyles"}]
-        [{include file="d3pdfstyles.css"}]
-    [{/block}]
-[{/capture}]
-
-[{capture append="pdfBlock_header"}]
-    [{block name="pdfHeader"}]
-        [{include file="d3pdfheader.tpl" showLogo=$showLogo}]
-    [{/block}]
-[{/capture}]
-
-[{capture append="pdfBlock_content"}]
-    [{* include file="d3pdfrulers.tpl" pagePadding=$pagePadding *}]
-    [{include file="d3pdffoldmarks.tpl" pagePadding=$pagePadding}]
-
-    [{block name="pdfAddressArea"}]
-        [{include file="d3pdfaddressarea.tpl" addressfile="d3delnote_pdf_recipient.tpl"}]
-    [{/block}]
-
-    [{block name="pdfInformations"}]
-        [{include file="d3pdfinformations.tpl" documentinformationfile="d3delnote_pdf_informations.tpl"}]
-    [{/block}]
-
-    [{block name="pdfSalutation"}]
-        [{include file="d3delnote_pdf_salutation.tpl"}]
-    [{/block}]
-
-    [{block name="pdfArticleList"}]
-        [{include file="d3pdfarticlelist.tpl" showPrices=false}]
-    [{/block}]
-
-    [{block name="pdfConclusion"}]
-        [{include file="d3delnote_pdf_conclusion.tpl"}]
-    [{/block}]
-[{/capture}]
-
-[{capture append="pdfBlock_footer"}]
-    [{block name="pdfFooter"}]
-        [{include file="d3pdffooter.tpl" pagePadding=$pagePadding}]
-    [{/block}]
-[{/capture}]
-
-[{include file="d3pdfbase.tpl" pagePadding=$pagePadding}]

Application/views/tpl/documents/deliverynote/deliverynoteNoLogo.tpl

@@ -1 +0,0 @@
-[{include file="d3deliverynote_pdf.tpl" showLogo=false}]

Application/views/tpl/documents/inc/elements/addressarea.tpl

@@ -1,13 +0,0 @@
-[{assign var="backaddressfile" value=$backaddressfile|default:"d3pdfreturnaddress.tpl"}]
-[{assign var="addressfile" value=$addressfile|default:"d3pdfrecipientaddress.tpl"}]
-
-<div class="addressarea">
-    <div class="returnAddress">
-        <div>
-            [{include file=$backaddressfile}]
-        </div>
-    </div>
-    <div class="recipientAddress">
-        [{include file=$addressfile}]
-    </div>
-</div>

Application/views/tpl/documents/invoice/invoice.tpl

@@ -1,51 +0,0 @@
-[{assign var="pagePadding"   value=","|explode:"45,15,30,25"}] [{* top, right, bottom, left *}]
-[{assign var="showLogo"      value=$showLogo|default:true}]
-
-[{capture append="pdfBlock_style"}]
-    [{block name="pdfStyles"}]
-        [{include file="d3pdfstyles.css"}]
-    [{/block}]
-[{/capture}]
-
-[{capture append="pdfBlock_header"}]
-    [{block name="pdfHeader"}]
-        [{include file="d3pdfheader.tpl" showLogo=$showLogo}]
-    [{/block}]
-[{/capture}]
-
-[{capture append="pdfBlock_content"}]
-    [{* include file="d3pdfrulers.tpl" pagePadding=$pagePadding *}]
-    [{include file="d3pdffoldmarks.tpl" pagePadding=$pagePadding}]
-
-    [{block name="pdfAddressArea"}]
-        [{include file="d3pdfaddressarea.tpl"}]
-    [{/block}]
-
-    [{block name="pdfInformations"}]
-        [{include file="d3pdfinformations.tpl" documentinformationfile="d3invoice_pdf_informations.tpl"}]
-    [{/block}]
-
-    [{block name="pdfDeliveryAddress"}]
-        [{include file="d3pdfdeladdress.tpl"}]
-    [{/block}]
-
-    [{block name="pdfSalutation"}]
-        [{include file="d3invoice_pdf_salutation.tpl"}]
-    [{/block}]
-
-    [{block name="pdfArticleList"}]
-        [{include file="d3pdfarticlelist.tpl"}]
-    [{/block}]
-
-    [{block name="pdfConclusion"}]
-        [{include file="d3invoice_pdf_conclusion.tpl"}]
-    [{/block}]
-[{/capture}]
-
-[{capture append="pdfBlock_footer"}]
-    [{block name="pdfFooter"}]
-        [{include file="d3pdffooter.tpl" pagePadding=$pagePadding}]
-    [{/block}]
-[{/capture}]
-
-[{include file="d3pdfbase.tpl" pagePadding=$pagePadding}]

Application/views/tpl/documents/invoice/invoiceNoLogo.tpl

@@ -1 +0,0 @@
-[{include file="d3invoice_pdf.tpl" showLogo=false}]

IntelliSenseHelper.php

@@ -0,0 +1,23 @@
+<?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\Controller {
+		
+		use OxidEsales\Eshop\Application\Controller\Admin\OrderOverview;
+		
+		class d3_overview_controller_pdfdocuments_parent extends OrderOverview
+		{
+		}
+	}

Modules/Application/Controller/d3_overview_controller_pdfdocuments.php

@@ -11,11 +11,9 @@
 namespace D3\PdfDocuments\Modules\Application\Controller;
 
 use D3\PdfDocuments\Application\Controller\orderOverviewPdfGenerator;
-use D3\PdfDocuments\Application\Model\Exceptions\noBaseObjectSetException;
 use D3\PdfDocuments\Application\Model\Exceptions\noPdfHandlerFoundException;
 use D3\PdfDocuments\Application\Model\Exceptions\pdfGeneratorExceptionAbstract;
 use D3\PdfDocuments\Application\Model\Registries\registryOrderoverview;
-use D3\PdfDocuments\Modules\Application\Model\d3_Order_PdfDocuments;
 use OxidEsales\Eshop\Application\Controller\Admin\OrderOverview;
 use OxidEsales\Eshop\Application\Model\Order;
 use OxidEsales\Eshop\Core\DatabaseProvider;
@@ -23,16 +21,9 @@ use OxidEsales\Eshop\Core\Exception\DatabaseConnectionException;
 use OxidEsales\Eshop\Core\Registry;
 use OxidEsales\Eshop\Core\TableViewNameGenerator;
 
-if (false) {
-    class_alias(
-        d3_overview_controller_pdfdocuments_parent::class,
-        OrderOverview::class
-    );
-}
-
 class d3_overview_controller_pdfdocuments extends d3_overview_controller_pdfdocuments_parent
 {
-    /**
+	/**
      * @return bool
      * @throws DatabaseConnectionException
      */
@@ -45,12 +36,11 @@ class d3_overview_controller_pdfdocuments extends d3_overview_controller_pdfdocu
         $viewNameGenerator = Registry::get(TableViewNameGenerator::class);
         $sTable = $viewNameGenerator->getViewName("oxorderarticles");
 
-        $sQ = "select count(oxid) from {$sTable} where oxorderid = " . $masterDb->quote($sOrderId) . " and oxstorno = 0";
+        $sQ = "select count(oxid) from $sTable where oxorderid = " . $masterDb->quote($sOrderId) . " and oxstorno = 0";
         return (bool) $masterDb->getOne($sQ);
     }
 
     /**
-     * @throws noBaseObjectSetException
      * @throws noPdfHandlerFoundException
      * @throws pdfGeneratorExceptionAbstract
      */
@@ -58,7 +48,7 @@ class d3_overview_controller_pdfdocuments extends d3_overview_controller_pdfdocu
     {
         $soxId = $this->getEditObjectId();
         if ($soxId != "-1" && isset($soxId)) {
-            /** @var d3_Order_PdfDocuments $oOrder */
+            /** @var Order $oOrder */
             $oOrder = oxNew(Order::class);
             if ($oOrder->load($soxId)) {
                 $generator = oxNew( orderOverviewPdfGenerator::class );

README.en.md

@@ -12,8 +12,8 @@ The module can be easily extended to adapt existing documents or add new ones. E
 
 ## System requirements:
 
-- installed OXID eShop version from 6.1
-- PHP version for which installation packages are available (PHP 7 + 8)
+- installed OXID eShop version from 7.0 - 7.1
+- PHP version for which installation packages are available (PHP 8)
 - Installation via Composer
 
 ## Compatibility:
@@ -25,7 +25,7 @@ If the `OXID Invoice PDF` module is to be completely replaced by the `D3 PDF Doc
 ## Installation:
 
 ```bash
-composer require d3/pdfdocuments:^1.0 --update-no-dev
+composer require d3/pdfdocuments:^2.0 --update-no-dev
 ```
 
 Detailed installation instructions can be found [online](https://docs.oxidmodule.com/PDF-Dokumente/) and in the docs directory of this package. The module manual is also available there.

README.md

@@ -4,7 +4,7 @@
 
 PDF-Dokumentgenerator für OXID eShop
 
-Erstellen Sie unterschiedlichste statische oder dynamische PDF-Dokument auf Kopfdruck. Der Dokumentinhalt wird aus Smartytemplates erstellt.
+Erstellen Sie unterschiedliche statische oder dynamische PDF-Dokumente auf Kopfdruck. Der Dokumentinhalt wird aus Smartytemplates erstellt.
 
 An den Bestellungen Ihres OXID-Shops steht Ihnen die Erstellung von Rechnung und Lieferschein zur Verfügung.
 
@@ -12,8 +12,8 @@ Das Modul kann einfach erweitert werden, um bestehende Dokumente anzupassen oder
 
 ## Systemanforderungen:
 
-- installierter OXID eShop in Version ab 6.1
-- PHP-Version, für die Installationspakete verfügbar sind (PHP 7 + 8)
+- installierter OXID eShop in Version ab 7.0 - 7.1
+- PHP-Version, für die Installationspakete verfügbar sind (PHP 8)
 - Installation via Composer
 
 ## Kompatibilität:
@@ -25,7 +25,7 @@ Soll das `OXID Invoice-PDF`-Modul komplett vom `PDF Dokumente` Modul ersetzt wer
 ## Installation:
 
 ```bash
-composer require d3/pdfdocuments:^1.0 --update-no-dev
+composer require d3/pdfdocuments:^2.0 --update-no-dev
 ```
 
 Eine detaillierte Installationsanleitung finden Sie [online](https://docs.oxidmodule.com/PDF-Dokumente/) und im docs-Verzeichnis dieses Pakets. Dort ist ebenfalls das Modulhandbuch hinterlegt.

assets/picture.svg

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="201px" height="124px" viewBox="0 0 201 124" enable-background="new 0 0 201 124" xml:space="preserve">
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="47.0591" y1="67.5117" x2="47.0591" y2="54.6143">
+		<stop  offset="0.0056" style="stop-color:#3266A9"/>
+		<stop  offset="1" style="stop-color:#0099FF"/>
+	</linearGradient>
+	<path fill="url(#SVGID_1_)" d="M50.282,55.502c-0.784-0.592-2.104-0.888-3.961-0.888h-1.376l-2.283,12.898h1.779
+		c3.76,0,6.032-2.245,6.815-6.733c0.134-0.871,0.202-1.642,0.202-2.313C51.457,57.081,51.064,56.093,50.282,55.502z"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="65.9609" y1="49.104" x2="65.9609" y2="36.9434">
+		<stop  offset="0.0056" style="stop-color:#3266A9"/>
+		<stop  offset="1" style="stop-color:#0099FF"/>
+	</linearGradient>
+	<path fill="url(#SVGID_2_)" d="M65.72,40.482c1.074,0,1.611,0.381,1.611,1.143c0,0.701-0.321,1.201-0.962,1.5
+		c-0.209,0.119-0.366,0.194-0.471,0.224c-0.065,0.019-0.158,0.037-0.271,0.056c1.98,1.621,3.702,3.544,5.097,5.699
+		c0.117-0.321,0.21-0.658,0.277-1.013l0.09-1.008c0-1.223-0.568-2.081-1.701-2.574c0.776-0.402,1.376-0.94,1.801-1.611
+		c0.425-0.672,0.638-1.418,0.638-2.239c0-0.642-0.198-1.265-0.593-1.868c-0.396-0.605-0.98-1.049-1.757-1.333
+		c-0.433-0.193-0.876-0.328-1.332-0.402c-0.456-0.075-1.003-0.113-1.645-0.113c-0.82,0-1.663,0.124-2.529,0.37
+		c-0.865,0.246-1.6,0.563-2.204,0.952s-1.13,0.907-1.578,1.557c-0.036,0.052-0.066,0.109-0.101,0.163
+		c1.196,0.534,2.341,1.163,3.426,1.874C63.947,40.943,64.68,40.482,65.72,40.482z"/>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="50.0576" y1="87.0566" x2="50.0576" y2="37.8525">
+		<stop  offset="0.0056" style="stop-color:#3266A9"/>
+		<stop  offset="1" style="stop-color:#0099FF"/>
+	</linearGradient>
+	<path fill="url(#SVGID_3_)" d="M70.725,49.104c-0.433,1.189-1.208,2.147-2.331,2.871c-1.425,0.918-3.182,1.377-5.271,1.377
+		c-1.179,0-2.175-0.176-2.988-0.525c-0.813-0.35-1.444-0.864-1.891-1.543c-0.448-0.678-0.671-1.481-0.671-2.405l0.022-0.694
+		l0.156-0.693h4.367l-0.028,0.179v0.179v0.246c0,1.164,0.628,1.746,1.884,1.746c0.635,0,1.201-0.217,1.696-0.649
+		c0.495-0.434,0.742-0.94,0.742-1.522c0-0.522-0.194-0.887-0.582-1.097c-0.329-0.208-1.007-0.313-2.036-0.313l0.47-2.754
+		l1.141-0.067c0.083-0.011,0.154-0.022,0.221-0.033c-0.674-0.551-1.378-1.067-2.11-1.546c-0.044,0.096-0.087,0.195-0.125,0.302
+		h-4.185c0.192-0.837,0.49-1.56,0.884-2.175c-3.064-1.372-6.46-2.133-10.034-2.133c-13.588,0-24.603,11.014-24.603,24.601
+		c0,13.59,11.015,24.604,24.603,24.604S74.66,76.043,74.66,62.453C74.66,57.532,73.214,52.949,70.725,49.104z M59.413,59.233
+		l-0.168,1.275c-0.538,2.953-1.511,5.404-2.921,7.35c-1.298,1.835-3.016,3.179-5.153,4.028c-2.138,0.851-4.494,1.274-7.067,1.274
+		H33.731l4.264-24.198h10.441c1.141,0,2.204,0.073,3.189,0.218c0.984,0.146,1.868,0.364,2.651,0.655
+		c1.611,0.537,2.887,1.471,3.827,2.802c0.94,1.332,1.41,2.992,1.41,4.984L59.413,59.233z"/>
+</g>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="107.3027" y1="105.8555" x2="93.0727" y2="16.0106">
+	<stop  offset="0" style="stop-color:#B2B2B2;stop-opacity:0"/>
+	<stop  offset="0.2" style="stop-color:#B2B2B2"/>
+	<stop  offset="0.8" style="stop-color:#B2B2B2"/>
+	<stop  offset="1" style="stop-color:#B2B2B2;stop-opacity:0"/>
+</linearGradient>
+<rect x="99.875" y="14.933" fill="url(#SVGID_4_)" width="0.625" height="92"/>
+<script  xmlns=""></script>
+<path d="M126.531,43.25c0-3.446,2.801-6.25,6.25-6.25h15.624v12.5c0,1.729,1.398,3.125,3.126,3.125h12.5v14.063h-20.313
+	c-3.448,0-6.25,2.801-6.25,6.25V87h-4.688c-3.449,0-6.25-2.801-6.25-6.248V43.25z M164.031,49.5h-12.5V37L164.031,49.5z
+	 M143.719,71.375h3.125c3.018,0,5.469,2.451,5.469,5.469s-2.451,5.471-5.469,5.471h-1.563v3.123c0,0.861-0.702,1.563-1.563,1.563
+	c-0.861,0-1.563-0.701-1.563-1.563v-4.686v-7.814C142.156,72.076,142.857,71.375,143.719,71.375z M146.844,79.188
+	c1.3,0,2.343-1.043,2.343-2.344c0-1.299-1.043-2.344-2.343-2.344h-1.563v4.688H146.844z M156.218,71.375h3.125
+	c2.589,0,4.688,2.102,4.688,4.688v6.252c0,2.586-2.1,4.686-4.688,4.686h-3.125c-0.86,0-1.562-0.701-1.562-1.563v-12.5
+	C154.656,72.076,155.357,71.375,156.218,71.375z M159.343,83.875c0.861,0,1.563-0.703,1.563-1.561v-6.252
+	c0-0.861-0.702-1.563-1.563-1.563h-1.563v9.375H159.343z M167.155,72.938c0-0.861,0.703-1.563,1.563-1.563h4.688
+	c0.861,0,1.563,0.701,1.563,1.563s-0.701,1.563-1.563,1.563h-3.124v3.125h3.124c0.861,0,1.563,0.703,1.563,1.563
+	s-0.701,1.564-1.563,1.564h-3.124v4.686c0,0.861-0.703,1.563-1.563,1.563c-0.859,0-1.563-0.701-1.563-1.563v-6.25V72.938z"/>
+</svg>

composer.json

@@ -26,19 +26,19 @@
       "blacklist-filter": [
         "composer.json",
         "docs/**/*.*"
-      ],
-      "target-directory": "d3/pdfdocuments"
+      ]
     }
   },
   "require": {
-    "php": "^7.0 || ^8.0",
-    "oxid-esales/oxideshop-ce": "6.3 - 6.14",
-    "spipu/html2pdf": "^5.2",
-    "d3/modcfg": "^5.3.6.000 || ^6"
+    "php": "^8.0",
+    "oxid-esales/oxideshop-ce": "7.0 - 7.1",
+    "spipu/html2pdf": "~5.2.8",
+    "d3/modcfg": "^7.1",
+    "beberlei/assert": "^3.3.2"
   },
   "autoload": {
     "psr-4": {
-      "D3\\PdfDocuments\\": "../../../source/modules/d3/pdfdocuments"
+      "D3\\PdfDocuments\\": ""
     }
   }
 }

docs/daux/changelog/010_Changelog.md

@@ -2,22 +2,34 @@
 title: Changelog
 ---
 
-## 1.0.3.1 - (2023-05-09)
+All notable changes to this project will be documented in this file.
 
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased](https://git.d3data.de/D3Public/pdfdokumente/compare/2.0.0...rel_2.x)
+
+## [2.0.0](https://git.d3data.de/D3Public/pdfdokumente/compare/1.0.4.0...2.0.0) - 2024-08-XX
+### Added
+- installierbar in OXID 7.0 && 7.1 (CE 7.0.x - 7.1.x)
+
+## [1.0.4.0](https://git.d3data.de/D3Public/pdfdokumente/compare/1.0.3.1...1.0.4.0) - 2023-12-22
+### Added
+- installierbar in OXID 6.5.2 + 6.5.3 (CE 6.14)
+- Modullogo
+
+### Changed
+- behandelt fehlende Bestellung bei auf Bestellungen basierenden Dokumenten
+
+## [1.0.3.1](https://git.d3data.de/D3Public/pdfdokumente/compare/1.0.3.0...1.0.3.1) - 2023-05-09
 ### Fixed
-- fix multiple documents at once
-
----
-
-## 1.0.3.0 - (2023-01-04)
+- kann mehrere Dokumente auf einmal generieren
 
+## [1.0.3.0](https://git.d3data.de/D3Public/pdfdokumente/compare/1.0.2.0...1.0.3.0) - 2023-01-04
 ### Added
 - installierbar in OXID 6.4 und 6.5
 
----
-
-## 1.0.2.0 - (2021-04-30)
-
+## [1.0.2.0](https://git.d3data.de/D3Public/pdfdokumente/compare/1.0.1.0...1.0.2.0) - 2021-04-30
 ### Added
 - installierbar in OXID 6.2.4 und 6.3.0
 - Dateinamen werden auf Gültigkeit hin korrigiert
@@ -25,17 +37,11 @@ title: Changelog
 ### Fixed
 - Setzen der Rechnungsnummer setzt den "neue Bestellung"-Status nicht zurück
 
----
-
-## 1.0.1.0 - (2020-08-20)
-
+## [1.0.1.0](https://git.d3data.de/D3Public/pdfdokumente/compare/1.0.0.0...1.0.1.0) - 2020-08-20
 ### Changed
 - Dokumentid für "Rechnung ohne Logo" angepasst
 
----
-
-## 1.0.0.0 - (2020-08-13)
-
+## [1.0.1.0](https://git.d3data.de/D3Public/pdfdokumente/tag/1.0.0.0) - 2020-08-13
 #### Added
 - Framework zur Erstellung unterschiedlichster PDF Dokumente
 - ermöglicht Generierung von Rechnungen und Lieferscheinen für Bestellungen aus dem Adminbereich

docs/daux/config.json

@@ -1,9 +1,9 @@
 {
     "title": "<i class='fab fa-d3 d3fa-color-blue'></i> PDF Dokumente",
-    "moduleversion": "1.0.3.1",
+    "moduleversion": "2.0.0",
     "titledesc": "für den Oxid eShop",
     "author": "D³ Data Development",
-    "moduledate": "09.05.2023",
+    "moduledate": "12.09.2024",
     "editors": "",
     "tagline": "",
     "image": "",

docs/daux/installation/010_Anforderungen/010_Systemanforderungen.md

@@ -3,17 +3,15 @@ title: Systemanforderungen
 ---
 
 * PHP Version
-    * 7.0.x bis 8.x
+    * 8.x
 * Shopversionen / -editionen
-    * OXID eShop Community Edition (CE), Professional Edition (PE) oder Enterprise Edition (EE) in Compilation Version 
-        * 6.1.x
-        * 6.2.x
-        * 6.3.x
-        * 6.4.x
-        * 6.5.x
+    * OXID eShop Community Edition (CE), Professional Edition (PE) oder Enterprise Edition (EE) in Compilation Version
+        * 7.0.x
+        * 7.1.x
 * Themes
     * Diese Modul bindet sich nicht in Frontendthemes ein und ist daher davon unabhängig
-* (D3) Modul-Connector ([kostenfrei bei D3 erhältlich](https://www.oxidmodule.com/connector/)) ab Version 5.3.6.0 
+* (D3) Modul-Connector ([kostenfrei bei D3 erhältlich](https://www.oxidmodule.com/connector/)) ab Version 7.1
 * Template-Engine
-    * Smarty
+    * Smarty ( Ungetestet! )
+    * Twig
 * Installation via [Composer](https://getcomposer.org)

docs/daux/manual/010_Funktionen/010_Funktionen.md

@@ -2,7 +2,7 @@
 title: Funktionen
 ---
 
-Erstellen Sie unterschiedlichste statische oder dynamische PDF-Dokument auf Kopfdruck. Der Dokumentinhalt wird aus Smartytemplates erstellt.
+Erstellen Sie unterschiedlichste statische oder dynamische PDF-Dokument auf Kopfdruck. Der Dokumentinhalt wird aus Twigtemplates erstellt.
 
 An den Bestellungen Ihres OXID-Shops steht Ihnen die Erstellung von Rechnung und Lieferschein zur Verfügung.
 

docs/daux/manual/020_Programmierung/010_Anpassungen.md

@@ -2,7 +2,7 @@
 title: Anpassungen an bestehenden Dokumenten
 ---
 
-Die Dokumente werden aus Smartytemplates erstellt, die Sie im `Application/views/tpl/documents` finden.
+Die Dokumente werden aus Twigtemplates erstellt, die Sie im `views/twig/documents` finden. Die entsprechenden Smarty Pendants sind unter `views/smarty/documents`.
 
 Für Änderungen einzelner Dokumentbereiche können Sie die darin notierten Templateblöcke in einem eigenen Modul überladen und deren Inhalt so verändern oder ergänzen. So müssen Sie das Originalmodul nicht verändern.
 

docs/daux/manual/020_Programmierung/020_Templatedesign.md

@@ -14,9 +14,10 @@ Layouts können mit inline CSS-Styles definiert werden. Die Einbindung externer
 
 Beachten Sie bitte, dass auch nur ein CSS-Subset unterstützt wird. Mit etwas CSS-Kreativität sollten sich die üblichen Formatierungen dennoch deutlich einfacher umsetzen lassen, als dies direkt in PHP-Programmierung möglich wäre.
 
-## Smarty
+## Twig
 
-Innerhalb der Templates steht Ihnen die komplette Smarty-Funktionalität zur Verfügung. 
+Innerhalb der Templates steht Ihnen die komplette Twig-Funktionalität zur Verfügung.
+Smarty wird perspektivisch noch nachgereich.
 
 ## Debug
 

metadata.php

@@ -8,6 +8,7 @@
  * @link          http://www.oxidmodule.com
  */
 
+use D3\PdfDocuments\Application\Model\Constants as Constants;
 use D3\PdfDocuments\Modules\Application\Controller\d3_overview_controller_pdfdocuments;
 use OxidEsales\Eshop\Application\Controller\Admin\OrderOverview;
 
@@ -18,73 +19,85 @@ $sMetadataVersion = '2.1';
 
 $logo = '<img src="https://logos.oxidmodule.com/d3logo.svg" alt="(D3)" style="height:1em;width:1em">';
 
-$sModuleId = 'd3PdfDocuments';
 /**
  * Module information
  */
 $aModule = [
-    'id'            => $sModuleId,
+    'id'            => Constants::OXID_MODULE_ID,
     'title'         => [
         'de'        => $logo.' PDF-Dokumente',
         'en'        => $logo.' PDF documents',
     ],
-    'version'       => '1.0.3.1',
-    'author'        => 'D&sup3; Data Development (Inh.: Thomas Dartsch)',
+    'version'       => '2.0.0',
+    'author'        => $logo.' Data Development (Inh.: Thomas Dartsch)',
     'email'         => 'support@shopmodule.com',
-    'url'           => 'http://www.oxidmodule.com/',
+    'url'           => 'https://www.oxidmodule.com/',
     'extend'        => [
         OrderOverview::class    => d3_overview_controller_pdfdocuments::class
     ],
     'controllers'   => [],
-    'thumbnail'     => 'logo.png',
+    'thumbnail'     => 'picture.svg',
     'templates'     => [
-        'd3orderoverview_pdfform.tpl'   => 'd3/pdfdocuments/Application/views/tpl/admin/orderoverview_pdfform.tpl',
+        //Admin
+        '@' . Constants::OXID_MODULE_ID . '/admin/d3orderoverview_pdfform.tpl'                                      => 'views/smarty/admin/orderoverview_pdfform.tpl',
 
-        'd3deliverynote_pdf.tpl'        => 'd3/pdfdocuments/Application/views/tpl/documents/deliverynote/deliverynote.tpl',
-        'd3deliverynoteNoLogo_pdf.tpl'  => 'd3/pdfdocuments/Application/views/tpl/documents/deliverynote/deliverynoteNoLogo.tpl',
-        'd3delnote_pdf_informations.tpl'=> 'd3/pdfdocuments/Application/views/tpl/documents/deliverynote/inc/informations.tpl',
-        'd3delnote_pdf_recipient.tpl'   => 'd3/pdfdocuments/Application/views/tpl/documents/deliverynote/inc/recipientAddress.tpl',
-        'd3delnote_pdf_salutation.tpl'  => 'd3/pdfdocuments/Application/views/tpl/documents/deliverynote/inc/salutation.tpl',
-        'd3delnote_pdf_conclusion.tpl'  => 'd3/pdfdocuments/Application/views/tpl/documents/deliverynote/inc/conclusion.tpl',
+        // Frontend - Flow - Deliverynote
+        '@' . Constants::OXID_MODULE_ID . '/documents/deliverynote/deliverynote.tpl'                  => 'views/smarty/flow/documents/deliverynote/deliverynote.tpl',
+        '@' . Constants::OXID_MODULE_ID . '/documents/deliverynote/deliverynoteNoLogo.tpl'     => 'views/smarty/flow/documents/deliverynote/deliverynoteNoLogo.tpl',
+        '@' . Constants::OXID_MODULE_ID . '/documents/deliverynote/informations.tpl'  => 'views/smarty/flow/documents/deliverynote/inc/informations.tpl',
+        '@' . Constants::OXID_MODULE_ID . '/documents/deliverynote/recipientAddress.tpl'         => 'views/smarty/flow/documents/deliverynote/inc/recipientAddress.tpl',
+        '@' . Constants::OXID_MODULE_ID . '/documents/deliverynote/salutation.tpl'       => 'views/smarty/flow/documents/deliverynote/inc/salutation.tpl',
+        '@' . Constants::OXID_MODULE_ID . '/documents/deliverynote/conclusion.tpl'       => 'views/smarty/flow/documents/deliverynote/inc/conclusion.tpl',
 
-        'd3invoice_pdf.tpl'             => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/invoice.tpl',
-        'd3invoiceNoLogo_pdf.tpl'       => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/invoiceNoLogo.tpl',
-        'd3invoice_pdf_informations.tpl'=> 'd3/pdfdocuments/Application/views/tpl/documents/invoice/inc/informations.tpl',
-        'd3invoice_pdf_salutation.tpl'  => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/inc/salutation.tpl',
-        'd3invoice_pdf_conclusion.tpl'  => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/inc/conclusion.tpl',
-        'd3invoice_pdf_payinfo.tpl'     => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/inc/payinfo.tpl',
+        // Frontend - Flow - Invoice
+        '@' . Constants::OXID_MODULE_ID . '/documents/invoice/invoice.tpl'                            => 'views/smarty/flow/documents/invoice/invoice.tpl',
+        '@' . Constants::OXID_MODULE_ID . '/documents/invoice/invoiceNoLogo.tpl'               => 'views/smarty/flow/documents/invoice/invoiceNoLogo.tpl',
+        '@' . Constants::OXID_MODULE_ID . '/documents/invoice/informations.tpl'    => 'views/smarty/flow/documents/invoice/inc/informations.tpl',
+        '@' . Constants::OXID_MODULE_ID . '/documents/invoice/salutation.tpl'        => 'views/smarty/flow/documents/invoice/inc/salutation.tpl',
+        '@' . Constants::OXID_MODULE_ID . '/documents/invoice/conclusion.tpl'       => 'views/smarty/flow/documents/invoice/inc/conclusion.tpl',
+        '@' . Constants::OXID_MODULE_ID . '/documents/invoice/payinfo.tpl'            => 'views/smarty/flow/documents/invoice/inc/payinfo.tpl',
 
-        'd3pdfbase.tpl'                 => 'd3/pdfdocuments/Application/views/tpl/documents/inc/page/base.tpl',
-        'd3pdfheader.tpl'               => 'd3/pdfdocuments/Application/views/tpl/documents/inc/page/header.tpl',
-        'd3pdffooter.tpl'               => 'd3/pdfdocuments/Application/views/tpl/documents/inc/page/footer.tpl',
-        'd3pdfreturnaddress.tpl'        => 'd3/pdfdocuments/Application/views/tpl/documents/inc/page/returnaddress.tpl',
+        // Frontend - Flow - Inc - Page
+        '@' . Constants::OXID_MODULE_ID . '/documents/inc/page/base.tpl'                  => 'views/smarty/flow/documents/inc/page/base.tpl',
+        '@' . Constants::OXID_MODULE_ID . '/documents/inc/page/header.tpl'              => 'views/smarty/flow/documents/inc/page/header.tpl',
+        '@' . Constants::OXID_MODULE_ID . '/documents/inc/page/footer.tpl'                => 'views/smarty/flow/documents/inc/page/footer.tpl',
+        '@' . Constants::OXID_MODULE_ID . '/documents/inc/page/returnaddress.tpl'  => 'views/smarty/flow/documents/inc/page/returnaddress.tpl',
 
-        'd3pdfaddressarea.tpl'          => 'd3/pdfdocuments/Application/views/tpl/documents/inc/elements/addressarea.tpl',
-        'd3pdfrecipientaddress.tpl'     => 'd3/pdfdocuments/Application/views/tpl/documents/inc/elements/recipientAddress.tpl',
-        'd3pdfinformations.tpl'         => 'd3/pdfdocuments/Application/views/tpl/documents/inc/elements/informations.tpl',
-        'd3pdfdeladdress.tpl'           => 'd3/pdfdocuments/Application/views/tpl/documents/inc/elements/deliveryaddress.tpl',
-        'd3pdfarticlelist.tpl'          => 'd3/pdfdocuments/Application/views/tpl/documents/inc/elements/articlelist.tpl',
-        'd3pdfarticlecostsummary.tpl'   => 'd3/pdfdocuments/Application/views/tpl/documents/inc/elements/articlecostssummary.tpl',
-        'd3pdffoldmarks.tpl'            => 'd3/pdfdocuments/Application/views/tpl/documents/inc/elements/foldmarks.tpl',
+        // Frontend - Flow - Inc - Elements
+        '@' . Constants::OXID_MODULE_ID . '/documents/inc/elements/addressarea.tpl'              => 'views/smarty/flow/documents/inc/elements/addressarea.tpl',
+        '@' . Constants::OXID_MODULE_ID . '/documents/inc/elements/recipientAddress.tpl'       => 'views/smarty/flow/documents/inc/elements/recipientAddress.tpl',
+        '@' . Constants::OXID_MODULE_ID . '/documents/inc/elements/informations.tpl'             => 'views/smarty/flow/documents/inc/elements/informations.tpl',
+        '@' . Constants::OXID_MODULE_ID . '/documents/inc/elements/deliveryaddress.tpl'                => 'views/smarty/flow/documents/inc/elements/deliveryaddress.tpl',
+        '@' . Constants::OXID_MODULE_ID . '/documents/inc/elements/articlelist.tpl'                   => 'views/smarty/flow/documents/inc/elements/articlelist.tpl',
+        '@' . Constants::OXID_MODULE_ID . '/documents/inc/elements/articlecostssummary.tpl' => 'views/smarty/flow/documents/inc/elements/articlecostssummary.tpl',
+        '@' . Constants::OXID_MODULE_ID . '/documents/inc/elements/foldmarks.tpl'                 => 'views/smarty/flow/documents/inc/elements/foldmarks.tpl',
 
-        'd3pdfstyles.css'               => 'd3/pdfdocuments/out/src/css/pdfStyling.css',
-
-        'd3pdfrulers.tpl'               => 'd3/pdfdocuments/Application/views/tpl/documents/inc/helper/rulers.tpl',
+        // Frontend - Flow - Inc - Helper
+        '@' . Constants::OXID_MODULE_ID . '/documents/inc/helper/rulers.tpl'                               => 'views/smarty/flow/documents/inc/helper/rulers.tpl',
+	    
+	    // Frontend - Flow - Inc - Styles
+        '@' . Constants::OXID_MODULE_ID . '/assets/d3pdfstyles.css'                                                 => 'assets/out/src/css/pdfStyling.css',
     ],
     'events'                => [],
     'blocks'                => [
         [
             'template' => 'order_overview.tpl',
             'block'    => 'admin_order_overview_export',
-            'file'     => 'Application/views/admin/blocks/order_overview.tpl'
+            'file'     => 'views/smarty/blocks/order_overview.tpl'
         ]
     ],
     'settings' => [
         [
-            'group' => $sModuleId.'main', 
-            'name' => $sModuleId.'bDev', 
+            'group' => Constants::OXID_MODULE_ID.'main',
+            'name' => Constants::OXID_MODULE_ID.'bDev',
             'type' => 'bool',
             'value' => false
+        ],
+        [
+            'group' => Constants::OXID_MODULE_ID.'main',
+            'name' => Constants::OXID_MODULE_ID.'_sAlternativePdfLogoName',
+            'type' => 'str',
+            'value' => ''
         ]
     ]
 ];

views/smarty/blocks/order_overview.tpl

@@ -0,0 +1,3 @@
+[{$smarty.block.parent}]
+
+[{include file="@d3PdfDocuments/admin/d3orderoverview_pdfform.tpl"}]

views/smarty/documents/deliverynote/deliverynote.tpl

@@ -0,0 +1,46 @@
+[{assign var="pagePadding"   value=","|explode:"45,15,30,25"}] [{* top, right, bottom, left *}]
+[{assign var="showLogo"      value=$showLogo|default:true}]
+
+[{capture append="pdfBlock_style"}]
+    [{block name="pdfStyles"}]
+        [{include file="@d3PdfDocuments/assets/d3pdfstyles.css"}]
+    [{/block}]
+[{/capture}]
+
+[{capture append="pdfBlock_header"}]
+    [{block name="pdfHeader"}]
+        [{include file="@d3PdfDocuments/documents/inc/page/header" showLogo=$showLogo}]
+    [{/block}]
+[{/capture}]
+
+[{capture append="pdfBlock_content"}]
+    [{include file="@d3PdfDocuments/documents/inc/elements/foldmarks" pagePadding=$pagePadding}]
+
+    [{block name="pdfAddressArea"}]
+        [{include file="@d3PdfDocuments/documents/inc/elements/addressarea" addressfile="@d3PdfDocuments/documents/deliverynote/recipientAddress"}]
+    [{/block}]
+
+    [{block name="pdfInformations"}]
+        [{include file="@d3PdfDocuments/documents/inc/elements/informations" documentinformationfile="@d3PdfDocuments/documents/deliverynote/informations"}]
+    [{/block}]
+
+    [{block name="pdfSalutation"}]
+        [{include file="@d3PdfDocuments/documents/deliverynote/salutation"}]
+    [{/block}]
+
+    [{block name="pdfArticleList"}]
+        [{include file="@d3PdfDocuments/documents/inc/elements/articlelist" showPrices=false}]
+    [{/block}]
+
+    [{block name="pdfConclusion"}]
+        [{include file="@d3PdfDocuments/documents/deliverynote/conclusion.tpl"}]
+    [{/block}]
+[{/capture}]
+
+[{capture append="pdfBlock_footer"}]
+    [{block name="pdfFooter"}]
+        [{include file="@d3PdfDocuments/documents/inc/page/footer" pagePadding=$pagePadding}]
+    [{/block}]
+[{/capture}]
+
+[{include file="@d3PdfDocuments/documents/inc/page/base" pagePadding=$pagePadding}]

views/smarty/documents/deliverynote/deliverynoteNoLogo.tpl

@@ -0,0 +1 @@
+[{include file="@d3PdfDocuments/documents/deliverynote/deliverynote" showLogo=false}]

views/smarty/documents/inc/elements/addressarea.tpl

@@ -0,0 +1,13 @@
+[{assign var="backaddressfile" value=$backaddressfile|default:"@d3PdfDocuments/documents/inc/page/returnaddress"}]
+[{assign var="addressfile" value=$addressfile|default:"@d3PdfDocuments/documents/inc/elements/recipientAddress"}]
+
+<div class="addressarea">
+    <div class="returnAddress">
+        <div>
+            [{include file=$backaddressfile}]
+        </div>
+    </div>
+    <div class="recipientAddress">
+        [{include file=$addressfile}]
+    </div>
+</div>

views/smarty/documents/inc/elements/articlelist.tpl

@@ -54,7 +54,7 @@
         <nobreak>
             <table class="article_costs_table">
                 [{block name="d3_article_costs_summary"}]
-                    [{include file="d3pdfarticlecostsummary.tpl"}]
+                    [{include file="@d3PdfDocuments/documents/inc/elements/articlecostssummary"}]
                 [{/block}]
             </table>
         </nobreak>

views/smarty/documents/inc/elements/foldmarks.tpl

@@ -1,7 +1,7 @@
 [{assign var="defaultPagePadding" value=","|explode:"45,15,25,25"}] [{* top, right, bottom, left *}]
 [{assign var="pagePadding" value=$pagePadding|default:$defaultPagePadding}]
 
-<style type="text/css">
+<style>
     .marks {
         position: absolute;
         left: [{math equation="left - padding" left=5 padding=$pagePadding.3}]mm ;

views/smarty/documents/inc/helper/rulers.tpl

@@ -2,9 +2,9 @@
 [{assign var="pagePadding" value=$pagePadding|default:$defaultPagePadding}]
 
 [{* rulers *}]
-[{* include file="d3pdfrulers.tpl" pagePadding=$pagePadding *}]
+[{* include file="@d3PdfDocuments/documents/inc/helper/rulers" pagePadding=$pagePadding *}]
 
-<style type="text/css">
+<style>
     .rulerItemHorizontal {
         position: absolute;
         top: -[{$pagePadding.0}]mm;

views/smarty/documents/inc/page/base.tpl

@@ -4,7 +4,7 @@
 [{assign var="defaultPagePadding" value=","|explode:"45,15,25,25"}] [{* top, right, bottom, left *}]
 [{assign var="pagePadding" value=$pagePadding|default:$defaultPagePadding}]
 
-<style type="text/css">
+<style>
     [{foreach from=$pdfBlock_style item="_block"}]
         [{$_block}]
     [{/foreach}]

views/smarty/documents/invoice/inc/conclusion.tpl

@@ -5,7 +5,7 @@
                 [{oxmultilang ident="D3_PDFDOCUMENTS_USED_PAYMENTMETHOD" suffix="COLON"}]
                 [{$payment->getFieldData('oxdesc')}]<br>
 
-                [{include file="d3invoice_pdf_payinfo.tpl"}]
+                [{include file="@d3PdfDocuments/documents/invoice/payinfo"}]
             </div>
         [{/block}]
 

views/smarty/documents/invoice/invoice.tpl

@@ -0,0 +1,51 @@
+[{assign var="pagePadding"   value=","|explode:"45,15,30,25"}] [{* top, right, bottom, left *}]
+[{assign var="showLogo"      value=$showLogo|default:true}]
+
+[{capture append="pdfBlock_style"}]
+    [{block name="pdfStyles"}]
+        [{include file="@d3PdfDocuments/assets/d3pdfstyles.css"}]
+    [{/block}]
+[{/capture}]
+
+[{capture append="pdfBlock_header"}]
+    [{block name="pdfHeader"}]
+        [{include file="@d3PdfDocuments/documents/inc/page/header" showLogo=$showLogo}]
+    [{/block}]
+[{/capture}]
+
+[{capture append="pdfBlock_content"}]
+    [{* include file="@d3PdfDocuments/documents/inc/helper/rulers" pagePadding=$pagePadding *}]
+    [{include file="@d3PdfDocuments/documents/inc/elements/foldmarks" pagePadding=$pagePadding}]
+
+    [{block name="pdfAddressArea"}]
+        [{include file="@d3PdfDocuments/documents/inc/elements/addressarea"}]
+    [{/block}]
+
+    [{block name="pdfInformations"}]
+        [{include file="@d3PdfDocuments/documents/inc/elements/informations" documentinformationfile="@d3PdfDocuments/documents/invoice/informations"}]
+    [{/block}]
+
+    [{block name="pdfDeliveryAddress"}]
+        [{include file="@d3PdfDocuments/documents/inc/elements/deliveryaddress"}]
+    [{/block}]
+
+    [{block name="pdfSalutation"}]
+        [{include file="@d3PdfDocuments/documents/invoice/salutation"}]
+    [{/block}]
+
+    [{block name="pdfArticleList"}]
+        [{include file="@d3PdfDocuments/documents/inc/elements/articlelist"}]
+    [{/block}]
+
+    [{block name="pdfConclusion"}]
+        [{include file="@d3PdfDocuments/documents/invoice/conclusion"}]
+    [{/block}]
+[{/capture}]
+
+[{capture append="pdfBlock_footer"}]
+    [{block name="pdfFooter"}]
+        [{include file="@d3PdfDocuments/documents/inc/page/footer" pagePadding=$pagePadding}]
+    [{/block}]
+[{/capture}]
+
+[{include file="@d3PdfDocuments/documents/inc/page/base" pagePadding=$pagePadding}]

views/smarty/documents/invoice/invoiceNoLogo.tpl

@@ -0,0 +1 @@
+[{include file="@d3PdfDocuments/documents/invoice/invoice" showLogo=false}]

views/twig/admin/orderoverview_pdfform.html.twig

@@ -0,0 +1,46 @@
+{% if edit and oView.d3CanExport() %}
+    <br>
+    <form name="d3CreatePdf" id="d3CreatePdf" action="{{ oViewConf.getSelfLink() }}" method="post" target="d3ExpPDF">
+        {{ oViewConf.getHiddenSid()|raw }}
+        <input type="hidden" name="cl" value="order_overview">
+        <input type="hidden" name="fnc" value="d3CreatePDF">
+        <input type="hidden" name="oxid" value="{{ oxid }}">
+        <fieldset style="padding: 5px">
+            <legend>{{ translate({ ident: "D3_PDFDOCUMENTS" }) }}</legend>
+            <table style="width: 100%">
+                <tr>
+                    <td rowspan="3">
+                        <img src="{{ oViewConf.getModuleUrl('d3PdfDocuments', 'out/img/pdf.svg') }}" style="height:4em;width:4em" alt="{{ translate({ ident: "D3_PDFDOCUMENTS" }) }}">
+                    </td>
+                    <td style="vertical-align: top; text-align: right" class="edittext">
+                        <label for="pdftype">{{ translate({ ident: "D3_PDFDOCUMENTS_PDF_TYPE" }) }}</label>:&nbsp;
+                        <select id="pdftype" name="pdftype" class="editinput" style="width:80px;">
+                            {% block d3_pdfdocuments_order_overview_pdfTypeOptions %}
+                                {% set generatorList = oView.d3getGeneratorList() %}
+                                {% for generator in generatorList.getList() %}
+                                    <option value="{{ generator.getRequestId() }}">{{ translate({ ident: generator.getTitleIdent() }) }}</option>
+                                {% endfor %}
+                            {% endblock %}
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td style="text-align: right" class="edittext">
+                        <label for="pdflanguage">{{ translate({ ident: "D3_PDFDOCUMENTS_LANGUAGE" }) }}</label>
+                        <select id="pdflanguage" name="pdflanguage" class="saveinnewlanginput" style="width:80px;">
+                            {% for lang, slang in alangs %}
+                                <option value="{{ lang }}" {% if lang == "0" %}SELECTED{% endif %}>{{ slang }}</option>
+                            {% endfor %}
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td style="text-align: right" class="edittext"><br/>
+                        <input type="submit" class="edittext" name="save" value="{{ translate({ ident: "D3_PDFDOCUMENTS_PDF_GENERATE" }) }}">
+                        <iframe name="d3ExpPDF" style="width: 0; height: 0; border: none; display:none;"></iframe>
+                    </td>
+                </tr>
+            </table>
+        </fieldset>
+    </form>
+{% endif %}

views/twig/documents/deliverynote/deliverynote.html.twig

@@ -0,0 +1,47 @@
+{% set pagePadding = "45,15,25,25"|split(",") %} {# top, right, bottom, left #}
+{% set showLogo = showLogo|default(1) %}
+
+{% set pdfBlock_style %}
+    {% block pdfStyles %}
+        {{ style({ include: oViewConf.getModuleUrl('d3PdfDocuments', 'out/src/css/pdfStyling.css') }) }}
+        {{ style() }}
+    {% endblock %}
+{% endset %}
+
+{% set pdfBlock_header %}
+    {% block pdfHeader %}
+        {% include "@d3PdfDocuments/documents/inc/page/header.html.twig" with {showLogo: showLogo} %}
+    {% endblock %}
+{% endset %}
+
+{% set pdfBlock_content %}
+    {% include "@d3PdfDocuments/documents/inc/elements/foldmarks.html.twig" with {pagePadding: pagePadding} %}
+
+    {% block pdfAddressArea %}
+        {% include "@d3PdfDocuments/documents/inc/elements/addressarea.html.twig" with {addressfile: "@d3PdfDocuments/documents/deliverynote/inc/recipientAddress.html.twig"} %}
+    {% endblock %}
+
+    {% block pdfInformations %}
+        {% include "@d3PdfDocuments/documents/inc/elements/informations.html.twig" with {documentinformationfile: "@d3PdfDocuments/documents/deliverynote/inc/informations.html.twig"} %}
+    {% endblock %}
+
+    {% block pdfSalutation %}
+        {% include "@d3PdfDocuments/documents/deliverynote/inc/salutation.html.twig" %}
+    {% endblock %}
+
+    {% block pdfArticleList %}
+        {% include "@d3PdfDocuments/documents/inc/elements/articlelist.html.twig" with {showPrices: 0} %}
+    {% endblock %}
+
+    {% block pdfConclusion %}
+        {% include "@d3PdfDocuments/documents/deliverynote/inc/conclusion.html.twig" %}
+    {% endblock %}
+{% endset %}
+
+{% set pdfBlock_footer %}
+    {% block pdfFooter %}
+        {% include "@d3PdfDocuments/documents/inc/page/footer.html.twig" with {pagePadding: pagePadding} %}
+    {% endblock %}
+{% endset %}
+
+{% include "@d3PdfDocuments/documents/inc/page/base.html.twig" with {pagePadding: pagePadding} %}

views/twig/documents/deliverynote/deliverynoteNoLogo.html.twig

@@ -0,0 +1 @@
+{% include "@d3PdfDocuments/documents/deliverynote/deliverynote.html.twig" with {showLogo: 0} %}

views/twig/documents/deliverynote/inc/conclusion.html.twig

@@ -0,0 +1,6 @@
+{% block conclusion %}
+    <nobreak>
+        {% block conclusion_thankyou %}
+        {% endblock %}
+    </nobreak>
+{% endblock %}

views/twig/documents/deliverynote/inc/informations.html.twig

@@ -0,0 +1,10 @@
+{% block informations %}
+    <div class="documentinformations">
+        {% block pdfDocumentInformations %}
+            <div>
+                {% set dateFormat = 'D3_PDFDOCUMENTS_DATE_FORMAT'|translate %}
+                {{ translate({ ident: "D3_PDFDOCUMENTS_DATE", suffix: "COLON" }) }} {{ smarty.now|date_format(dateFormat) }}
+            </div>
+        {% endblock %}
+    </div>
+{% endblock %}

views/twig/documents/deliverynote/inc/recipientAddress.html.twig

@@ -0,0 +1,25 @@
+{% block recipientaddress %}
+    {% if order.getFieldData('oxdellname') %}
+        {% if order.getFieldData('oxdelcompany') %}
+            <div class="company">{{ order.getFieldData('oxdelcompany') }}</div>
+        {% endif %}
+        <div class="name">{{ order.getFieldData('oxdelfname') }} {{ order.getFieldData('oxdellname') }}</div>
+        {% if order.getFieldData('oxdeladdinfo') %}
+            <div class="addinfo">{{ order.getFieldData('oxdeladdinfo') }}</div>
+        {% endif %}
+        <div class="street">{{ order.getFieldData('oxdelstreet') }} {{ order.getFieldData('oxdelstreetnr') }}</div>
+        <div class="location">{{ order.getFieldData('oxdelzip') }} {{ order.getFieldData('oxdelcity') }}</div>
+        <div class="country">{{ order.getFieldData('oxdelcountry') }}</div>
+    {% else %}
+        {% if order.getFieldData('oxbillcompany') %}
+            <div class="company">{{ order.getFieldData('oxbillcompany') }}</div>
+        {% endif %}
+        <div class="name">{{ order.getFieldData('oxbillfname') }} {{ order.getFieldData('oxbilllname') }}</div>
+        {% if order.getFieldData('oxbilladdinfo') %}
+            <div class="addinfo">{{ order.getFieldData('oxbilladdinfo') }}</div>
+        {% endif %}
+        <div class="street">{{ order.getFieldData('oxbillstreet') }} {{ order.getFieldData('oxbillstreetnr') }}</div>
+        <div class="location">{{ order.getFieldData('oxbillzip') }} {{ order.getFieldData('oxbillcity') }}</div>
+        <div class="country">{{ order.getFieldData('oxbillcountry') }}</div>
+    {% endif %}
+{% endblock %}

views/twig/documents/deliverynote/inc/salutation.html.twig

@@ -0,0 +1,12 @@
+{% block salutation %}
+    <div class="salutation">
+        <div class="documenttype">{{ translate({ ident: "D3_PDFDOCUMENTS_DELIVERYNOTE" }) }}</div>
+        <div class="documentnumber">{{ translate({ ident: "D3_PDFDOCUMENTS_ORDERNR", suffix: "COLON" }) }} {{ order.getFieldData('oxordernr') }}</div>
+
+        {% set dateFormat = 'D3_PDFDOCUMENTS_DATE_FORMAT'|translate %}
+        {% set sArgs = order.getFieldData('oxorderdate')|date_format(dateFormat)|cat("//")|cat(shop.getFieldData('oxname')) %}
+        {% set aArgs = sArgs|split("//") %}
+
+        <div>{{ translate({ ident: "D3_PDFDOCUMENTS_ORDER_FROM_AT", args: aArgs }) }}</div>
+    </div>
+{% endblock %}

views/twig/documents/inc/elements/addressarea.html.twig

@@ -0,0 +1,13 @@
+{% set backaddressfile = backaddressfile|default("@d3PdfDocuments/documents/inc/page/returnaddress.html.twig") %}
+{% set addressfile = addressfile|default("@d3PdfDocuments/documents/inc/elements/recipientAddress.html.twig") %}
+
+<div class="addressarea">
+    <div class="returnAddress">
+        <div>
+            {% include backaddressfile %}
+        </div>
+    </div>
+    <div class="recipientAddress">
+        {% include addressfile %}
+    </div>
+</div>

views/twig/documents/inc/elements/articlecostssummary.html.twig

@@ -0,0 +1,254 @@
+{% set sumnetto %}
+    {% block sumnetto %}
+        <tr class="sumnetto">
+            <td class="indent"></td>
+            <td class="description">
+                {{ translate({ ident: "D3_PDFDOCUMENTS_SUMNETTO", suffix: "COLON" }) }}
+            </td>
+            <td class="values">
+                {{ order.getFormattedTotalNetSum() }} {{ currency.name }}
+            </td>
+        </tr>
+    {% endblock %}
+{% endset %}
+
+{% set discount %}
+    {% block discount %}
+        <tr class="discount">
+            <td class="indent"></td>
+            <td class="description">
+                {{ translate({ ident: "D3_PDFDOCUMENTS_DISCOUNT", suffix: "COLON" }) }}
+            </td>
+            <td class="values">
+                {{ order.getFormattedDiscount() }} {{ currency.name }}
+            </td>
+        </tr>
+    {% endblock %}
+{% endset %}
+
+{% set producttax %}
+    {% block producttax %}
+        {% for VatKey, oVat in order.getProductVats(false) %}
+            <tr class="producttax">
+                <td class="indent"></td>
+                <td class="description">
+                    {{ translate({ ident: "D3_PDFDOCUMENTS_TAX", args: VatKey, suffix: "COLON" }) }}
+                </td>
+                <td class="values">
+                    {{ lang.formatCurrency(oVat, currency) }} {{ currency.name }}
+                </td>
+            </tr>
+        {% endfor %}
+    {% endblock %}
+{% endset %}
+
+{% set sumbrutto %}
+    {% block sumbrutto %}
+        <tr class="sumbrutto">
+            <td class="indent"></td>
+            <td class="description">
+                {{ translate({ ident: "D3_PDFDOCUMENTS_SUMBRUTTO", suffix: "COLON" }) }}
+            </td>
+            <td class="values">
+                {{ order.getFormattedTotalBrutSum() }} {{ currency.name }}
+            </td>
+        </tr>
+    {% endblock %}
+{% endset %}
+
+{% if order.getFieldData('oxdiscount') %}
+    {% if order.isNettoMode() %}
+        {{ sumnetto }}
+        {{ discount }}
+        {{ producttax }}
+        {{ sumbrutto }}
+    {% else %}
+        {{ sumbrutto }}
+        {{ discount }}
+        {{ sumnetto }}
+        {{ producttax }}
+    {% endif %}
+{% else %}
+    {{ sumnetto }}
+    {{ producttax }}
+    {{ sumbrutto }}
+{% endif %}
+
+{% if order.getFieldData('oxvoucherdiscount') %}
+    {% block voucherdiscount %}
+        <tr class="voucherdiscount">
+            <td class="indent"></td>
+            <td class="description">
+                {{ translate({ ident: "D3_PDFDOCUMENTS_VOUCHERDISCOUNT", suffix: "COLON" }) }}
+            </td>
+            <td class="values">
+                -{{ order.getFormattedTotalVouchers() }} {{ currency.name }}
+            </td>
+        </tr>
+    {% endblock %}
+{% endif %}
+
+{% block delivery %}
+    {% if config.getConfigParam('blShowVATForDelivery') %}
+        {% set deliveryPrice = order.getOrderDeliveryPrice() %}
+        <tr class="delivery">
+            <td class="indent"></td>
+            <td class="description">
+                {{ translate({ ident: "D3_PDFDOCUMENTS_DELIVERY_NET", suffix: "COLON" }) }}
+            </td>
+            <td class="values">
+                {{ lang.formatCurrency(deliveryPrice.getNettoPrice(), currency) }} {{ currency.name }}
+            </td>
+        </tr>
+        <tr class="deliverytax">
+            <td class="indent"></td>
+            <td class="description">
+                {% if config.getConfigParam('sAdditionalServVATCalcMethod') != 'proportional' %}
+                    {{ translate({ ident: "D3_PDFDOCUMENTS_TAX", args: order.getFieldData('oxdelvat'), suffix: "COLON" }) }}
+                {% else %}
+                    {{ translate({ ident: "D3_PDFDOCUMENTS_PROPORTIONAL_TAX", suffix: "COLON" }) }}
+                {% endif %}
+            </td>
+            <td class="values">
+                {{ lang.formatCurrency(deliveryPrice.getVATValue(), currency) }} {{ currency.name }}
+            </td>
+        </tr>
+    {% else %}
+        <tr class="delivery">
+            <td class="indent"></td>
+            <td class="description">
+                {{ translate({ ident: "D3_PDFDOCUMENTS_DELIVERY", suffix: "COLON" }) }}
+            </td>
+            <td class="values">
+                {{ lang.formatCurrency(order.getFieldData('oxdelcost'), currency) }} {{ currency.name }}
+            </td>
+        </tr>
+    {% endif %}
+{% endblock %}
+
+{% block payment %}
+    {% if config.getConfigParam('blShowVATForPayCharge') %}
+        {% set paymentPrice = order.getOrderPaymentPrice() %}
+        <tr class="payment">
+            <td class="indent"></td>
+            <td class="description">
+                {{ translate({ ident: "D3_PDFDOCUMENTS_PAYMENT_NET", suffix: "COLON" }) }}
+            </td>
+            <td class="values">
+                {{ lang.formatCurrency(paymentPrice.getNettoPrice(), currency) }} {{ currency.name }}
+            </td>
+        </tr>
+        <tr class="paymenttax">
+            <td class="indent"></td>
+            <td class="description">
+                {% if config.getConfigParam('sAdditionalServVATCalcMethod') != 'proportional' %}
+                    {{ translate({ ident: "D3_PDFDOCUMENTS_TAX", args: order.getFieldData('oxpayvat'), suffix: "COLON" }) }}
+                {% else %}
+                    {{ translate({ ident: "D3_PDFDOCUMENTS_PROPORTIONAL_TAX", suffix: "COLON" }) }}
+                {% endif %}
+            </td>
+            <td class="values">
+                {{ lang.formatCurrency(paymentPrice.getVATValue(), currency) }} {{ currency.name }}
+            </td>
+        </tr>
+    {% else %}
+        <tr class="payment">
+            <td class="indent"></td>
+            <td class="description">
+                {{ translate({ ident: "D3_PDFDOCUMENTS_PAYMENT", suffix: "COLON" }) }}
+            </td>
+            <td class="values">
+                {{ lang.formatCurrency(order.getFieldData('oxpaycost'), currency) }} {{ currency.name }}
+            </td>
+        </tr>
+    {% endif %}
+{% endblock %}
+
+{% block wrapping %}
+    {% if order.getFieldData('oxwrapcost') %}
+        {% if config.getConfigParam('blShowVATForWrapping') %}
+            {% set wrappingPrice = order.getOrderWrappingPrice() %}
+            <tr class="wrapping">
+                <td class="indent"></td>
+                <td class="description">
+                    {{ translate({ ident: "D3_PDFDOCUMENTS_WRAPPING_NET", suffix: "COLON" }) }}
+                </td>
+                <td class="values">
+                    {{ lang.formatCurrency(wrappingPrice.getNettoPrice(), currency) }} {{ currency.name }}
+                </td>
+            </tr>
+            <tr class="wrappingtax">
+                <td class="indent"></td>
+                <td class="description">
+                    {{ translate({ ident: "D3_PDFDOCUMENTS_UNDEFINED_TAX", suffix: "COLON" }) }}
+                </td>
+                <td class="values">
+                    {{ lang.formatCurrency(wrappingPrice.getVATValue(), currency) }} {{ currency.name }}
+                </td>
+            </tr>
+        {% else %}
+            <tr class="wrapping">
+                <td class="indent"></td>
+                <td class="description">
+                    {{ translate({ ident: "D3_PDFDOCUMENTS_WRAPPING", suffix: "COLON" }) }}
+                </td>
+                <td class="values">
+                    {{ lang.formatCurrency(order.getFieldData('oxwrapcost'), currency) }} {{ currency.name }}
+                </td>
+            </tr>
+        {% endif %}
+    {% endif %}
+{% endblock %}
+
+{% block giftcard %}
+    {% if order.getFieldData('oxgiftcardcost') %}
+        {% if config.getConfigParam('blShowVATForWrapping') %}
+            {% set giftCardPrice = order.getOrderGiftCardPrice() %}
+            <tr class="giftcard">
+                <td class="indent"></td>
+                <td class="description">
+                    {{ translate({ ident: "D3_PDFDOCUMENTS_GIFTCARD_NET", suffix: "COLON" }) }}
+                </td>
+                <td class="values">
+                    {{ lang.formatCurrency(giftCardPrice.getNettoPrice(), currency) }} {{ currency.name }}
+                </td>
+            </tr>
+            <tr class="wrappingtax">
+                <td class="indent"></td>
+                <td class="description">
+                    {{ translate({ ident: "D3_PDFDOCUMENTS_UNDEFINED_TAX", suffix: "COLON" }) }}
+                </td>
+                <td class="values">
+                    {{ lang.formatCurrency(giftCardPrice.getVATValue(), currency) }} {{ currency.name }}
+                </td>
+            </tr>
+        {% else %}
+            <tr class="wrapping">
+                <td class="indent"></td>
+                <td class="description">
+                    {{ translate({ ident: "D3_PDFDOCUMENTS_GIFTCARD", suffix: "COLON" }) }}
+                </td>
+                <td class="values">
+                    {{ lang.formatCurrency(order.getFieldData('oxgiftcardcost'), currency) }} {{ currency.name }}
+                </td>
+            </tr>
+        {% endif %}
+    {% endif %}
+{% endblock %}
+
+{% block totalsum %}
+    <tr class="totalseparator">
+        <td class="indent"></td>
+        <td class="description"></td>
+        <td class="values"></td>
+    </tr>
+    <tr class="totalsum">
+        <td class="indent"></td>
+        <td class="description">
+            {{ translate({ ident: "D3_PDFDOCUMENTS_TOTALSUMBRUT", suffix: "COLON" }) }}
+        </td>
+        <td class="values">
+            {{ order.getFormattedTotalOrderSum() }} {{ currency.name }}
+        </td>
+    </tr>
+{% endblock %}

views/twig/documents/inc/elements/articlelist.html.twig

@@ -0,0 +1,62 @@
+{% set currency = order.getOrderCurrency() %}
+{% set showPrices = showPrices|default(1) %}
+
+{% block articlelist %}
+    <table class="article_table{% if showPrices %}_prices{% endif %}">
+        <tr>
+            <th class="amount">
+                {{ translate({ ident: "D3_PDFDOCUMENTS_AMOUNT" }) }}
+            </th>
+            <th class="description">
+                {{ translate({ ident: "D3_PDFDOCUMENTS_DESCRIPTION" }) }}
+            </th>
+            {% if showPrices %}
+                <th class="tax">
+                    {{ translate({ ident: "D3_PDFDOCUMENTS_USTPERCENTAGE" }) }}
+                </th>
+                <th class="unitPrice">
+                    {{ translate({ ident: "D3_PDFDOCUMENTS_UNITPRICE" }) }}
+                </th>
+                <th class="totalPrice">
+                    {{ translate({ ident: "D3_PDFDOCUMENTS_TOTALPRICE" }) }}
+                </th>
+            {% endif %}
+        </tr>
+        {% for orderArticle in order.getOrderArticles(true) %}
+            <tr>
+                <td class="amount">
+                    {{ orderArticle.getFieldData('oxamount') }}
+                </td>
+                <td class="description">
+                    {{ orderArticle.getFieldData('oxtitle') }} {{ orderArticle.getFieldData('oxselvariant') }}
+                    <br>
+                    <span class="artnr">
+                        {{ translate({ ident: "D3_PDFDOCUMENTS_ARTNR" }) }} {{ orderArticle.getFieldData('oxartnum') }}
+                    </span>
+                </td>
+                {% if showPrices %}
+                    <td class="tax">
+                        {{ orderArticle.getFieldData('oxvat') }}
+                    </td>
+                    <td class="unitPrice">
+                        {{ orderArticle.getBrutPriceFormated() }} {{ currency.name }}
+                    </td>
+                    <td class="totalPrice">
+                        {{ orderArticle.getTotalBrutPriceFormated() }} {{ currency.name }}
+                    </td>
+                {% endif %}
+            </tr>
+        {% endfor %}
+    </table>
+{% endblock %}
+{% if showPrices %}
+    {% block articleCosts %}
+        <nobreak>
+            <table class="article_costs_table">
+                {% block d3_article_costs_summary %}
+                    {% include "@d3PdfDocuments/documents/inc/elements/articlecostssummary.html.twig" %}
+                {% endblock %}
+            </table>
+        </nobreak>
+    {% endblock %}
+{% endif %}

views/twig/documents/inc/elements/deliveryaddress.html.twig

@@ -0,0 +1,19 @@
+{% block deliveryaddress %}
+    {% if order.getFieldData('oxdelstreet') %}
+        <div class="deliveryaddress">
+            <div class="headline">
+                {{ translate({ ident: "D3_PDFDOCUMENTS_DELIVERYADDRESS", suffix: "COLON" }) }}
+            </div>
+            {% if order.getFieldData('oxdelcompany') %}
+                <div class="company">{{ order.getFieldData('oxdelcompany') }}</div>
+            {% endif %}
+            <div class="name">{{ order.getFieldData('oxdelfname') }} {{ order.getFieldData('oxdellname') }}</div>
+            {% if order.getFieldData('oxdeladdinfo') %}
+                <div class="addinfo">{{ order.getFieldData('oxdeladdinfo') }}</div>
+            {% endif %}
+            <div class="street">{{ order.getFieldData('oxdelstreet') }} {{ order.getFieldData('oxdelstreetnr') }}</div>
+            <div class="location">{{ order.getFieldData('oxdelzip') }} {{ order.getFieldData('oxdelcity') }}</div>
+            <div class="country">{{ order.getFieldData('oxdelcountry') }}</div>
+        </div>
+    {% endif %}
+{% endblock %}

views/twig/documents/inc/elements/foldmarks.html.twig

@@ -0,0 +1,32 @@
+{% set defaultPagePadding = "45,15,25,25"|split(",") %} {# top, right, bottom, left #}
+{% set pagePadding = pagePadding|default(defaultPagePadding) %}
+
+<style>
+    .marks {
+        position: absolute;
+        left: {{ 5 - pagePadding.3|number_format }}mm ;
+        margin-left: 0;
+        width: 7px;
+        height: 0;
+        border-top: 1px solid silver;
+    }
+
+    .foldtop {
+        top: {{ 105 - pagePadding.0|number_format }}mm
+    }
+
+    .foldbottom {
+        top: {{ 210 - pagePadding.0|number_format }}mm
+    }
+
+    .punch {
+        top: {{ 148.5 - pagePadding.0|number_format }}mm
+    }
+</style>
+
+{# fold marks #}
+<div class="marks foldtop"></div>
+<div class="marks foldbottom"></div>
+
+{# punch mark #}
+<div class="marks punch"></div>

views/twig/documents/inc/elements/informations.html.twig

@@ -0,0 +1,39 @@
+<div class="informations">
+    <div class="contactinformations">
+        {% block pdfContactInformations %}
+            <div class="headline">
+                {{ translate({ ident: "D3_PDFDOCUMENTS_GET_IN_CONTACT" }) }}
+            </div>
+            <div>
+                {{ translate({ ident: "D3_PDFDOCUMENTS_TELEFON", suffix: "COLON" }) }} {{ shop.getFieldData('oxtelefon') }}
+            </div>
+            <div>
+                {{ translate({ ident: "D3_PDFDOCUMENTS_FAX", suffix: "COLON" }) }} {{ shop.getFieldData('oxtelefax') }}
+            </div>
+            <div>
+                {{ translate({ ident: "D3_PDFDOCUMENTS_EMAIL", suffix: "COLON" }) }} {{ shop.getFieldData('oxinfoemail') }}
+            </div>
+        {% endblock %}
+    </div>
+
+    <div class="bankaccountinformations">
+        {% block pdfBankaccountInformations %}
+            <div class="headline">
+                {{ translate({ ident: "D3_PDFDOCUMENTS_BANK_ACCOUNT" }) }}
+            </div>
+            <div>
+                {{ shop.getFieldData('oxbankname') }}
+            </div>
+            <div>
+                {{ translate({ ident: "D3_PDFDOCUMENTS_BANK_ACCOUNTNR", suffix: "COLON" }) }} {{ shop.getFieldData('oxibannumber') }}
+            </div>
+            <div>
+                {{ translate({ ident: "D3_PDFDOCUMENTS_BANK_BANKCODE_HEADER", suffix: "COLON" }) }} {{ shop.getFieldData('oxbiccode') }}
+            </div>
+        {% endblock %}
+    </div>
+
+    {% if documentinformationfile %}
+        {% include documentinformationfile %}
+    {% endif %}
+</div>

views/twig/documents/inc/elements/recipientAddress.html.twig

@@ -0,0 +1,12 @@
+{% block recipientaddress %}
+    {% if order.getFieldData('oxbillcompany') %}
+        <div class="company">{{ order.getFieldData('oxbillcompany') }}</div>
+    {% endif %}
+    <div class="name">{{ order.getFieldData('oxbillfname') }} {{ order.getFieldData('oxbilllname') }}</div>
+    {% if order.getFieldData('oxbilladdinfo') %}
+        <div class="addinfo">{{ order.getFieldData('oxbilladdinfo') }}</div>
+    {% endif %}
+    <div class="street">{{ order.getFieldData('oxbillstreet') }} {{ order.getFieldData('oxbillstreetnr') }}</div>
+    <div class="location">{{ order.getFieldData('oxbillzip') }} {{ order.getFieldData('oxbillcity') }}</div>
+    <div class="country">{{ order.getFieldData('oxbillcountry') }}</div>
+{% endblock %}

views/twig/documents/inc/helper/rulers.html.twig

@@ -0,0 +1,38 @@
+{% set defaultPagePadding = "45,15,25,25"|split(",") %} {# top, right, bottom, left #}
+{% set pagePadding = pagePadding|default(defaultPagePadding) %}
+
+<style>
+    .rulerItemHorizontal {
+        position: absolute;
+        top: -{{ pagePadding.0 }}mm;
+        width: 0;
+        height: 7px;
+        color: blue;
+        border-left: 1px solid blue
+    }
+
+    .rulerItemVertical {
+        position: absolute;
+        left: -{{ pagePadding.3 }}mm;
+        width: 7px;
+        height: 0;
+        color: blue;
+        border-top: 1px solid blue
+    }
+</style>
+
+{# horizontal #}
+{% for rulerItemsHorizontal in 10..600 %}
+    <div class="rulerItemHorizontal" style="left: {{ smarty.section.rulerItemsHorizontal.index - pagePadding.3 }}mm">
+        {{ loop.index0 }}
+    </div>
+{% endfor %}
+
+{# vertical #}
+{% for rulerItemsVertical in 0..600 %}
+    <div class="rulerItemVertical" style="top: {{ smarty.section.rulerItemsVertical.index - pagePadding.0 }}mm">
+        {{ loop.index0 }}
+    </div>
+{% endfor %}
+
+

views/twig/documents/inc/page/base.html.twig

@@ -0,0 +1,21 @@
+{% set pageset = pageset|default("new") %}
+{% set orientation = orientation|default("P") %}
+{% set format = format|default("A4") %}
+{% set defaultPagePadding = "45,15,25,25"|split(",") %} {# top, right, bottom, left #}
+{% set pagePadding = pagePadding|default(defaultPagePadding) %}
+
+<style>
+    {{ pdfBlock_style }}
+</style>
+
+<page backtop="{{ pagePadding.0 }}mm" backright="{{ pagePadding.1 }}mm" backbottom="{{ pagePadding.2 }}mm" backleft="{{ pagePadding.3 }}mm" pageset="{{ pageset }}" orientation="{{ orientation }}" format="{{ format }}">
+    <page_header>
+        {{ pdfBlock_header }}
+    </page_header>
+
+    <page_footer>
+        {{ pdfBlock_footer }}
+    </page_footer>
+
+    {{ pdfBlock_content }}
+</page>

views/twig/documents/inc/page/footer.html.twig

@@ -0,0 +1,38 @@
+{% set defaultPagePadding = "45,15,25,25"|split(",") %} {# top, right, bottom, left #}
+{% set pagePadding = pagePadding|default(defaultPagePadding) %}
+
+{% block pdfFooter %}
+    <div class="footer" style="margin: 0 {{ pagePadding.1 }}mm 10mm {{ pagePadding.3 }}mm">
+        <table>
+            <tr>
+                {% block pdfFooterLeft %}
+                    <td class="footerLeft">
+                        <div>{{ shop.getFieldData('oxname') }}</div>
+                        <div>{{ shop.getFieldData('oxstreet') }}</div>
+                        <div>{{ shop.getFieldData('oxzip') }} {{ shop.getFieldData('oxcity') }}</div>
+                        <div>{{ shop.getFieldData('oxcountry') }}</div>
+                        <div>{{ shop.getFieldData('oxurl') }}</div>
+                        <div>{{ shop.getFieldData('oxinfoemail') }}</div>
+                    </td>
+                {% endblock %}
+                {% block pdfFooterCenter %}
+                    <td class="footerCenter">
+                        <div>{{ translate({ ident: "D3_PDFDOCUMENTS_MANAGINGDIRECTOR", suffix: "COLON" }) }} {{ shop.getFieldData('oxfname') }} {{ shop.getFieldData('oxlname') }}</div>
+                        <div>{{ translate({ ident: "D3_PDFDOCUMENTS_COURT", suffix: "COLON" }) }} {{ shop.getFieldData('oxcourt') }}</div>
+                        <div>{{ translate({ ident: "D3_PDFDOCUMENTS_HRBNR", suffix: "COLON" }) }} {{ shop.getFieldData('oxhrbnr') }}</div>
+                        <div>{{ translate({ ident: "D3_PDFDOCUMENTS_USTID", suffix: "COLON" }) }} {{ shop.getFieldData('oxvatnumber') }}</div>
+                    </td>
+                {% endblock %}
+                {% block pdfFooterRight %}
+                    <td class="footerRight">
+                        <div>{{ translate({ ident: "D3_PDFDOCUMENTS_BANK_ACCOUNT" }) }}</div>
+                        <div>{{ shop.getFieldData('oxbankname') }}</div>
+                        <div>{{ translate({ ident: "D3_PDFDOCUMENTS_BANK_ACCOUNTNR", suffix: "COLON" }) }} {{ shop.getFieldData('oxibannumber') }}</div>
+                        <div>{{ translate({ ident: "D3_PDFDOCUMENTS_BANK_BANKCODE", suffix: "COLON" }) }} {{ shop.getFieldData('oxbiccode') }}</div>
+                    </td>
+                {% endblock %}
+            </tr>
+        </table>
+    </div>
+
+{% endblock %}

views/twig/documents/inc/page/header.html.twig

@@ -0,0 +1,16 @@
+{% set showLogo = showLogo|default(1) %}
+{% set sPdfLogo = sAlternativePdfLogo %}
+
+{% block pdfHeader %}
+    <div class="header">
+        {% if showLogo %}
+            {# pdf logo is available only in non admin theme #}
+            {% set isAdmin = oViewConf.isAdmin() %}
+            {{ oViewConf.setAdminMode(false) }}
+            {% if sPdfLogo %}
+                <img class="logo" alt="Logo" src="{{ sPdfLogo }}">
+            {% endif %}
+            {{ oViewConf.setAdminMode(isAdmin) }}
+        {% endif %}
+    </div>
+{% endblock %}

views/twig/documents/inc/page/returnaddress.html.twig

@@ -0,0 +1 @@
+{{ shop.getFielddata('oxname') }} - {{ shop.getFielddata('oxstreet') }} - {{ shop.getFielddata('oxzip') }} {{ shop.getFielddata('oxcity') }} - {{ shop.getFieldData('oxcountry') }}

views/twig/documents/invoice/inc/conclusion.html.twig

@@ -0,0 +1,19 @@
+{% block conclusion %}
+    <nobreak>
+        {% block conclusion_paymethod %}
+            <div class="conclusion_payment">
+                {{ translate({ ident: "D3_PDFDOCUMENTS_USED_PAYMENTMETHOD", suffix: "COLON" }) }}
+                {{ payment.getFieldData('oxdesc') }}<br>
+
+                {% include "@d3PdfDocuments/documents/invoice/inc/payinfo.html.twig" %}
+            </div>
+        {% endblock %}
+
+        {% block conclusion_thankyou %}
+            <div class="conclusion_thankyou">
+                {{ translate({ ident: "D3_PDFDOCUMENTS_THANKYOU_1" }) }}<br>
+                {{ translate({ ident: "D3_PDFDOCUMENTS_THANKYOU_2", args: shop.getFieldData('oxname') }) }}
+            </div>
+        {% endblock %}
+    </nobreak>
+{% endblock %}

views/twig/documents/invoice/inc/informations.html.twig

@@ -0,0 +1,19 @@
+{% block informations %}
+    <div class="documentinformations">
+        {% block pdfDocumentInformations %}
+            <div>
+                {{ translate({ ident: "D3_PDFDOCUMENTS_ORDERBILLNR", suffix: "COLON" }) }} {{ order.getFieldData('oxbillnr') }}
+            </div>
+            <div>
+                {{ translate({ ident: "D3_PDFDOCUMENTS_CUSTOMERNR", suffix: "COLON" }) }} {{ user.getFieldData('oxcustnr') }}
+            </div>
+            <div>
+                {% set dateFormat = 'D3_PDFDOCUMENTS_DATE_FORMAT'|translate %}
+                {{ translate({ ident: "D3_PDFDOCUMENTS_DATE", suffix: "COLON" }) }} {{ order.getFieldData('oxbilldate')|date_format(dateFormat) }}
+            </div>
+            <div>
+                {{ translate({ ident: "D3_PDFDOCUMENTS_USTIDNR", suffix: "COLON" }) }} {{ shop.getFieldData('oxvatnumber') }}
+            </div>
+        {% endblock %}
+    </div>
+{% endblock %}

views/twig/documents/invoice/inc/payinfo.html.twig

@@ -0,0 +1,16 @@
+{% block payinfo %}
+    {% if payment.getId() == 'oxidinvoice' %}
+        {% block payinfo_billable_till %}
+            {% set dateFormat = 'D3_PDFDOCUMENTS_DATE_FORMAT'|translate %}
+            {{ translate({ ident: "D3_PDFDOCUMENTS_PAYABLEUNTIL" }) }}
+            {{ document.getPayableUntilDate()|date_format(dateFormat) }}
+        {% endblock %}
+    {% elseif payment.getId() == 'oxidpayadvance' or payment.getId() == 'oxidcreditcard' %}
+        {% block payinfo_payed %}
+            {{ translate({ ident: "D3_PDFDOCUMENTS_RECEIVED_PAYMENT" }) }}
+        {% endblock %}
+    {% else %}
+        {% block payinfo_other %}
+        {% endblock %}
+    {% endif %}
+{% endblock %}

views/twig/documents/invoice/inc/salutation.html.twig

@@ -0,0 +1,12 @@
+{% block salutation %}
+    <div class="salutation">
+        <div class="documenttype">{{ translate({ ident: "D3_PDFDOCUMENTS_INVOICE" }) }}</div>
+        <div class="documentnumber">{{ translate({ ident: "D3_PDFDOCUMENTS_ORDERNR", suffix: "COLON" }) }} {{ order.getFieldData('oxordernr') }}</div>
+
+        {% set dateFormat = 'D3_PDFDOCUMENTS_DATE_FORMAT'|translate %}
+        {% set sArgs = order.getFieldData('oxorderdate')|date_format(dateFormat)|cat("//")|cat(shop.getFieldData('oxname')) %}
+        {% set aArgs = sArgs|split("//") %}
+
+        <div>{{ translate({ ident: "D3_PDFDOCUMENTS_ORDER_FROM_AT", args: aArgs }) }}</div>
+    </div>
+{% endblock %}

views/twig/documents/invoice/invoice.html.twig

@@ -0,0 +1,51 @@
+{% set pagePadding = "45,15,25,25"|split(",") %} {# top, right, bottom, left #}
+{% set showLogo = showLogo|default(1) %}
+
+{% set pdfBlock_style %}
+    {% block pdfStyles %}
+        {{ style({ include: oViewConf.getModuleUrl('d3PdfDocuments', 'out/src/css/pdfStyling.css') }) }}
+        {{ style() }}
+    {% endblock %}
+{% endset %}
+
+{% set pdfBlock_header %}
+    {% block pdfHeader %}
+        {% include "@d3PdfDocuments/documents/inc/page/header.html.twig" with {showLogo: showLogo} %}
+    {% endblock %}
+{% endset %}
+
+{% set pdfBlock_content %}
+    {% include "@d3PdfDocuments/documents/inc/elements/foldmarks.html.twig" with {pagePadding: pagePadding} %}
+
+    {% block pdfAddressArea %}
+        {% include "@d3PdfDocuments/documents/inc/elements/addressarea.html.twig" %}
+    {% endblock %}
+
+    {% block pdfInformations %}
+        {% include "@d3PdfDocuments/documents/inc/elements/informations.html.twig" with {documentinformationfile: "@d3PdfDocuments/documents/invoice/inc/informations.html.twig"} %}
+    {% endblock %}
+
+    {% block pdfDeliveryAddress %}
+        {% include "@d3PdfDocuments/documents/inc/elements/deliveryaddress.html.twig" %}
+    {% endblock %}
+
+    {% block pdfSalutation %}
+        {% include "@d3PdfDocuments/documents/invoice/inc/salutation.html.twig" %}
+    {% endblock %}
+
+    {% block pdfArticleList %}
+        {% include "@d3PdfDocuments/documents/inc/elements/articlelist.html.twig" %}
+    {% endblock %}
+
+    {% block pdfConclusion %}
+        {% include "@d3PdfDocuments/documents/invoice/inc/conclusion.html.twig" %}
+    {% endblock %}
+{% endset %}
+
+{% set pdfBlock_footer %}
+    {% block pdfFooter %}
+        {% include "@d3PdfDocuments/documents/inc/page/footer.html.twig" with {pagePadding: pagePadding} %}
+    {% endblock %}
+{% endset %}
+
+{% include "@d3PdfDocuments/documents/inc/page/base.html.twig" with {pagePadding: pagePadding} %}

views/twig/documents/invoice/invoiceNoLogo.html.twig

@@ -0,0 +1 @@
+{% include "@d3PdfDocuments/documents/invoice/invoice.html.twig" with {showLogo: 0} %}

views/twig/extensions/themes/admin_twig/order_overview.html.twig

@@ -0,0 +1,7 @@
+{% extends "order_overview.html.twig" %}
+
+{% block admin_order_overview_export %}
+    {{ parent() }}
+
+    {% include "@d3PdfDocuments/admin/orderoverview_pdfform" %}
+{% endblock %}