adjust version informations

when generating several documents in a common call (e.g. order manager task), the contents of the later documents are appended to the earlier ones

.gitattributes

@@ -0,0 +1,3 @@
+docs export-ignore
+.gitattributes export-ignore
+.gitignore export-ignore

Application/Controller/orderOverviewPdfGenerator.php

@@ -1,12 +1,7 @@
 <?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
+ * See LICENSE file for license details.
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
  * @author        D3 Data Development - Daniel Seifert <support@shopmodule.com>
@@ -15,9 +10,7 @@
 
 namespace D3\PdfDocuments\Application\Controller;
 
-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\Interfaces\pdfdocumentsOrderInterface;
 use D3\PdfDocuments\Application\Model\Registries\registryOrderoverview;
 use OxidEsales\Eshop\Application\Model\Order;
@@ -27,12 +20,8 @@ class orderOverviewPdfGenerator
 {
     /**
      * @param Order $order
-     * @param $sFilename
      * @param int $iSelLang
-     * @param string $target
      * @throws noPdfHandlerFoundException
-     * @throws noBaseObjectSetException
-     * @throws pdfGeneratorExceptionAbstract
      */
     public function generatePdf(Order $order, $iSelLang = 0)
     {

Application/Model/AbstractClasses/pdfdocumentsGeneric.php

@@ -1,22 +1,17 @@
 <?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
+ * See LICENSE file for license details.
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
- * @author    D3 Data Development - Max Buhe <support@shopmodule.com>
- * @link      http://www.oxidmodule.com
+ * @author        D3 Data Development - Max Buhe <support@shopmodule.com>
+ * @link          http://www.oxidmodule.com
  */
 
 namespace D3\PdfDocuments\Application\Model\AbstractClasses;
 
+use Assert\InvalidArgumentException;
+use D3\ModCfg\Application\Model\d3filesystem;
 use D3\PdfDocuments\Application\Model\Exceptions\pdfGeneratorExceptionAbstract;
 use D3\PdfDocuments\Application\Model\Interfaces\pdfdocumentsGenericInterface as genericInterface;
 use OxidEsales\Eshop\Core\Base;
@@ -54,15 +49,22 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface
         parent::__construct();
 
         /** @var Smarty $oSmarty */
-        $this->oSmarty = Registry::getUtilsView()->getSmarty();
+        $this->oSmarty = Registry::getUtilsView()->getSmarty(true);
+    }
+
+    public function runPreAction()
+    {
+    }
+
+    public function runPostAction()
+    {
     }
 
     /**
-     * @param        $sFilename
-     * @param int    $iSelLang
+     * @param $sFilename
+     * @param int $iSelLang
      * @param string $target
-     *
-     * @return mixed|string
+     * @return mixed|string|null
      * @throws Html2PdfException
      */
     public function genPdf($sFilename, $iSelLang = 0, $target = self::PDF_DESTINATION_STDOUT)
@@ -80,16 +82,22 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface
 
     /**
      * @param int $iLanguage
+     * @throws Html2PdfException
      */
     public function downloadPdf($iLanguage = 0)
     {
         try {
+            $this->runPreAction();
             $sFilename = $this->getFilename();
             $this->genPdf($sFilename, $iLanguage, self::PDF_DESTINATION_DOWNLOAD);
+            $this->runPostAction();
             Registry::getUtils()->showMessageAndExit('');
         } 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);
         }
     }
 
@@ -102,15 +110,20 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface
     public function savePdfFile($path, $iLanguage = 0)
     {
         try {
+            $this->runPreAction();
             $sFilename = $this->getFilename();
             $this->genPdf(
                 rtrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.$sFilename,
                 $iLanguage,
                 self::PDF_DESTINATION_FILE
             );
+            $this->runPostAction();
         } 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);
         }
     }
 
@@ -123,28 +136,40 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface
     public function getPdfContent($iLanguage = 0)
     {
         try {
+            $this->runPreAction();
             $sFilename = $this->getFilename();
-            return $this->genPdf( $sFilename, $iLanguage, self::PDF_DESTINATION_STRING );
+            $ret = $this->genPdf( $sFilename, $iLanguage, self::PDF_DESTINATION_STRING );
+            $this->runPostAction();
+            return $ret;
         } 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;
     }
 
-    public function setSmartyVars()
+    /**
+     * @param int $iSelLang
+     */
+    public function setSmartyVars($iSelLang)
     {
-        $this->oSmarty->assign('oConfig', Registry::getSession()->getConfig());
-        $this->oSmarty->assign('oViewConf', Registry::getSession()->getConfig()->getActiveView()->getViewConfig());
+        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);
     }
 
     /**
      * @param int $iSelLang
      *
      * @return mixed
+     * @throws InvalidArgumentException
      */
     public function getHTMLContent($iSelLang = 0)
     {
@@ -156,7 +181,7 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface
         $currTplLang = $lang->getTplLanguage();
         $lang->setTplLanguage($iSelLang);
 
-        $this->setSmartyVars();
+        $this->setSmartyVars($iSelLang);
 
         $content = $this->oSmarty->fetch($this->getTemplate());
 
@@ -199,18 +224,24 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface
     }
 
     /**
-     * @param string $sFilename
-     *
      * @return string
      */
     public function getFilename()
     {
         // forced filename from setFilename()
         if ($this->filename) {
-            return $this->addFilenameExtension($this->filename);
+            return $this->makeValidFileName(
+                $this->addFilenameExtension(
+                    $this->filename
+                )
+            );
         }
 
-        return $this->addFilenameExtension($this->getTypeForFilename());
+        return $this->makeValidFileName(
+            $this->addFilenameExtension(
+                $this->getTypeForFilename()
+            )
+        );
     }
 
     /**
@@ -222,7 +253,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;
         }
 
@@ -238,10 +269,8 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface
      */
     public function makeValidFileName($sFilename)
     {
-        $sFilename = preg_replace('/[\s]+/', '_', $sFilename);
-        $sFilename = preg_replace('/[^a-zA-Z0-9_\.-]/', '', $sFilename);
-
-        return str_replace(' ', '_', $sFilename);
+        $fs = oxNew(d3filesystem::class);
+        return $fs->filterFilename($sFilename);
     }
 
     /**
@@ -249,9 +278,17 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface
      */
     public function renderTemplateFromAdmin()
     {
-        return true;
+        return false;
     }
 
+    /**
+     * @param Html2Pdf $oPdf
+     * @param $sFilename
+     * @param $target
+     * @param $html
+     * @return string|null
+     * @throws Html2PdfException
+     */
     public function output(Html2Pdf $oPdf, $sFilename, $target, $html)
     {
         if ((bool) Registry::getConfig()->getConfigParam('d3PdfDocumentsbDev') === true) {
@@ -266,7 +303,7 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface
      * @param $sFilename
      * @param $target
      * @param $html
-     * @return mixed
+     * @return null
      */
     public function outputDev(Html2Pdf $oPdf, $sFilename, $target, $html)
     {
@@ -278,7 +315,7 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface
                 if (ob_get_contents()) {
                     $oPdf->pdf->Error('Some data has already been output, can\'t send PDF file');
                 }
-                if (php_sapi_name() != 'cli') {
+                if (substr(php_sapi_name(), 0, 3) != 'cli') {
                     //We send to a browser
                     header('Content-Type: text/html');
                     if (headers_sent()) {
@@ -337,5 +374,7 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface
                 $oPdf->pdf->Error('Incorrect output destination: '.$target);
             }
         }
+
+        return null;
     }
 }

Application/Model/AbstractClasses/pdfdocumentsOrder.php

@@ -1,34 +1,36 @@
 <?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
+ * See LICENSE file for license details.
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
- * @author    D3 Data Development - Max Buhe <support@shopmodule.com>
- * @link      http://www.oxidmodule.com
+ * @author        D3 Data Development - Max Buhe <support@shopmodule.com>
+ * @link          http://www.oxidmodule.com
  */
 
 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 Spipu\Html2Pdf\Exception\Html2PdfException;
+use OxidEsales\Eshop\Core\Registry;
 
 abstract class pdfdocumentsOrder extends pdfdocumentsGeneric implements orderInterface
 {
     /** @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
      */
@@ -38,16 +40,26 @@ 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;
     }
 
-    public function setSmartyVars()
+    /**
+     * @param int $iSelLang
+     * @throws InvalidArgumentException
+     */
+    public function setSmartyVars($iSelLang)
     {
-        parent::setSmartyVars();
+        parent::setSmartyVars($iSelLang);
 
         $this->oSmarty->assign('order', $this->getOrder());
 
@@ -56,52 +68,64 @@ abstract class pdfdocumentsOrder extends pdfdocumentsGeneric implements orderInt
         $this->oSmarty->assign('user', $oUser);
 
         $oPayment = oxNew(Payment::class);
-        $oPayment->load($this->getOrder()->getFieldData('oxpaymenttype'));
+        $oPayment->loadInLang($iSelLang, $this->getOrder()->getFieldData('oxpaymenttype'));
         $this->oSmarty->assign('payment', $oPayment);
     }
 
     /**
-     * @param string $sFilename
-     *
      * @return string
+     * @throws InvalidArgumentException
      */
     public function getFilename()
     {
         // forced filename from setFilename()
         if ($this->filename) {
-            return $this->addFilenameExtension($this->filename);
+            return $this->makeValidFileName(
+                $this->addFilenameExtension(
+                    $this->filename
+                )
+            );
         }
 
         $sTrimmedBillName = trim($this->getOrder()->getFieldData('oxbilllname'));
 
-        return $this->addFilenameExtension(
-            implode(
-                '_',
-                [
-                    $this->getTypeForFilename(),
-                    $this->getOrder()->getFieldData('oxordernr'),
-                    $sTrimmedBillName
-                ]
+        return $this->makeValidFileName(
+            $this->addFilenameExtension(
+                implode(
+                    '_',
+                    [
+                        $this->getTypeForFilename(),
+                        $this->getOrder()->getFieldData('oxordernr'),
+                        $sTrimmedBillName
+                    ]
+                )
             )
         );
     }
 
     /**
-     * @param        $sFilename
-     * @param int    $iSelLang
-     * @param string $target
-     *
-     * @return mixed|string|void
-     * @throws Html2PdfException
-     * @throws noBaseObjectSetException
+     * @return int
      */
-    public function genPdf($sFilename, $iSelLang = 0, $target = 'I')
+    public function getPaymentTerm()
     {
-        if (false == $this->getOrder()) {
-            $e = oxNew(noBaseObjectSetException::class);
-            throw $e;
+        if (null === $iPaymentTerm = Registry::getConfig()->getConfigParam('iPaymentTerm')) {
+            $iPaymentTerm = 7;
         }
 
-        return parent::genPdf($sFilename, $iSelLang, $target);
+        return $iPaymentTerm;
+    }
+
+    /**
+     * @return false|string
+     * @throws InvalidArgumentException
+     */
+    public function getPayableUntilDate()
+    {
+        return strtotime(
+            '+' . $this->getPaymentTerm() . ' day',
+            strtotime(
+                $this->getOrder()->getFieldData('oxbilldate')
+            )
+        );
     }
 }

Application/Model/Documents/deliverynotePdf.php

@@ -1,18 +1,11 @@
 <?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
+ * See LICENSE file for license details.
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
- * @author    D3 Data Development - Max Buhe <support@shopmodule.com>
- * @link      http://www.oxidmodule.com
+ * @author        D3 Data Development - Max Buhe <support@shopmodule.com>
+ * @link          http://www.oxidmodule.com
  */
 
 namespace D3\PdfDocuments\Application\Model\Documents;
@@ -34,7 +27,7 @@ class deliverynotePdf extends pdfdocumentsOrder
      */
     public function getTitleIdent()
     {
-        return "ORDER_OVERVIEW_PDF_DNOTE";
+        return "D3_PDFDOCUMENTS_DELIVERYNOTE";
     }
 
     /**

Application/Model/Documents/deliverynotewithoutlogoPdf.php

@@ -1,18 +1,11 @@
 <?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
+ * See LICENSE file for license details.
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
- * @author    D3 Data Development - Max Buhe <support@shopmodule.com>
- * @link      http://www.oxidmodule.com
+ * @author        D3 Data Development - Max Buhe <support@shopmodule.com>
+ * @link          http://www.oxidmodule.com
  */
 
 namespace D3\PdfDocuments\Application\Model\Documents;
@@ -32,7 +25,7 @@ class deliverynotewithoutlogoPdf extends deliverynotePdf
      */
     public function getTitleIdent()
     {
-        return "ORDER_OVERVIEW_PDF_DNOTE_WITHOUT_LOGO";
+        return "D3_PDFDOCUMENTS_DELIVERYNOTE_WITHOUT_LOGO";
     }
 
     /**

Application/Model/Documents/invoicePdf.php

@@ -1,26 +1,18 @@
 <?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
+ * See LICENSE file for license details.
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
- * @author    D3 Data Development - Max Buhe <support@shopmodule.com>
- * @link      http://www.oxidmodule.com
+ * @author        D3 Data Development - Max Buhe <support@shopmodule.com>
+ * @link          http://www.oxidmodule.com
  */
 
 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
 {
@@ -31,8 +23,7 @@ class invoicePdf extends pdfdocumentsOrder implements pdfdocumentsOrderinvoiceIn
      */
     public function getRequestId()
     {
-        // same like in OXID PDF module
-        return 'standart';
+        return 'invoice';
     }
 
     /**
@@ -40,7 +31,7 @@ class invoicePdf extends pdfdocumentsOrder implements pdfdocumentsOrderinvoiceIn
      */
     public function getTitleIdent()
     {
-        return "ORDER_OVERVIEW_PDF_STANDART";
+        return "D3_PDFDOCUMENTS_INVOICE";
     }
 
     /**
@@ -52,27 +43,24 @@ class invoicePdf extends pdfdocumentsOrder implements pdfdocumentsOrderinvoiceIn
     }
 
     /**
-     * @param        $sFilename
-     * @param int    $iSelLang
-     * @param string $target
-     *
-     * @return mixed|string|void
-     * @throws Html2PdfException
-     * @throws noBaseObjectSetException
+     * @return void
+     * @throws InvalidArgumentException
      */
-    public function genPdf( $sFilename, $iSelLang = 0, $target = 'I' )
+    public function runPreAction()
     {
+        parent::runPreAction();
+
         $this->setInvoiceNumber();
         $this->setInvoiceDate();
         $this->saveOrderOnChanges();
-
-        return parent::genPdf( $sFilename, $iSelLang, $target );
     }
 
+    /**
+     * @return void
+     * @throws InvalidArgumentException
+     */
     public function setInvoiceNumber()
     {
-        $this->blIsNewOrder = false;
-
         if (!$this->getOrder()->getFieldData('oxbillnr')) {
             $this->getOrder()->assign(['oxbillnr' => $this->getOrder()->getNextBillNum()]);
 
@@ -80,6 +68,10 @@ class invoicePdf extends pdfdocumentsOrder implements pdfdocumentsOrderinvoiceIn
         }
     }
 
+    /**
+     * @return void
+     * @throws InvalidArgumentException
+     */
     public function setInvoiceDate()
     {
         if ($this->getOrder()->getFieldData('oxbilldate') == '0000-00-00') {
@@ -91,6 +83,10 @@ class invoicePdf extends pdfdocumentsOrder implements pdfdocumentsOrderinvoiceIn
         }
     }
 
+    /**
+     * @return void
+     * @throws InvalidArgumentException
+     */
     public function saveOrderOnChanges()
     {
         if ($this->blIsNewOrder) {
@@ -103,18 +99,19 @@ class invoicePdf extends pdfdocumentsOrder implements pdfdocumentsOrderinvoiceIn
     }
 
     /**
-     * @param string $sFilename
-     *
      * @return string
+     * @throws InvalidArgumentException
      */
     public function getFilename()
     {
         $filename = parent::getFilename();
 
-        return str_replace(
+        $filename = str_replace(
             $this->getOrder()->getFieldData('oxordernr'),
             $this->getOrder()->getFieldData('oxbillnr'),
             $filename
         );
+
+        return $this->makeValidFileName($filename);
     }
 }

Application/Model/Documents/invoicewithoutlogoPdf.php

@@ -1,18 +1,11 @@
 <?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
+ * See LICENSE file for license details.
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
- * @author    D3 Data Development - Max Buhe <support@shopmodule.com>
- * @link      http://www.oxidmodule.com
+ * @author        D3 Data Development - Max Buhe <support@shopmodule.com>
+ * @link          http://www.oxidmodule.com
  */
 
 namespace D3\PdfDocuments\Application\Model\Documents;
@@ -24,8 +17,7 @@ class invoicewithoutlogoPdf extends invoicePdf
      */
     public function getRequestId()
     {
-        // same like in OXID PDF module
-        return 'standart_without_logo';
+        return 'invoice_without_logo';
     }
 
     /**
@@ -33,7 +25,7 @@ class invoicewithoutlogoPdf extends invoicePdf
      */
     public function getTitleIdent()
     {
-        return "ORDER_OVERVIEW_PDF_STANDART_WITHOUT_LOGO";
+        return "D3_PDFDOCUMENTS_INVOICE_WITHOUT_LOGO";
     }
 
     /**

Application/Model/Exceptions/noBaseObjectSetException.php

@@ -1,26 +0,0 @@
-<?php
-
-/**
- * This Software is the property of Data Development and is protected
- * by copyright law - it is NOT Freeware.
- * Any unauthorized use of this software without a valid license
- * is a violation of the license agreement and will be prosecuted by
- * civil and criminal law.
- * http://www.shopmodule.com
- *
- * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
- * @author        D3 Data Development - Daniel Seifert <support@shopmodule.com>
- * @link          http://www.oxidmodule.com
- */
-
-namespace D3\PdfDocuments\Application\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/Exceptions/noPdfHandlerFoundException.php

@@ -1,13 +1,8 @@
 <?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
- *
+ * 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

Application/Model/Exceptions/pdfGeneratorExceptionAbstract.php

@@ -1,18 +1,11 @@
 <?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
+ * See LICENSE file for license details.
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
- * @author    D3 Data Development - Max Buhe <support@shopmodule.com>
- * @link      http://www.oxidmodule.com
+ * @author        D3 Data Development - Max Buhe <support@shopmodule.com>
+ * @link          http://www.oxidmodule.com
  */
 
 namespace D3\PdfDocuments\Application\Model\Exceptions;

Application/Model/Exceptions/wrongPdfGeneratorInterface.php

@@ -1,13 +1,8 @@
 <?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
- *
+ * 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

Application/Model/Interfaces/pdfdocumentsGenericInterface.php

@@ -1,24 +1,15 @@
 <?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
+ * See LICENSE file for license details.
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
- * @author    D3 Data Development - Max Buhe <support@shopmodule.com>
- * @link      http://www.oxidmodule.com
+ * @author        D3 Data Development - Max Buhe <support@shopmodule.com>
+ * @link          http://www.oxidmodule.com
  */
 
 namespace D3\PdfDocuments\Application\Model\Interfaces;
 
-use D3\PdfDocuments\Application\Model\Exceptions\noBaseObjectSetException;
-
 interface pdfdocumentsGenericInterface
 {
     /**
@@ -65,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

@@ -1,22 +1,16 @@
 <?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
+ * See LICENSE file for license details.
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
- * @author    D3 Data Development - Max Buhe <support@shopmodule.com>
- * @link      http://www.oxidmodule.com
+ * @author        D3 Data Development - Max Buhe <support@shopmodule.com>
+ * @link          http://www.oxidmodule.com
  */
 
 namespace D3\PdfDocuments\Application\Model\Interfaces;
 
+use Assert\InvalidArgumentException;
 use OxidEsales\Eshop\Application\Model\Order;
 
 interface pdfdocumentsOrderInterface extends pdfdocumentsGenericInterface
@@ -27,6 +21,7 @@ interface pdfdocumentsOrderInterface extends pdfdocumentsGenericInterface
     public function setOrder(Order $order);
 
     /**
+     * @throws InvalidArgumentException
      * @return Order
      */
     public function getOrder();

Application/Model/Interfaces/pdfdocumentsOrderinvoiceInterface.php

@@ -1,18 +1,11 @@
 <?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
+ * See LICENSE file for license details.
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
- * @author    D3 Data Development - Max Buhe <support@shopmodule.com>
- * @link      http://www.oxidmodule.com
+ * @author        D3 Data Development - Max Buhe <support@shopmodule.com>
+ * @link          http://www.oxidmodule.com
  */
 
 namespace D3\PdfDocuments\Application\Model\Interfaces;

Application/Model/Registries/registryAbstract.php

@@ -1,18 +1,11 @@
 <?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
+ * See LICENSE file for license details.
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
- * @author    D3 Data Development - Max Buhe <support@shopmodule.com>
- * @link      http://www.oxidmodule.com
+ * @author        D3 Data Development - Max Buhe <support@shopmodule.com>
+ * @link          http://www.oxidmodule.com
  */
 
 namespace D3\PdfDocuments\Application\Model\Registries;
@@ -75,6 +68,7 @@ abstract class registryAbstract implements registryGenericInterface
 
     /**
      * @param $className * generator fully qualified class name
+     * @return bool
      */
     public function hasGenerator($className)
     {

Application/Model/Registries/registryGenericInterface.php

@@ -1,18 +1,11 @@
 <?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
+ * See LICENSE file for license details.
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
- * @author    D3 Data Development - Max Buhe <support@shopmodule.com>
- * @link      http://www.oxidmodule.com
+ * @author        D3 Data Development - Max Buhe <support@shopmodule.com>
+ * @link          http://www.oxidmodule.com
  */
 
 namespace D3\PdfDocuments\Application\Model\Registries;

Application/Model/Registries/registryOrdermanagerActions.php

@@ -1,13 +1,8 @@
 <?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
- *
+ * 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

Application/Model/Registries/registryOrdermanagerActionsInterface.php

@@ -1,18 +1,11 @@
 <?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
+ * See LICENSE file for license details.
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
- * @author    D3 Data Development - Max Buhe <support@shopmodule.com>
- * @link      http://www.oxidmodule.com
+ * @author        D3 Data Development - Max Buhe <support@shopmodule.com>
+ * @link          http://www.oxidmodule.com
  */
 
 namespace D3\PdfDocuments\Application\Model\Registries;

Application/Model/Registries/registryOrderoverview.php

@@ -1,18 +1,11 @@
 <?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
+ * See LICENSE file for license details.
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
- * @author    D3 Data Development - Max Buhe <support@shopmodule.com>
- * @link      http://www.oxidmodule.com
+ * @author        D3 Data Development - Max Buhe <support@shopmodule.com>
+ * @link          http://www.oxidmodule.com
  */
 
 namespace D3\PdfDocuments\Application\Model\Registries;

Application/Model/Registries/registryOrderoverviewInterface.php

@@ -1,18 +1,11 @@
 <?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
+ * See LICENSE file for license details.
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
- * @author    D3 Data Development - Max Buhe <support@shopmodule.com>
- * @link      http://www.oxidmodule.com
+ * @author        D3 Data Development - Max Buhe <support@shopmodule.com>
+ * @link          http://www.oxidmodule.com
  */
 
 namespace D3\PdfDocuments\Application\Model\Registries;

Application/translations/de/pdfdocuments_lang.php

@@ -0,0 +1,77 @@
+<?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 = "Deutsch";
+$aLang     = array(
+    'charset'                                            => 'utf-8',
+
+    'D3_PDFDOCUMENTS_THANKYOU_1'                         => 'Vielen Dank für Ihren Einkauf!',
+    'D3_PDFDOCUMENTS_THANKYOU_2'                         => 'Ihr Team von %1$s',
+
+    'D3_PDFDOCUMENTS_GET_IN_CONTACT'                     => 'So erreichen Sie uns:',
+    'D3_PDFDOCUMENTS_TELEFON'                            => 'Telefon',
+    'D3_PDFDOCUMENTS_FAX'                                => 'Fax',
+    'D3_PDFDOCUMENTS_EMAIL'                              => 'e-Mail',
+
+    'D3_PDFDOCUMENTS_BANK_ACCOUNT'                       => 'Bankverbindung',
+    'D3_PDFDOCUMENTS_BANK_ACCOUNTNR'                     => 'IBAN',
+    'D3_PDFDOCUMENTS_BANK_BANKCODE_HEADER'               => 'BIC',
+
+    'D3_PDFDOCUMENTS_ORDERBILLNR'                        => 'Rechnungs-Nr.',
+    'D3_PDFDOCUMENTS_CUSTOMERNR'                         => 'Kundennummer',
+    'D3_PDFDOCUMENTS_DATE'                               => 'Datum',
+    'D3_PDFDOCUMENTS_DATE_FORMAT'                        => '%d.%m.%Y',
+    'D3_PDFDOCUMENTS_USTIDNR'                            => 'Ust.-ID-Nr.',
+
+    'D3_PDFDOCUMENTS_DELIVERYADDRESS'                    => 'Lieferadresse',
+
+    '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_ORDERNR'                            => 'Bestellnr.',
+    'D3_PDFDOCUMENTS_ORDER_FROM_AT'                      => 'Ihre Bestellung vom %1$s bei "%2$s"',
+
+    'D3_PDFDOCUMENTS_AMOUNT'                             => 'Menge',
+    'D3_PDFDOCUMENTS_DESCRIPTION'                        => 'Beschreibung',
+    'D3_PDFDOCUMENTS_USTPERCENTAGE'                      => 'Ust. %',
+    'D3_PDFDOCUMENTS_UNITPRICE'                          => 'Einzelpreis',
+    'D3_PDFDOCUMENTS_TOTALPRICE'                         => 'Gesamtpreis',
+
+    'D3_PDFDOCUMENTS_ARTNR'                              => 'Art.-Nr.',
+
+    'D3_PDFDOCUMENTS_SUMBRUTTO'                          => 'Summe Artikel (brutto)',
+    'D3_PDFDOCUMENTS_DISCOUNT'                           => 'Rabatt',
+    'D3_PDFDOCUMENTS_SUMNETTO'                           => 'Summe Artikel (netto)',
+    'D3_PDFDOCUMENTS_TAX'                                => 'zzgl. MwSt. %1$s %%',
+    'D3_PDFDOCUMENTS_UNDEFINED_TAX'                      => 'zzgl. MwSt.',
+    'D3_PDFDOCUMENTS_PROPORTIONAL_TAX'                   => 'zzgl. MwSt. (anteilig berechnet)',
+    'D3_PDFDOCUMENTS_VOUCHERDISCOUNT'                    => 'Gutschein',
+    'D3_PDFDOCUMENTS_DELIVERY_NET'                       => 'Versandkosten (netto)',
+    'D3_PDFDOCUMENTS_DELIVERY'                           => 'Versandkosten',
+    'D3_PDFDOCUMENTS_PAYMENT_NET'                        => 'Aufschlag Zahlungsart (netto)',
+    'D3_PDFDOCUMENTS_PAYMENT'                            => 'Aufschlag Zahlungsart',
+    'D3_PDFDOCUMENTS_WRAPPING_NET'                       => 'Geschenkverpackung (netto)',
+    'D3_PDFDOCUMENTS_WRAPPING'                           => 'Geschenkverpackung',
+    'D3_PDFDOCUMENTS_GIFTCARD_NET'                       => 'Grußkarte (netto)',
+    'D3_PDFDOCUMENTS_GIFTCARD'                           => 'Grußkarte',
+    'D3_PDFDOCUMENTS_TOTALSUMBRUT'                       => 'Gesamtsumme (brutto)',
+
+    'D3_PDFDOCUMENTS_USED_PAYMENTMETHOD'                 => 'Ihre gewählte Zahlungsweise',
+    'D3_PDFDOCUMENTS_PAYABLEUNTIL'                       => 'Zahlbar bis zum',
+    'D3_PDFDOCUMENTS_RECEIVED_PAYMENT'                   => 'Den Rechnungsbetrag haben wir dankend erhalten.',
+
+    'D3_PDFDOCUMENTS_MANAGINGDIRECTOR'                   => 'Geschäftsführer',
+    'D3_PDFDOCUMENTS_COURT'                              => 'Amtsgericht',
+    'D3_PDFDOCUMENTS_HRBNR'                              => 'HRB',
+    'D3_PDFDOCUMENTS_USTID'                              => 'Ust.-ID',
+
+    'D3_PDFDOCUMENTS_BANK_BANKCODE'                      => 'BIC/SWIFT-Code',
+);

Application/translations/en/pdfdocuments_lang.php

@@ -0,0 +1,76 @@
+<?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',
+
+    'D3_PDFDOCUMENTS_THANKYOU_1'                         => 'Many thanks for your purchase!',
+    'D3_PDFDOCUMENTS_THANKYOU_2'                         => 'Your team from %1$s',
+
+    'D3_PDFDOCUMENTS_GET_IN_CONTACT'                     => 'You can contact us as follows',
+    'D3_PDFDOCUMENTS_TELEFON'                            => 'Telephone',
+    'D3_PDFDOCUMENTS_FAX'                                => 'Fax',
+    'D3_PDFDOCUMENTS_EMAIL'                              => 'Email',
+
+    'D3_PDFDOCUMENTS_BANK_ACCOUNT'                       => 'Bank Account',
+    'D3_PDFDOCUMENTS_BANK_ACCOUNTNR'                     => 'IBAN',
+    'D3_PDFDOCUMENTS_BANK_BANKCODE_HEADER'               => 'BIC',
+
+    'D3_PDFDOCUMENTS_ORDERBILLNR'                        => 'Invoice No.',
+    'D3_PDFDOCUMENTS_CUSTOMERNR'                         => 'Customer No.',
+    'D3_PDFDOCUMENTS_DATE'                               => 'Date',
+    'D3_PDFDOCUMENTS_DATE_FORMAT'                        => '%Y-%m-%d',
+    'D3_PDFDOCUMENTS_USTIDNR'                            => 'VAT ID No.',
+
+    'D3_PDFDOCUMENTS_DELIVERYADDRESS'                    => 'Shipping Address',
+
+    '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_ORDERNR'                            => 'Order No.',
+    'D3_PDFDOCUMENTS_ORDER_FROM_AT'                      => 'Your order from %1$s at "%2$s"',
+
+    'D3_PDFDOCUMENTS_AMOUNT'                             => 'Amount',
+    'D3_PDFDOCUMENTS_DESCRIPTION'                        => 'Description',
+    'D3_PDFDOCUMENTS_USTPERCENTAGE'                      => 'VAT %',
+    'D3_PDFDOCUMENTS_UNITPRICE'                          => 'Unit Price',
+    'D3_PDFDOCUMENTS_TOTALPRICE'                         => 'Total',
+
+    'D3_PDFDOCUMENTS_ARTNR'                              => 'Item No.',
+
+    'D3_PDFDOCUMENTS_SUMBRUTTO'                          => 'Total products (incl. tax)',
+    'D3_PDFDOCUMENTS_DISCOUNT'                           => 'Discount',
+    'D3_PDFDOCUMENTS_SUMNETTO'                           => 'Total products (excl. tax)',
+    'D3_PDFDOCUMENTS_TAX'                                => 'plus VAT %1$s %%',
+    'D3_PDFDOCUMENTS_UNDEFINED_TAX'                      => 'plus VAT',
+    'D3_PDFDOCUMENTS_PROPORTIONAL_TAX'                   => 'plus VAT (proportionally calculated)',
+    'D3_PDFDOCUMENTS_VOUCHERDISCOUNT'                    => 'Coupon',
+    'D3_PDFDOCUMENTS_DELIVERY_NET'                       => 'Shipping costs (excl. tax)',
+    'D3_PDFDOCUMENTS_DELIVERY'                           => 'Shipping costs',
+    'D3_PDFDOCUMENTS_PAYMENT_NET'                        => 'Additional Charge Payment Method (excl. tax)',
+    'D3_PDFDOCUMENTS_PAYMENT'                            => 'Additional Charge Payment Method',
+    'D3_PDFDOCUMENTS_WRAPPING_NET'                       => 'Gift Wrapping (excl. tax)',
+    'D3_PDFDOCUMENTS_WRAPPING'                           => 'Gift Wrapping',
+    'D3_PDFDOCUMENTS_GIFTCARD_NET'                       => 'Greeting Card (excl. tax)',
+    'D3_PDFDOCUMENTS_GIFTCARD'                           => 'Greeting Card',
+    'D3_PDFDOCUMENTS_TOTALSUMBRUT'                       => 'Total sum (gross)',
+
+    'D3_PDFDOCUMENTS_USED_PAYMENTMETHOD'                 => 'Your chosen payment method',
+    'D3_PDFDOCUMENTS_PAYABLEUNTIL'                       => 'Billing till',
+    'D3_PDFDOCUMENTS_RECEIVED_PAYMENT'                   => 'We have received the invoice amount with thanks.',
+
+    'D3_PDFDOCUMENTS_MANAGINGDIRECTOR'                   => 'Managing director',
+    'D3_PDFDOCUMENTS_COURT'                              => 'Local court',
+    'D3_PDFDOCUMENTS_HRBNR'                              => 'HRB',
+    'D3_PDFDOCUMENTS_USTID'                              => 'VAT ID',
+
+    'D3_PDFDOCUMENTS_BANK_BANKCODE'                      => 'BIC/SWIFT Code',
+);

Application/views/admin/de/pdfdocuments_lang.php

@@ -1,17 +1,13 @@
 <?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
- *
+ * See LICENSE file for license details.
+ * 
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
- * @author        D3 Data Development <support@shopmodule.com>
+ * @author        D3 Data Development - Daniel Seifert <support@shopmodule.com>
  * @link          http://www.oxidmodule.com
  */
+
 $sLangName = "Deutsch";
 $aLang     = array(
     'charset'                                            => 'utf-8',
@@ -19,58 +15,13 @@ $aLang     = array(
     'SHOP_MODULE_GROUP_d3PdfDocumentsmain'               => 'Grundeinstellungen',
     'SHOP_MODULE_d3PdfDocumentsbDev'                     => 'Entwicklermodus',
 
-    'ORDER_OVERVIEW_PDF_auftragsbestaetigung'            => 'Auftragsbestätigung',
-    'ORDER_OVERVIEW_PDF_auftragsbestaetigung_TEXTAREA'   => 'Text für Auftragsbestätigung',
-    'ORDER_OVERVIEW_PDF_AUFTRAGSNUMMER'                  => 'Auftragsbestätigung:',
-    //'ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_1'           => 'Herzlichen Dank für Ihre Bestellung! Bitte empfehlen Sie uns weiter.',
-    'ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_1'             => 'Vielen Dank für Ihren Einkauf!',
-    'ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_2'             => 'Ihr Elektroversand Schmidt',
-    //'ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_2'           => '',
-    'ORDER_OVERVIEW_PDF_auftragsbestaetigung_Alternativtext' => 'Alle Artikel sind ab Lager lieferbar und gehen schnellstmöglich in den Versand.',
-    'ORDER_OVERVIEW_PDF_bestellbestaetitung_TEXTAREA'    => 'Individueller Zahlungstext',
-    'PAYMENT_MAIN_D3SHORTDESCPDF'                        => 'Rechnungstext',
-    'D3_OFFERPDF_FINAL_1'                                => 'Die hier angegebene Materialzusammenstellung dient lediglich der Unterstützung Ihrer Planung. Sie wurde nach bestem Wissen erstellt, erhebt jedoch keinen Anspruch auf Richtigkeit und Vollständigkeit und ersetzt auch nicht Ihre individuelle Planung. Eine Haftung unsererseits für Richtigkeit und Vollständigkeit wird nicht übernommen.',
-    'D3_OFFERPDF_FINAL_2'                                => 'Alle Preisangaben sind inkl. Kupfer- und Metallzuschlägen.',
-    'D3_OFFERPDF_FINAL_3'                                => 'Dieses Angebot ist 14 Tage gültig.',
-    'D3_OFFERPDF_FINAL_4'                                => 'Wir hoffen, dass Ihnen unser Angebot zusagt und würden uns über Ihren Auftrag freuen.',
+    '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',
 
-    'ORDER_OVERVIEW_PDF_d3pdftextkostenstelle_kunden'         => 'kundenspezifischer Kostenstellen',
-    'ORDER_OVERVIEW_PDF_d3pdftextkostenstelle_kunden_PDF'         => 'Rechnungsvermerk:',
-    'D3_ORDERCONFIRMATION_ACTION_ORDERGENERATEPDFORDERCONFIRMATION'  => 'Auftragsbestätigung',
-    //pdf
-    'ORDER_OVERVIEW_PDF_ORDERSAT'              => ' beim Elektroversand Schmidt',
-    'ORDER_OVERVIEW_PDF_ORDERSINCERELY'        => 'Ihre Bestellung vom ',
-    'D3_ORDER_OVERVIEW_PDF_BANKVERBINDUNG'     => 'Bankverbindung:',
-    'ORDER_OVERVIEW_PDF_ACCOUNTNR'             => 'IBAN: ',
-    'ORDER_OVERVIEW_PDF_BANKCODE'              => 'BIC-/SWIFT-Code: ',
-    'ORDER_OVERVIEW_PDF_BANKCODE_HEADER'       => 'BIC: ',
-    'D3_ORDER_OVERVIEW_PDF_GET_IN_CONTACT'     => 'So erreichen Sie uns:',
-    'D3_ORDER_OVERVIEW_PDF_GESCHAEFTSFUEHRER'  => 'Geschäftsführer: Denis Schmidt',
-    'D3_ORDER_OVERVIEW_PDF_COURT'              => 'Amtsgericht ',
-    'D3_ORDER_OVERVIEW_PDF_HRBNR'              => 'HRB ',
-    'D3_AUFTRAGSBESTAETIGUNG_PDF_PRETEXT'      => 'Auf Grundlage unserer allgemeinen Liefer- und Geschäftsbedingungen bestätigen wir Ihnen folgenden Auftrag:',
-    'D3_ORDER_OVERVIEW_PDF_USTID'      		   => 'Ust.-ID: ',
-    'D3_ORDER_OVERVIEW_PDF_USTIDNR'      	   => 'Ust.-ID-Nr: ',
-    'D3_ORDER_OVERVIEW_PDF_USTPERCENTAGE'      => 'Ust. %: ',
-    'D3_ORDER_OVERVIEW_PDF_TELEFON'      	   => 'Telefon: ',
-    'D3_ORDER_OVERVIEW_PDF_FAX'           	   => 'Fax: ',
-    'D3_ORDER_OVERVIEW_PDF_ORDERBILLNR'        => 'Rechnungs-Nr.: ',
-    'D3_ORDER_OVERVIEW_PDF_ORDERNR'            => 'Bestellnr.: ',
-    'D3_ORDER_OVERVIEW_PDF_DATE'               => 'Datum: ',
-    'D3_ORDER_OVERVIEW_PDF_AMOUNT'              => 'Menge',
-    'D3_ORDER_OVERVIEW_PDF_ARTNR'               => 'Art.-Nr.',
-    'D3_ORDER_OVERVIEW_PDF_DESCRIPTION'         => 'Beschreibung',
-    'D3_ORDER_OVERVIEW_PDF_UNITPRICE'           => 'Einzelpreise',
-    'D3_ORDER_OVERVIEW_PDF_TOTALPRICE'          => 'Gesamtpreis',
-    'D3_ORDER_OVERVIEW_PDF_USED_PAYMENTMETHOD' => 'Ihre gewählte Zahlungsweise: ',
-    'D3_ORDER_OVERVIEW_PDF_USED_GREETINGSORDER' => 'Den Rechnungsbetrag haben wir dankend erhalten.',
-    'D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO'    => 'Summe Artikel (brutto)',
-    'D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT'     => 'Rabatt',
-    'D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMNETTO'     => 'Summe Artikel (netto)',
-    'D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAX'          => 'zzgl. MwSt. ',
-    'D3_ORDER_OVERVIEW_PDF_ORDERBILL_PERCENTAGE'          => '%',
-    'D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAXPERCVALUE'          => ' Betrag',
-    'D3_ORDER_OVERVIEW_PDF_ORDERBILL_DELIVERY'     => 'Versandkosten (netto)',
-    'D3_ORDER_OVERVIEW_PDF_ORDERBILL_TOTALSUMBRUT' => 'Gesamtsumme (brutto)',
-    'D3_ORDER_OVERVIEW_PDF_ORDERBILL_CUSTOMERNR' => 'Kundennummer: ',
+    'D3_PDFDOCUMENTS_PDF_TYPE'                           => 'Dokument',
+    'D3_PDFDOCUMENTS_LANGUAGE'                           => 'Sprache',
+    'D3_PDFDOCUMENTS_PDF_GENERATE'                       => 'Dokument erstellen',
 );

Application/views/admin/en/pdfdocuments_lang.php

@@ -0,0 +1,27 @@
+<?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_d3PdfDocumentsbDev'                     => 'Developer mode',
+
+    '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/tpl/admin/orderoverview_pdfform.tpl

@@ -1,44 +1,46 @@
-[{if $edit && $oView->canExport()}]
+[{if $edit && $oView->d3CanExport()}]
     <br>
-    <form name="myedit2" id="myedit2" action="[{$oViewConf->getSelfLink()}]" method="post" target="expPDF">
+    <form name="d3CreatePdf" id="d3CreatePdf" action="[{$oViewConf->getSelfLink()}]" method="post" target="d3ExpPDF">
         [{$oViewConf->getHiddenSid()}]
         <input type="hidden" name="cl" value="order_overview">
-        <input type="hidden" name="fnc" value="createPDF">
+        <input type="hidden" name="fnc" value="d3CreatePDF">
         <input type="hidden" name="oxid" value="[{$oxid}]">
-        <table cellspacing="0" cellpadding="0" style="padding-top: 5px; padding-left: 5px; padding-right: 5px; padding-bottom: 5px; border : 1px #A9A9A9; border-style : solid solid solid solid;" width="220">
-
-            <tr>
-                <td rowspan="3">
-                    <img src="[{$oViewConf->getImageUrl()}]/pdf_icon.gif" width="41" height="38" alt="" border="0" hspace="0" vspace="0" align="absmiddle">
-                </td>
-                <td valign="top" class="edittext" align="right">
-                    [{oxmultilang ident="ORDER_OVERVIEW_PDF_TYPE"}]:&nbsp;
-                    <select name="pdftype" class="editinput" style="width:80px;">
-                        [{block name="d3_pdfdocuments_order_overview_pdfTypeOptions"}]
-                            [{assign var="generatorList" value=$oView->d3getGeneratorList()}]
-                            [{foreach from=$generatorList->getList() item="generator"}]
-                                <option value="[{$generator->getRequestId()}]">[{oxmultilang ident=$generator->getTitleIdent()}]</option>
+        <fieldset style="padding: 5px">
+            <legend>[{oxmultilang 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="[{oxmultilang ident="D3_PDFDOCUMENTS"}]">
+                    </td>
+                    <td style="vertical-align: top; text-align: right" class="edittext">
+                        <label for="pdftype">[{oxmultilang ident="D3_PDFDOCUMENTS_PDF_TYPE" suffix="COLON"}]</label>:&nbsp;
+                        <select id="pdftype" name="pdftype" class="editinput" style="width:80px;">
+                            [{block name="d3_pdfdocuments_order_overview_pdfTypeOptions"}]
+                                [{assign var="generatorList" value=$oView->d3getGeneratorList()}]
+                                [{foreach from=$generatorList->getList() item="generator"}]
+                                    <option value="[{$generator->getRequestId()}]">[{oxmultilang ident=$generator->getTitleIdent()}]</option>
+                                [{/foreach}]
+                            [{/block}]
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td style="text-align: right" class="edittext">
+                        <label for="pdflanguage">[{oxmultilang ident="D3_PDFDOCUMENTS_LANGUAGE" suffix="COLON"}]</label>
+                        <select id="pdflanguage" name="pdflanguage" class="saveinnewlanginput" style="width:80px;">
+                            [{foreach from=$alangs key=lang item=slang}]
+                                <option value="[{$lang}]" [{if $lang == "0"}]SELECTED[{/if}]>[{$slang}]</option>
                             [{/foreach}]
-                        [{/block}]
-                    </select>
-                </td>
-            </tr>
-            <tr>
-                <td align="right" class="edittext">
-                    [{oxmultilang ident="GENERAL_LANGUAGE"}]
-                    <select name="pdflanguage" class="saveinnewlanginput" style="width:80px;">
-                        [{foreach from=$alangs key=lang item=slang}]
-                            <option value="[{$lang}]" [{if $lang == "0"}]SELECTED[{/if}]>[{$slang}]</option>
-                        [{/foreach}]
-                    </select>
-                </td>
-            </tr>
-            <tr>
-                <td align="right" class="edittext"><br/>
-                    <input type="submit" class="edittext" name="save" value="[{oxmultilang ident="ORDER_OVERVIEW_PDF"}]">
-                    <iframe name="expPDF" width="0" height="0" border="0" style="display:none;"></iframe>
-                </td>
-            </tr>
-        </table>
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td style="text-align: right" class="edittext"><br/>
+                        <input type="submit" class="edittext" name="save" value="[{oxmultilang ident="D3_PDFDOCUMENTS_PDF_GENERATE"}]">
+                        <iframe name="d3ExpPDF" style="width: 0; height: 0; border: none; display:none;"></iframe>
+                    </td>
+                </tr>
+            </table>
+        </fieldset>
     </form>
 [{/if}]

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

@@ -1,92 +1,47 @@
-[{assign var= currency      value= $order->getOrderCurrency()}]
-[{assign var= deliveryPrice value= $order->getOrderDeliveryPrice()}]
+[{assign var="pagePadding"   value=","|explode:"45,15,30,25"}] [{* top, right, bottom, left *}]
+[{assign var="showLogo"      value=$showLogo|default:true}]
 
-<style type="text/css">
-	[{include file="d3delnote_pdf_style.css"}],
-	[{include file="d3pdfstyle.css"}]
-</style>
-
-<page backtop="30mm" backbottom="30mm" backleft="10mm" backright="10mm" pageset="new">
-	<page_header>
-        [{block name="pdfTopingFile"}]
-		    [{include file="d3pdfheader.tpl" showLogo=true}]
-        [{/block}]
-	</page_header>
-	<page_footer>
-        [{block name="pdfFooterFile"}]
-            [{include file="d3pdffooter.tpl"}]
-        [{/block}]
-	</page_footer>
-
-	[{* +++++ main page part +++++ *}]
-    [{block name="pdfHeadingFile"}]
-        [{block name="pdfHeaderFile"}]
-            [{include file="d3delnote_pdf_addressarea.tpl"}]
-        [{/block}]
+[{capture append="pdfBlock_style"}]
+    [{block name="pdfStyles"}]
+        [{include file="d3pdfstyles.css"}]
     [{/block}]
-	[{* +++++Artikeltabelle+++++*}]
-    [{block name="articleListing"}]
-        <table class="order_article_marginTop10 border-bottom" cellspacing="0">
-            <tr>
-                <td class="border-bottom order_article_PaddingBottom5 "><div class="vertical-a order_article_listing_fontSize deliverynote_width_amount">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_AMOUNT"}]</div></td>
-								<td class="border-bottom order_article_PaddingBottom5 paddingLeft"><div class="order_article_listing_fontSize deliverynote_width_artnum">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}]</div></td>
-                <td class="border-bottom order_article_PaddingBottom5 "><div class="order_article_listing_fontSize deliverynote_width_desc">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DESCRIPTION"}]</div></td>
-            </tr>
-        [{foreach from=$order->getOrderArticles(true) item=oOrderArticle}]
-            [{*<tr>
-                <td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='fontSize12 aligning order_article_listing_width_amount order_article_listing_paddingRight52'>[{$oOrderArticle->oxorderarticles__oxamount->value }]</div></td>
-                <td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='fontSize12 order_article_listing_width_desc'>
-                        [{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }]
-                        <br>
-                        <span class="order_article_listing_fontSize9">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }]</span>
-                    </div></td>
-                <td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='aligning fontSize12 order_article_listing_width_ust'>[{$oOrderArticle->oxorderarticles__oxvat->value }]</div></td>
-                <td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='aligning fontSize12 order_article_listing_width_unitPrice'>[{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}]</div></td>
-                <td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='aligning fontSize12 order_article_listing_width_total_Price'>[{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}]</div></td>
-            </tr>*}]
-						<tr>
-                <td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='fontSize12 aligning deliverynote_width_amount order_article_listing_paddingRight52'>[{$oOrderArticle->oxorderarticles__oxamount->value }]</div></td>
-                <td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='fontSize12 textAlignLeft deliverynote_width_artnum order_article_listing_paddingRight52'>[{$oOrderArticle->oxorderarticles__oxartnum->value }]</div></td>
-                <td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='fontSize12 deliverynote_width_desc'>[{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{$oOrderArticle->oxorderarticles__oxselvariant->getRawValue()}]</div></td>
-            </tr>
-        [{/foreach}]
-        </table>
+[{/capture}]
+
+[{capture append="pdfBlock_header"}]
+    [{block name="pdfHeader"}]
+        [{include file="d3pdfheader.tpl" showLogo=$showLogo}]
     [{/block}]
-	<nobreak>
-		[{block name="articleCosts"}]
-		[{*<table class="article_costs_table border-bottom">
-			<tr>
-				[{ ++++++Artikelzusammenfassung++++++ }]
-				<td class="article_costs_table_paddingRight article_costs_table_td_width50 ">
-					<div class="order_sum fontSize12 border-bottom  order_article_PaddingBottom5">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO"}]</div>
-				[{if $order->getFormattedDiscount() != 0}]
-					<div class="order_sum fontSize12 border-bottom spacing_order_info">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT"}]</div>
-				[{/if}]
-					<div class="order_sum fontSize12 order_article_PaddingTop5">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMNETTO"}]</div>
-				[{foreach from=$order->getVats() key=VatKey item=oVat}]
-					<div class="order_sum fontSize12 border-bottom spacing_order_info">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAX"}] [{$VatKey}] [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_PERCENTAGE"}] [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAXPERCVALUE"}]</div>
-				[{/foreach}]
-					<div class="order_sum fontSize12 order_article_PaddingTop5">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DELIVERY"}]</div>
-					<div class="fontSize12 border-bottom spacing_order_info aligning order_article_costs_paddingRight66 order_article_costs_marginLeftSub3">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAX"}] [{$VatKey}] [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_PERCENTAGE"}] [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAXPERCVALUE"}]</div>
-					<div class="order_sum fontSize12 order_article_PaddingTop5 order_article_PaddingBottom5"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TOTALSUMBRUT"}]</strong></div>
-				</td>
-				[{ ++++++Kosten der Bestellung++++++ }]
-				<td class="article_costs_table_td_width50">
-					<div class="order_sumNum aligning fontSize12 border-bottom  order_article_PaddingBottom5">[{$order->getFormattedTotalBrutSum()}] [{$currency->name}]</div>
-				[{if $order->getFormattedDiscount() != 0}]
-					<div class="spacing_order_info order_sumNum aligning fontSize12 border-bottom">-[{$order->getFormattedDiscount()}] [{$currency->name}]</div>
-				[{/if}]
-					<div class="order_article_PaddingTop5 order_sumNum aligning fontSize12">[{$order->getFormattedTotalNetSum()}] [{$currency->name}]</div>
-					<div class="spacing_order_info order_sumNum aligning fontSize12 border-bottom">[{$lang->formatCurrency($oVat, $currency)}] [{$currency->name}]</div>
-					<div class="order_article_PaddingTop5 order_sumNum aligning fontSize12">[{$lang->formatCurrency($deliveryPrice->getNettoPrice(), $currency)}] [{$currency->name}]</div>
-					<div class="order_article_PaddingTop5 order_article_PaddingBottom5 order_sumNum aligning fontSize12 border-bottom">[{$lang->formatCurrency($deliveryPrice->getVATValue(), $currency)}] [{$currency->name}]</div>
-					<div class="order_article_PaddingTop5 order_article_PaddingBottom5 order_sumNum aligning fontSize12"><strong>[{$order->getFormattedTotalOrderSum()}] [{$currency->name}]</strong></div>
-				</td>
-			</tr>
-		</table>*}]
-	[{/block}]
-	[{block name="pdfPastThankFile"}]
+[{/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}]
-	</nobreak>
-</page>
+    [{/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,92 +1 @@
-[{assign var= currency      value= $order->getOrderCurrency()}]
-[{assign var= deliveryPrice value= $order->getOrderDeliveryPrice()}]
-
-<style type="text/css">
-	[{include file="d3delnote_pdf_style.css"}],
-	[{include file="d3pdfstyle.css"}]
-</style>
-
-<page backtop="30mm" backbottom="30mm" backleft="10mm" backright="10mm" pageset="new">
-	<page_header>
-        [{block name="pdfTopingFile"}]
-		    [{include file="d3pdfheader.tpl" showLogo=false}]
-        [{/block}]
-	</page_header>
-	<page_footer>
-        [{block name="pdfFooterFile"}]
-            [{include file="d3pdffooter.tpl"}]
-        [{/block}]
-	</page_footer>
-
-	[{* +++++ main page part +++++ *}]
-    [{block name="pdfHeadingFile"}]
-        [{block name="pdfHeaderFile"}]
-            [{include file="d3delnote_pdf_addressarea.tpl"}]
-        [{/block}]
-    [{/block}]
-	[{* +++++Artikeltabelle+++++*}]
-    [{block name="articleListing"}]
-        <table class="order_article_marginTop10 border-bottom">
-            <tr>
-                <td class="border-bottom order_article_PaddingBottom5 "><div class="vertical-a order_article_listing_fontSize deliverynote_width_amount">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_AMOUNT"}]</div></td>
-								<td class="border-bottom order_article_PaddingBottom5 paddingLeft"><div class="order_article_listing_fontSize deliverynote_width_artnum">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}]</div></td>
-                <td class="border-bottom order_article_PaddingBottom5 "><div class="order_article_listing_fontSize deliverynote_width_desc">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DESCRIPTION"}]</div></td>
-            </tr>
-        [{foreach from=$order->getOrderArticles(true) item=oOrderArticle}]
-            [{*<tr>
-                <td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='fontSize12 aligning order_article_listing_width_amount order_article_listing_paddingRight52'>[{$oOrderArticle->oxorderarticles__oxamount->value }]</div></td>
-                <td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='fontSize12 order_article_listing_width_desc'>
-                        [{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }]
-                        <br>
-                        <span class="order_article_listing_fontSize9">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }]</span>
-                    </div></td>
-                <td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='aligning fontSize12 order_article_listing_width_ust'>[{$oOrderArticle->oxorderarticles__oxvat->value }]</div></td>
-                <td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='aligning fontSize12 order_article_listing_width_unitPrice'>[{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}]</div></td>
-                <td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='aligning fontSize12 order_article_listing_width_total_Price'>[{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}]</div></td>
-            </tr>*}]
-						<tr>
-                <td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='fontSize12 aligning deliverynote_width_amount order_article_listing_paddingRight52'>[{$oOrderArticle->oxorderarticles__oxamount->value }]</div></td>
-                <td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='fontSize12 textAlignLeft deliverynote_width_artnum order_article_listing_paddingRight52'>[{$oOrderArticle->oxorderarticles__oxartnum->value }]</div></td>
-                <td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='fontSize12 deliverynote_width_desc'>[{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{$oOrderArticle->oxorderarticles__oxselvariant->getRawValue()}]</div></td>
-            </tr>
-        [{/foreach}]
-        </table>
-    [{/block}]
-	<nobreak>
-		[{block name="articleCosts"}]
-		[{*<table class="article_costs_table border-bottom">
-			<tr>
-				[{ ++++++Artikelzusammenfassung++++++ }]
-				<td class="article_costs_table_paddingRight article_costs_table_td_width50 ">
-					<div class="order_sum fontSize12 border-bottom  order_article_PaddingBottom5">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO"}]</div>
-				[{if $order->getFormattedDiscount() != 0}]
-					<div class="order_sum fontSize12 border-bottom spacing_order_info">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT"}]</div>
-				[{/if}]
-					<div class="order_sum fontSize12 order_article_PaddingTop5">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMNETTO"}]</div>
-				[{foreach from=$order->getVats() key=VatKey item=oVat}]
-					<div class="order_sum fontSize12 border-bottom spacing_order_info">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAX"}] [{$VatKey}] [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_PERCENTAGE"}] [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAXPERCVALUE"}]</div>
-				[{/foreach}]
-					<div class="order_sum fontSize12 order_article_PaddingTop5">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DELIVERY"}]</div>
-					<div class="fontSize12 border-bottom spacing_order_info aligning order_article_costs_paddingRight66 order_article_costs_marginLeftSub3">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAX"}] [{$VatKey}] [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_PERCENTAGE"}] [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAXPERCVALUE"}]</div>
-					<div class="order_sum fontSize12 order_article_PaddingTop5 order_article_PaddingBottom5"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TOTALSUMBRUT"}]</strong></div>
-				</td>
-				[{ ++++++Kosten der Bestellung++++++ }]
-				<td class="article_costs_table_td_width50">
-					<div class="order_sumNum aligning fontSize12 border-bottom  order_article_PaddingBottom5">[{$order->getFormattedTotalBrutSum()}] [{$currency->name}]</div>
-				[{if $order->getFormattedDiscount() != 0}]
-					<div class="spacing_order_info order_sumNum aligning fontSize12 border-bottom">-[{$order->getFormattedDiscount()}] [{$currency->name}]</div>
-				[{/if}]
-					<div class="order_article_PaddingTop5 order_sumNum aligning fontSize12">[{$order->getFormattedTotalNetSum()}] [{$currency->name}]</div>
-					<div class="spacing_order_info order_sumNum aligning fontSize12 border-bottom">[{$lang->formatCurrency($oVat, $currency)}] [{$currency->name}]</div>
-					<div class="order_article_PaddingTop5 order_sumNum aligning fontSize12">[{$lang->formatCurrency($deliveryPrice->getNettoPrice(), $currency)}] [{$currency->name}]</div>
-					<div class="order_article_PaddingTop5 order_article_PaddingBottom5 order_sumNum aligning fontSize12 border-bottom">[{$lang->formatCurrency($deliveryPrice->getVATValue(), $currency)}] [{$currency->name}]</div>
-					<div class="order_article_PaddingTop5 order_article_PaddingBottom5 order_sumNum aligning fontSize12"><strong>[{$order->getFormattedTotalOrderSum()}] [{$currency->name}]</strong></div>
-				</td>
-			</tr>
-		</table>*}]
-	[{/block}]
-	[{block name="pdfPastThankFile"}]
-        [{include file="d3delnote_pdf_conclusion.tpl"}]
-	[{/block}]
-	</nobreak>
-</page>
+[{include file="d3deliverynote_pdf.tpl" showLogo=false}]

Application/views/tpl/documents/deliverynote/inc/conclusion.tpl

@@ -0,0 +1,6 @@
+[{block name="conclusion"}]
+    <nobreak>
+        [{block name="conclusion_thankyou"}]
+        [{/block}]
+    </nobreak>
+[{/block}]

Application/views/tpl/documents/deliverynote/inc/informations.tpl

@@ -0,0 +1,10 @@
+[{block name="informations"}]
+    <div class="documentinformations">
+        [{block name="pdfDocumentInformations"}]
+            <div>
+                [{assign var="dateFormat" value='D3_PDFDOCUMENTS_DATE_FORMAT'|oxmultilangassign}]
+                [{oxmultilang ident="D3_PDFDOCUMENTS_DATE" suffix="COLON"}] [{$smarty.now|date_format:$dateFormat}]
+            </div>
+        [{/block}]
+    </div>
+[{/block}]

Application/views/tpl/documents/deliverynote/inc/recipientAddress.tpl

@@ -0,0 +1,25 @@
+[{block name="recipientaddress"}]
+    [{if $order->getFieldData('oxdellname')}]
+        [{if $order->getFieldData('oxdelcompany')}]
+            <div class="company">[{$order->getFieldData('oxdelcompany')}]</div>
+        [{/if}]
+        <div class="name">[{$order->getFieldData('oxdelfname')}] [{$order->getFieldData('oxdellname')}]</div>
+        [{if $order->getFieldData('oxdeladdinfo')}]
+            <div class="addinfo">[{$order->getFieldData('oxdeladdinfo')}]</div>
+        [{/if}]
+        <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>
+        [{/if}]
+        <div class="name">[{$order->getFieldData('oxbillfname')}] [{$order->getFieldData('oxbilllname')}]</div>
+        [{if $order->getFieldData('oxbilladdinfo')}]
+            <div class="addinfo">[{$order->getFieldData('oxbilladdinfo')}]</div>
+        [{/if}]
+        <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>
+    [{/if}]
+[{/block}]

Application/views/tpl/documents/deliverynote/inc/salutation.tpl

@@ -0,0 +1,12 @@
+[{block name="salutation"}]
+    <div class="salutation">
+        <div class="documenttype">[{oxmultilang ident="D3_PDFDOCUMENTS_DELIVERYNOTE"}]</div>
+        <div class="documentnumber">[{oxmultilang ident="D3_PDFDOCUMENTS_ORDERNR" suffix="COLON"}] [{$order->getFieldData('oxordernr')}]</div>
+
+        [{assign var="dateFormat" value='D3_PDFDOCUMENTS_DATE_FORMAT'|oxmultilangassign}]
+        [{assign var="sArgs" value=$order->getFieldData('oxorderdate')|date_format:$dateFormat|cat:"//"|cat:$shop->getFieldData('oxname')}]
+        [{assign var="aArgs" value="//"|explode:$sArgs}]
+
+        <div>[{oxmultilang ident="D3_PDFDOCUMENTS_ORDER_FROM_AT" args=$aArgs}]</div>
+    </div>
+[{/block}]

Application/views/tpl/documents/deliverynote/includingFiles/pdfHeader.tpl

@@ -1,61 +0,0 @@
-[{block name="pdfHeading"}]
-	<table class="fontSize12 pdf_heading_table" cellspacing="0">
-	[{block name="heading_owner_information"}]
-		<tr>
-			<td class="pdf_heading_width65">
-				<div class="pdf_heading_fontSize8">[{$shop->oxshops__oxname->value}] - [{$shop->oxshops__oxstreet->value}] - [{$shop->oxshops__oxzip->value}] [{$shop->oxshops__oxcity->value}]</div>
-			</td>
-			[{*<td class="pdf_heading_width35">
-				<div class="aligning"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_GET_IN_CONTACT"}]</strong></div>
-				<div class="aligning fontSize12">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TELEFON"}][{$shop->oxshops__oxtelefon->value}]</div>
-				<div class="aligning fontSize12">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_FAX"}][{$shop->oxshops__oxtelefax->value}]</div>
-				<div class="aligning fontSize12">[{$shop->oxshops__oxinfoemail->value}]</div>
-			</td>*}]
-		</tr>
-	[{/block}]
-	[{block name="heading_order_information"}]
-		<tr>
-			<td class="vertical-a heading_order_width65 heading_order_paddingTopSub5" style="padding-top: 5px">
-			[{if $order->oxorder__oxbillcompany->value}]
-				<div>[{$order->oxorder__oxbillcompany->value}]</div>
-			[{/if}]
-				<div>[{$order->oxorder__oxbillfname->value}] [{$order->oxorder__oxbilllname->value}]</div>
-				<div>[{$order->oxorder__oxbillstreet->value}] [{$order->oxorder__oxbillstreetnr->value}]</div>
-				<div><strong>[{$order->oxorder__oxbillzip->value}] [{$order->oxorder__oxbillcity->value}]</strong></div>
-				<div class="heading_order_paddingBottom15">[{$shop->oxshops__oxcountry->value}]</div>
-
-			[{* +++++++Lieferadressen dynamisch+++++++ *}]
-			[{if $order->oxorder__oxdelstreet->value}]
-				<div class="heading_order_fontSize10 heading_order_paddingBottom8">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYADDRESS"}]</div>
-			[{if $order->oxorder__oxdelcompany->value}]<div>[{$order->oxorder__oxdelcompany->value}]</div>[{/if}]
-				<div>[{$order->oxorder__oxdelfname->value}] [{$order->oxorder__oxdellname->value}]</div>
-				<div>[{$order->oxorder__oxdelstreet->value}] [{$order->oxorder__oxdelstreetnr->value}]</div>
-				<div><strong>[{$order->oxorder__oxdelzip->value}] [{$order->oxorder__oxdelcity->value}]</strong></div>
-				<div>[{$shop->oxshops__oxcountry->value}]</div>
-				<div>[{$shop->oxshops__oxdeladdinfo->value}]</div>
-			[{/if}]
-			[{*Bestellnummer,Rechnungsvermerk, 'Ihre bestellung vom...'*}]
-			</td>
-			<td class="vertical-a heading_order_width35 heading_order_paddingTopSub5 eraseBug" style="margin-bottom: 0">
-				<div class="aligning" style="font-size: 7px; padding-top: 50px">[{oxmultilang ident="D3_DELIVERYNOTE_PDF_QUOTECUSTMNR"}]</div>
-				<div class="aligning" style="padding-bottom: 50px">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_CUSTOMERNR"}] [{$user->oxuser__oxcustnr->value}]</div>
-				<div class="aligning">[{$shop->oxshops__oxcity->value}], [{$smarty.now|date_format:"%d.%m.%G"}]</div>
-				<div class="aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTIDNR"}][{$shop->oxshops__oxvatnumber->value}]</div>
-				<div class="aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILLNR"}][{$order->oxorder__oxbillnr->value}]</div>
-			</td>
-		</tr>
-    [{/block}]
-	</table>
-	<table class="fontSize12" cellspacing="0">
-		<tr>
-			<td>
-				<div style="width: 300px" class="eraseBug heading_order_paddingTop22 heading_order_fontSize15"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYNOTE"}][{$order->oxorder__oxordernr->value}]</strong></div>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<div class="eraseBug">[{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSINCERELY"}][{$order->oxorder__oxorderdate->value|date_format:"%d.%m.%Y"}][{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSAT"}]</div>
-			</td>
-		</tr>
-	</table>
-[{/block}]

Application/views/tpl/documents/deliverynote/includingFiles/pdfPastThank.tpl

@@ -1,5 +0,0 @@
-[{block name="pdfPastThankFile"}]
-    <table class="past_thank_width100" cellspacing="0">
-        <tr><td class="past_thank_width100 fontSize12 deliveryNote_paddingTop20">[{oxmultilang ident="D3_DELIVERYNOTE_PDF_PAYABLEUNTIL"}] 20.05.2020</td></tr>
-    </table>
-[{/block}]

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

@@ -1,4 +1,5 @@
 [{assign var="backaddressfile" value=$backaddressfile|default:"d3pdfreturnaddress.tpl"}]
+[{assign var="addressfile" value=$addressfile|default:"d3pdfrecipientaddress.tpl"}]
 
 <div class="addressarea">
     <div class="returnAddress">

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

@@ -0,0 +1,254 @@
+[{capture name="sumnetto"}]
+    [{block name="sumnetto"}]
+        <tr class="sumnetto">
+            <td class="indent"></td>
+            <td class="description">
+                [{oxmultilang ident="D3_PDFDOCUMENTS_SUMNETTO" suffix="COLON"}]
+            </td>
+            <td class="values">
+                [{$order->getFormattedTotalNetSum()}] [{$currency->name}]
+            </td>
+        </tr>
+    [{/block}]
+[{/capture}]
+
+[{capture name="discount"}]
+    [{block name="discount"}]
+        <tr class="discount">
+            <td class="indent"></td>
+            <td class="description">
+                [{oxmultilang ident="D3_PDFDOCUMENTS_DISCOUNT" suffix="COLON"}]
+            </td>
+            <td class="values">
+                [{$order->getFormattedDiscount()}] [{$currency->name}]
+            </td>
+        </tr>
+    [{/block}]
+[{/capture}]
+
+[{capture name="producttax"}]
+    [{block name="producttax"}]
+        [{foreach from=$order->getProductVats(false) key=VatKey item=oVat}]
+            <tr class="producttax">
+                <td class="indent"></td>
+                <td class="description">
+                    [{oxmultilang ident="D3_PDFDOCUMENTS_TAX" args=$VatKey suffix="COLON"}]
+                </td>
+                <td class="values">
+                    [{$lang->formatCurrency($oVat, $currency)}] [{$currency->name}]
+                </td>
+            </tr>
+        [{/foreach}]
+    [{/block}]
+[{/capture}]
+
+[{capture name="sumbrutto"}]
+    [{block name="sumbrutto"}]
+        <tr class="sumbrutto">
+            <td class="indent"></td>
+            <td class="description">
+                [{oxmultilang ident="D3_PDFDOCUMENTS_SUMBRUTTO" suffix="COLON"}]
+            </td>
+            <td class="values">
+                [{$order->getFormattedTotalBrutSum()}] [{$currency->name}]
+            </td>
+        </tr>
+    [{/block}]
+[{/capture}]
+
+[{if $order->getFieldData('oxdiscount')}]
+    [{if $order->isNettoMode()}]
+        [{$smarty.capture.sumnetto}]
+        [{$smarty.capture.discount}]
+        [{$smarty.capture.producttax}]
+        [{$smarty.capture.sumbrutto}]
+    [{else}]
+        [{$smarty.capture.sumbrutto}]
+        [{$smarty.capture.discount}]
+        [{$smarty.capture.sumnetto}]
+        [{$smarty.capture.producttax}]
+    [{/if}]
+[{else}]
+    [{$smarty.capture.sumnetto}]
+    [{$smarty.capture.producttax}]
+    [{$smarty.capture.sumbrutto}]
+[{/if}]
+
+[{if $order->getFieldData('oxvoucherdiscount')}]
+    [{block name="voucherdiscount"}]
+        <tr class="voucherdiscount">
+            <td class="indent"></td>
+            <td class="description">
+                [{oxmultilang ident="D3_PDFDOCUMENTS_VOUCHERDISCOUNT" suffix="COLON"}]
+            </td>
+            <td class="values">
+                -[{$order->getFormattedTotalVouchers()}] [{$currency->name}]
+            </td>
+        </tr>
+    [{/block}]
+[{/if}]
+
+[{block name="delivery"}]
+    [{if $config->getConfigParam('blShowVATForDelivery')}]
+        [{assign var="deliveryPrice" value=$order->getOrderDeliveryPrice()}]
+        <tr class="delivery">
+            <td class="indent"></td>
+            <td class="description">
+                [{oxmultilang 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'}]
+                    [{oxmultilang ident="D3_PDFDOCUMENTS_TAX" args=$order->getFieldData('oxdelvat') suffix="COLON"}]
+                [{else}]
+                    [{oxmultilang ident="D3_PDFDOCUMENTS_PROPORTIONAL_TAX" suffix="COLON"}]
+                [{/if}]
+            </td>
+            <td class="values">
+                [{$lang->formatCurrency($deliveryPrice->getVATValue(), $currency)}] [{$currency->name}]
+            </td>
+        </tr>
+    [{else}]
+        <tr class="delivery">
+            <td class="indent"></td>
+            <td class="description">
+                [{oxmultilang ident="D3_PDFDOCUMENTS_DELIVERY" suffix="COLON"}]
+            </td>
+            <td class="values">
+                [{$lang->formatCurrency($order->getFieldData('oxdelcost'), $currency)}] [{$currency->name}]
+            </td>
+        </tr>
+    [{/if}]
+[{/block}]
+
+[{block name="payment"}]
+    [{if $config->getConfigParam('blShowVATForPayCharge')}]
+        [{assign var="paymentPrice" value=$order->getOrderPaymentPrice()}]
+        <tr class="payment">
+            <td class="indent"></td>
+            <td class="description">
+                [{oxmultilang 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'}]
+                    [{oxmultilang ident="D3_PDFDOCUMENTS_TAX" args=$order->getFieldData('oxpayvat') suffix="COLON"}]
+                [{else}]
+                    [{oxmultilang ident="D3_PDFDOCUMENTS_PROPORTIONAL_TAX" suffix="COLON"}]
+                [{/if}]
+            </td>
+            <td class="values">
+                [{$lang->formatCurrency($paymentPrice->getVATValue(), $currency)}] [{$currency->name}]
+            </td>
+        </tr>
+    [{else}]
+        <tr class="payment">
+            <td class="indent"></td>
+            <td class="description">
+                [{oxmultilang ident="D3_PDFDOCUMENTS_PAYMENT" suffix="COLON"}]
+            </td>
+            <td class="values">
+                [{$lang->formatCurrency($order->getFieldData('oxpaycost'), $currency)}] [{$currency->name}]
+            </td>
+        </tr>
+    [{/if}]
+[{/block}]
+
+[{block name="wrapping"}]
+    [{if $order->getFieldData('oxwrapcost')}]
+        [{if $config->getConfigParam('blShowVATForWrapping')}]
+            [{assign var="wrappingPrice" value=$order->getOrderWrappingPrice()}]
+            <tr class="wrapping">
+                <td class="indent"></td>
+                <td class="description">
+                    [{oxmultilang 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">
+                    [{oxmultilang 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">
+                    [{oxmultilang ident="D3_PDFDOCUMENTS_WRAPPING" suffix="COLON"}]
+                </td>
+                <td class="values">
+                    [{$lang->formatCurrency($order->getFieldData('oxwrapcost'), $currency)}] [{$currency->name}]
+                </td>
+            </tr>
+        [{/if}]
+    [{/if}]
+[{/block}]
+
+[{block name="giftcard"}]
+    [{if $order->getFieldData('oxgiftcardcost')}]
+        [{if $config->getConfigParam('blShowVATForWrapping')}]
+            [{assign var="giftCardPrice" value=$order->getOrderGiftCardPrice()}]
+            <tr class="giftcard">
+                <td class="indent"></td>
+                <td class="description">
+                    [{oxmultilang 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">
+                    [{oxmultilang 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">
+                    [{oxmultilang ident="D3_PDFDOCUMENTS_GIFTCARD" suffix="COLON"}]
+                </td>
+                <td class="values">
+                    [{$lang->formatCurrency($order->getFieldData('oxgiftcardcost'), $currency)}] [{$currency->name}]
+                </td>
+            </tr>
+        [{/if}]
+    [{/if}]
+[{/block}]
+
+[{block name="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">
+            [{oxmultilang ident="D3_PDFDOCUMENTS_TOTALSUMBRUT" suffix="COLON"}]
+        </td>
+        <td class="values">
+            [{$order->getFormattedTotalOrderSum()}] [{$currency->name}]
+        </td>
+    </tr>
+[{/block}]

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

@@ -0,0 +1,62 @@
+[{assign var="currency"   value=$order->getOrderCurrency()}]
+[{assign var="showPrices" value=$showPrices|default:true}]
+
+[{block name="articlelist"}]
+    <table class="article_table[{if $showPrices}]_prices[{/if}]">
+        <tr>
+            <th class="amount">
+                [{oxmultilang ident="D3_PDFDOCUMENTS_AMOUNT"}]
+            </th>
+            <th class="description">
+                [{oxmultilang ident="D3_PDFDOCUMENTS_DESCRIPTION"}]
+            </th>
+            [{if $showPrices}]
+                <th class="tax">
+                    [{oxmultilang ident="D3_PDFDOCUMENTS_USTPERCENTAGE"}]
+                </th>
+                <th class="unitPrice">
+                    [{oxmultilang ident="D3_PDFDOCUMENTS_UNITPRICE"}]
+                </th>
+                <th class="totalPrice">
+                    [{oxmultilang ident="D3_PDFDOCUMENTS_TOTALPRICE"}]
+                </th>
+            [{/if}]
+        </tr>
+        [{foreach from=$order->getOrderArticles(true) item=orderArticle}]
+            <tr>
+                <td class="amount">
+                    [{$orderArticle->getFieldData('oxamount')}]
+                </td>
+                <td class="description">
+                    [{$orderArticle->getFieldData('oxtitle')}] [{$orderArticle->getFieldData('oxselvariant')}]
+                    <br>
+                    <span class="artnr">
+                        [{oxmultilang 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>
+                [{/if}]
+            </tr>
+        [{/foreach}]
+    </table>
+[{/block}]
+[{if $showPrices}]
+    [{block name="articleCosts"}]
+        <nobreak>
+            <table class="article_costs_table">
+                [{block name="d3_article_costs_summary"}]
+                    [{include file="d3pdfarticlecostsummary.tpl"}]
+                [{/block}]
+            </table>
+        </nobreak>
+    [{/block}]
+[{/if}]

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

@@ -0,0 +1,19 @@
+[{block name="deliveryaddress"}]
+    [{if $order->getFieldData('oxdelstreet')}]
+        <div class="deliveryaddress">
+            <div class="headline">
+                [{oxmultilang ident="D3_PDFDOCUMENTS_DELIVERYADDRESS" suffix="COLON"}]
+            </div>
+            [{if $order->getFieldData('oxdelcompany')}]
+                <div class="company">[{$order->getFieldData('oxdelcompany')}]</div>
+            [{/if}]
+            <div class="name">[{$order->getFieldData('oxdelfname')}] [{$order->getFieldData('oxdellname')}]</div>
+            [{if $order->getFieldData('oxdeladdinfo')}]
+                <div class="addinfo">[{$order->getFieldData('oxdeladdinfo')}]</div>
+            [{/if}]
+            <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>
+    [{/if}]
+[{/block}]

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

@@ -1,7 +1,7 @@
-[{assign var="defaultPagePadding" value=","|explode:"45,20,10,25"}]
+[{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 ;

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

@@ -1,27 +1,39 @@
 <div class="informations">
-    <div>
+    <div class="contactinformations">
         [{block name="pdfContactInformations"}]
-            <div class="aligning"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_GET_IN_CONTACT"}]</strong></div>
-            <div class="aligning fontSize12">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TELEFON"}][{$shop->getFieldData('oxtelefon')}]</div>
-            <div class="aligning fontSize12">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_FAX"}][{$shop->getFieldData('oxtelefax')}]</div>
-            <div class="aligning fontSize12">[{$shop->getFieldData('oxinfoemail')}]</div>
+            <div class="headline">
+                [{oxmultilang ident="D3_PDFDOCUMENTS_GET_IN_CONTACT"}]
+            </div>
+            <div>
+                [{oxmultilang ident="D3_PDFDOCUMENTS_TELEFON" suffix="COLON"}] [{$shop->getFieldData('oxtelefon')}]
+            </div>
+            <div>
+                [{oxmultilang ident="D3_PDFDOCUMENTS_FAX" suffix="COLON"}] [{$shop->getFieldData('oxtelefax')}]
+            </div>
+            <div>
+                [{oxmultilang ident="D3_PDFDOCUMENTS_EMAIL" suffix="COLON"}] [{$shop->getFieldData('oxinfoemail')}]
+            </div>
         [{/block}]
     </div>
 
-    <div>
+    <div class="bankaccountinformations">
         [{block name="pdfBankaccountInformations"}]
-            <div class="aligning heading_order_paddingTop10"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_BANKVERBINDUNG"}]</strong></div>
-            <div class="aligning">[{$shop->getFieldData('oxbankname')}]</div>
-            <div class="aligning">[{oxmultilang ident="ORDER_OVERVIEW_PDF_ACCOUNTNR"}][{$shop->getFieldData('oxibannumber')}]</div>
-            <div class="aligning">[{oxmultilang ident="ORDER_OVERVIEW_PDF_BANKCODE_HEADER"}][{$shop->getFieldData('oxbiccode')}]</div>
-        [{/block}]
-    </div>
-    <div>
-        [{block name="pdfDocumentInformations"}]
-            <div class="aligning heading_order_paddingTop10">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILLNR"}][{$order->getFieldData('oxbillnr')}]</div>
-            <div class="aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_CUSTOMERNR"}] [{$user->getFieldData('oxcustnr')}]</div>
-            <div class="aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DATE"}][{$order->getFieldData('oxbilldate')|date_format:"%d.%m.%Y"}]</div>
-            <div class="aligning">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTIDNR"}][{$shop->getFieldData('oxvatnumber')}]</div>
+            <div class="headline">
+                [{oxmultilang ident="D3_PDFDOCUMENTS_BANK_ACCOUNT"}]
+            </div>
+            <div>
+                [{$shop->getFieldData('oxbankname')}]
+            </div>
+            <div>
+                [{oxmultilang ident="D3_PDFDOCUMENTS_BANK_ACCOUNTNR" suffix="COLON"}] [{$shop->getFieldData('oxibannumber')}]
+            </div>
+            <div>
+                [{oxmultilang ident="D3_PDFDOCUMENTS_BANK_BANKCODE_HEADER" suffix="COLON"}] [{$shop->getFieldData('oxbiccode')}]
+            </div>
         [{/block}]
     </div>
+
+    [{if $documentinformationfile}]
+        [{include file=$documentinformationfile}]
+    [{/if}]
 </div>

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

@@ -0,0 +1,12 @@
+[{block name="recipientaddress"}]
+    [{if $order->getFieldData('oxbillcompany')}]
+        <div class="company">[{$order->getFieldData('oxbillcompany')}]</div>
+    [{/if}]
+    <div class="name">[{$order->getFieldData('oxbillfname')}] [{$order->getFieldData('oxbilllname')}]</div>
+    [{if $order->getFieldData('oxbilladdinfo')}]
+        <div class="addinfo">[{$order->getFieldData('oxbilladdinfo')}]</div>
+    [{/if}]
+    <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>
+[{/block}]

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

@@ -1,13 +1,13 @@
-[{assign var="defaultPagePadding" value=","|explode:"45,20,10,25"}]
+[{assign var="defaultPagePadding" value=","|explode:"45,15,25,25"}] [{* top, right, bottom, left *}]
 [{assign var="pagePadding" value=$pagePadding|default:$defaultPagePadding}]
 
 [{* rulers *}]
 [{* include file="d3pdfrulers.tpl" pagePadding=$pagePadding *}]
 
-<style type="text/css">
+<style>
     .rulerItemHorizontal {
         position: absolute;
-        top: 0;
+        top: -[{$pagePadding.0}]mm;
         width: 0;
         height: 7px;
         color: blue;
@@ -33,7 +33,9 @@
 
 [{* vertical *}]
 [{section name=rulerItemsVertical start=0 step=10 loop=600}]
-    <div class="rulerItemVertical" style="top: [{$smarty.section.rulerItemsVe.index}]mm">[{$smarty.section.rulerItemsVertical.index}]</div>
+    <div class="rulerItemVertical" style="top: [{math equation="top - padding" top=$smarty.section.rulerItemsVertical.index padding=$pagePadding.0}]mm">
+        [{$smarty.section.rulerItemsVertical.index}]
+    </div>
 [{/section}]
 
 

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

@@ -1,10 +1,10 @@
 [{assign var="pageset" value=$pageset|default:"new"}]
 [{assign var="orientation" value=$orientation|default:"P"}]
 [{assign var="format" value=$format|default:"A4"}]
-[{assign var="defaultPagePadding" value=","|explode:"45,20,10,25"}]
+[{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}]

Application/views/tpl/documents/inc/page/footer.tpl

@@ -1,34 +1,34 @@
-[{assign var="defaultPagePadding" value=","|explode:"45,20,10,25"}]
+[{assign var="defaultPagePadding" value=","|explode:"45,15,25,25"}] [{* top, right, bottom, left *}]
 [{assign var="pagePadding" value=$pagePadding|default:$defaultPagePadding}]
 
 [{block name="pdfFooter"}]
-    <div class="footer" style="padding: 0 [{$pagePadding.1}]mm [{$pagePadding.2}]mm [{$pagePadding.3}]mm">
+    <div class="footer" style="margin: 0 [{$pagePadding.1}]mm 10mm [{$pagePadding.3}]mm">
         <table>
             <tr>
                 [{block name="pdfFooterLeft"}]
                     <td class="footerLeft">
-                        <div>[{$shop->oxshops__oxname->value}]</div>
-                        <div>[{$shop->oxshops__oxstreet->value}]</div>
-                        <div>[{$shop->oxshops__oxzip->value}] [{$shop->oxshops__oxcity->value}]</div>
-                        <div>[{$shop->oxshops__oxcountry->value}]</div>
-                        <div>[{$shop->oxshops__oxurl->value}]</div>
-                        <div>[{$shop->oxshops__oxinfoemail->value}]</div>
+                        <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>
                 [{/block}]
                 [{block name="pdfFooterCenter"}]
                     <td class="footerCenter">
-                        <div>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_MANAGINGDIRECTOR"}][{$shop->oxshops__oxfname->value}] [{$shop->oxshops__oxlname->value}]</div>
-                        <div>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_COURT"}] [{$shop->oxshops__oxcourt->value}]</div>
-                        <div>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_HRBNR"}][{$shop->oxshops__oxhrbnr->value}]</div>
-                        <div>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTID"}][{$shop->oxshops__oxvatnumber->value}]</div>
+                        <div>[{oxmultilang ident="D3_PDFDOCUMENTS_MANAGINGDIRECTOR" suffix="COLON"}] [{$shop->getFieldData('oxfname')}] [{$shop->getFieldData('oxlname')}]</div>
+                        <div>[{oxmultilang ident="D3_PDFDOCUMENTS_COURT" suffix="COLON"}] [{$shop->getFieldData('oxcourt')}]</div>
+                        <div>[{oxmultilang ident="D3_PDFDOCUMENTS_HRBNR" suffix="COLON"}] [{$shop->getFieldData('oxhrbnr')}]</div>
+                        <div>[{oxmultilang ident="D3_PDFDOCUMENTS_USTID" suffix="COLON"}] [{$shop->getFieldData('oxvatnumber')}]</div>
                     </td>
                 [{/block}]
                 [{block name="pdfFooterRight"}]
                     <td class="footerRight">
-                        <div>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_BANKVERBINDUNG"}]</div>
-                        <div>[{$shop->oxshops__oxbankname->value}]</div>
-                        <div>[{oxmultilang ident="ORDER_OVERVIEW_PDF_ACCOUNTNR"}][{$shop->oxshops__oxibannumber->value}]</div>
-                        <div>[{oxmultilang ident="ORDER_OVERVIEW_PDF_BANKCODE"}][{$shop->oxshops__oxbiccode->value}]</div>
+                        <div>[{oxmultilang ident="D3_PDFDOCUMENTS_BANK_ACCOUNT"}]</div>
+                        <div>[{$shop->getFieldData('oxbankname')}]</div>
+                        <div>[{oxmultilang ident="D3_PDFDOCUMENTS_BANK_ACCOUNTNR" suffix="COLON"}] [{$shop->getFieldData('oxibannumber')}]</div>
+                        <div>[{oxmultilang ident="D3_PDFDOCUMENTS_BANK_BANKCODE" suffix="COLON"}] [{$shop->getFieldData('oxbiccode')}]</div>
                     </td>
                 [{/block}]
             </tr>

Application/views/tpl/documents/inc/page/header.tpl

@@ -4,10 +4,10 @@
     <div class="header">
         [{if $showLogo}]
             [{* pdf logo is available only in non admin theme *}]
-            [{assign var="isAdmin" value=$oViewConf->isAdmin()}]
-            [{$oViewConf->setAdminMode(false)}]
-            <img class="logo" alt="Logo" src="[{$oViewConf->getImageUrl('pdf_logo.jpg')}]">
-            [{$oViewConf->setAdminMode($isAdmin)}]
+            [{assign var="isAdmin" value=$viewConfig->isAdmin()}]
+            [{$viewConfig->setAdminMode(false)}]
+            <img class="logo" alt="Logo" src="[{$viewConfig->getImageUrl('pdf_logo.jpg')}]">
+            [{$viewConfig->setAdminMode($isAdmin)}]
         [{/if}]
     </div>
 [{/block}]

Application/views/tpl/documents/inc/page/returnaddress.tpl

@@ -1 +1 @@
-[{$shop->getFielddata('oxname')}] - [{$shop->getFielddata('oxstreet')}] - [{$shop->getFielddata('oxzip')}] [{$shop->getFielddata('oxcity')}]
+[{$shop->getFielddata('oxname')}] - [{$shop->getFielddata('oxstreet')}] - [{$shop->getFielddata('oxzip')}] [{$shop->getFielddata('oxcity')}] - [{$shop->getFieldData('oxcountry')}]

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

@@ -0,0 +1,19 @@
+[{block name="conclusion"}]
+    <nobreak>
+        [{block name="conclusion_paymethod"}]
+            <div class="conclusion_payment">
+                [{oxmultilang ident="D3_PDFDOCUMENTS_USED_PAYMENTMETHOD" suffix="COLON"}]
+                [{$payment->getFieldData('oxdesc')}]<br>
+
+                [{include file="d3invoice_pdf_payinfo.tpl"}]
+            </div>
+        [{/block}]
+
+        [{block name="conclusion_thankyou"}]
+            <div class="conclusion_thankyou">
+                [{oxmultilang ident="D3_PDFDOCUMENTS_THANKYOU_1"}]<br>
+                [{oxmultilang ident="D3_PDFDOCUMENTS_THANKYOU_2" args=$shop->getFieldData('oxname')}]
+            </div>
+        [{/block}]
+    </nobreak>
+[{/block}]

Application/views/tpl/documents/invoice/inc/informations.tpl

@@ -0,0 +1,19 @@
+[{block name="informations"}]
+    <div class="documentinformations">
+        [{block name="pdfDocumentInformations"}]
+            <div>
+                [{oxmultilang ident="D3_PDFDOCUMENTS_ORDERBILLNR" suffix="COLON"}] [{$order->getFieldData('oxbillnr')}]
+            </div>
+            <div>
+                [{oxmultilang ident="D3_PDFDOCUMENTS_CUSTOMERNR" suffix="COLON"}] [{$user->getFieldData('oxcustnr')}]
+            </div>
+            <div>
+                [{assign var="dateFormat" value='D3_PDFDOCUMENTS_DATE_FORMAT'|oxmultilangassign}]
+                [{oxmultilang ident="D3_PDFDOCUMENTS_DATE" suffix="COLON"}] [{$order->getFieldData('oxbilldate')|date_format:$dateFormat}]
+            </div>
+            <div>
+                [{oxmultilang ident="D3_PDFDOCUMENTS_USTIDNR" suffix="COLON"}] [{$shop->getFieldData('oxvatnumber')}]
+            </div>
+        [{/block}]
+    </div>
+[{/block}]

Application/views/tpl/documents/invoice/inc/payinfo.tpl

@@ -0,0 +1,16 @@
+[{block name="payinfo"}]
+    [{if $payment->getId() == 'oxidinvoice'}]
+        [{block name="payinfo_billable_till"}]
+            [{assign var="dateFormat" value='D3_PDFDOCUMENTS_DATE_FORMAT'|oxmultilangassign}]
+            [{oxmultilang ident="D3_PDFDOCUMENTS_PAYABLEUNTIL"}]
+            [{$document->getPayableUntilDate()|date_format:$dateFormat}]
+        [{/block}]
+    [{elseif $payment->getId() == 'oxidpayadvance' || $payment->getId() == 'oxidcreditcard'}]
+        [{block name="payinfo_payed"}]
+            [{oxmultilang ident="D3_PDFDOCUMENTS_RECEIVED_PAYMENT"}]
+        [{/block}]
+    [{else}]
+        [{block name="payinfo_other"}]
+        [{/block}]
+    [{/if}]
+[{/block}]

Application/views/tpl/documents/invoice/inc/salutation.tpl

@@ -0,0 +1,12 @@
+[{block name="salutation"}]
+    <div class="salutation">
+        <div class="documenttype">[{oxmultilang ident="D3_PDFDOCUMENTS_INVOICE"}]</div>
+        <div class="documentnumber">[{oxmultilang ident="D3_PDFDOCUMENTS_ORDERNR" suffix="COLON"}] [{$order->getFieldData('oxordernr')}]</div>
+
+        [{assign var="dateFormat" value='D3_PDFDOCUMENTS_DATE_FORMAT'|oxmultilangassign}]
+        [{assign var="sArgs" value=$order->getFieldData('oxorderdate')|date_format:$dateFormat|cat:"//"|cat:$shop->getFieldData('oxname')}]
+        [{assign var="aArgs" value="//"|explode:$sArgs}]
+
+        <div>[{oxmultilang ident="D3_PDFDOCUMENTS_ORDER_FROM_AT" args=$aArgs}]</div>
+    </div>
+[{/block}]

Application/views/tpl/documents/invoice/includingFiles/d3_article_costs_summary.tpl

@@ -1,26 +0,0 @@
-[{* ++++++Beschreibung der Kostensummierung++++++ *}]
-<td class="article_costs_table_paddingRight article_costs_table_desc_width70 ">
-    <div class="order_sum fontSize12 border-bottom  order_article_PaddingBottom5">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO"}]</div>
-    [{if $order->getFormattedDiscount() != 0}]
-    <div class="order_sum fontSize12 border-bottom spacing_order_info">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT"}]</div>
-    [{/if}]
-    <div class="order_sum fontSize12 order_article_PaddingTop5">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMNETTO"}]</div>
-    [{foreach from=$productVats key=VatKey item=oVat}]
-    <div class="order_sum fontSize12 border-bottom spacing_order_info">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAX"}] [{$VatKey}] [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_PERCENTAGE"}] [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAXPERCVALUE"}]</div>
-    [{/foreach}]
-    <div class="order_sum fontSize12 order_article_PaddingTop5">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DELIVERY"}]</div>
-    <div class="order_sum fontSize12 border-bottom spacing_order_info">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAX"}] [{$VatKey}] [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_PERCENTAGE"}] [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAXPERCVALUE"}]</div>
-    <div class="order_sum fontSize12 order_article_PaddingTop5 order_article_PaddingBottom5"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TOTALSUMBRUT"}]</strong></div>
-</td>
-[{* ++++++Kostensummierung++++++ *}]
-<td class="article_costs_table_sum_width30">
-    <div class="order_sumNum aligning fontSize12 border-bottom  order_article_PaddingBottom5">[{$order->getFormattedTotalBrutSum()}] [{$currency->name}]</div>
-    [{if $order->getFormattedDiscount() != 0}]
-    <div class="spacing_order_info order_sumNum aligning fontSize12 border-bottom">-[{$order->getFormattedDiscount()}] [{$currency->name}]</div>
-    [{/if}]
-    <div class="order_article_PaddingTop5 order_sumNum aligning fontSize12">[{$order->getFormattedTotalNetSum()}] [{$currency->name}]</div>
-    <div class="spacing_order_info order_sumNum aligning fontSize12 border-bottom">[{$lang->formatCurrency($oVat, $currency)}] [{$currency->name}]</div>
-    <div class="order_article_PaddingTop5 order_sumNum aligning fontSize12">[{$lang->formatCurrency($deliveryPrice->getNettoPrice(), $currency)}] [{$currency->name}]</div>
-    <div class="order_article_PaddingTop5 order_article_PaddingBottom5 order_sumNum aligning fontSize12 border-bottom">[{$lang->formatCurrency($deliveryPrice->getVATValue(), $currency)}] [{$currency->name}]</div>
-    <div class="order_article_PaddingTop5 order_article_PaddingBottom5 order_sumNum aligning fontSize12"><strong>[{$order->getFormattedTotalOrderSum()}] [{$currency->name}]</strong></div>
-</td>

Application/views/tpl/documents/invoice/includingFiles/pdfHeader.tpl

@@ -1,9 +0,0 @@
-[{block name="recipientaddress"}]
-	[{if $order->getFieldData('oxbillcompany')}]
-		<div>[{$order->getFieldData('oxbillcompany')}]</div>
-	[{/if}]
-	<div>[{$order->getFieldData('oxbillfname')}] [{$order->getFieldData('oxbilllname')}]</div>
-	<div>[{$order->getFieldData('oxbillstreet')}] [{$order->getFieldData('oxbillstreetnr')}]</div>
-	<div><strong>[{$order->getFieldData('oxbillzip')}] [{$order->getFieldData('oxbillcity')}]</strong></div>
-	<div class="heading_order_paddingBottom15">[{$shop->getFieldData('oxcountry')}]</div>
-[{/block}]

Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl

@@ -1,14 +0,0 @@
-[{block name="pdfPastThankFile"}]
-    <table class="past_thank_width100 borderSpacingUnset">
-        <tr><td class="paddingTop15 past_thank_width100 fontSize12">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USED_PAYMENTMETHOD"}] [{$payment->getFieldData('oxdesc')}]</td></tr>
-    [{* +++++++Individueller Zahlungstext+++++++ *}]
-    [{if $order->oxorder__d3pdftextbestellbestaetigung->value}]
-        <tr><td class="past_thank_width100 fontSize12">[{$order->oxorder__d3pdftextbestellbestaetigung->value}]</td></tr>
-    [{else}]
-        <tr><td class="past_thank_width100 fontSize12">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USED_GREETINGSORDER"}]</td></tr>
-    [{/if}]
-        [{**Schlusstext/ Abschied***}]
-        <tr><td class="marginTop5 past_thank_width100 fontSize12">[{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_1"}]</td></tr>
-        <tr><td class="past_thank_width100 fontSize12">[{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_2"}]</td></tr>
-    </table>
-[{/block}]

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

@@ -1,7 +1,5 @@
-[{assign var="currency"      value=$order->getOrderCurrency()}]
-[{assign var="deliveryPrice" value= $order->getOrderDeliveryPrice()}]
-[{assign var="productVats"   value= $order->getProductVats(false)}]
-[{assign var="pagePadding"   value=","|explode:"45,20,10,25"}]
+[{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"}]
@@ -11,81 +9,37 @@
 
 [{capture append="pdfBlock_header"}]
     [{block name="pdfHeader"}]
-        [{include file="d3pdfheader.tpl" showLogo=true}]
+        [{include file="d3pdfheader.tpl" showLogo=$showLogo}]
     [{/block}]
 [{/capture}]
 
 [{capture append="pdfBlock_content"}]
-    [{*include file="d3pdfrulers.tpl" pagePadding=$pagePadding*}]
+    [{* include file="d3pdfrulers.tpl" pagePadding=$pagePadding *}]
     [{include file="d3pdffoldmarks.tpl" pagePadding=$pagePadding}]
 
     [{block name="pdfAddressArea"}]
-        [{include file="d3pdfaddressarea.tpl" addressfile="d3invoice_pdf_addressarea.tpl"}]
+        [{include file="d3pdfaddressarea.tpl"}]
     [{/block}]
 
     [{block name="pdfInformations"}]
-        [{include file="d3pdfinformations.tpl"}]
+        [{include file="d3pdfinformations.tpl" documentinformationfile="d3invoice_pdf_informations.tpl"}]
     [{/block}]
 
-    <div>
-        [{* +++++++Lieferadressen dynamisch+++++++ *}]
-        [{if $order->getFieldData('oxdelstreet')}]
-            <div class="heading_order_fontSize10 heading_order_paddingBottom8">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYADDRESS"}]</div>
-            [{if $order->getFieldData('oxdelcompany')}]<div>[{$order->getFieldData('oxdelcompany')}]</div>[{/if}]
-            <div>[{$order->getFieldData('oxdelfname')}] [{$order->getFieldData('oxdellname')}]</div>
-            <div>[{$order->getFieldData('oxdelstreet')}] [{$order->getFieldData('oxdelstreetnr')}]</div>
-            <div><strong>[{$order->getFieldData('oxdelzip')}] [{$order->getFieldData('oxdelcity')}]</strong></div>
-            <div>[{$shop->getFieldData('oxcountry')}]</div>
-            <div>[{$shop->getFieldData('oxdeladdinfo')}]</div>
-        [{/if}]
-    </div>
-
-    <div>
-        [{*Bestellnummer,Rechnungsvermerk, 'Ihre bestellung vom...'*}]
-        <div class="heading_order_paddingTop22 heading_order_fontSize15"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERNR"}][{$order->getFieldData('oxordernr')}]</strong></div>
-        [{if $order->getFieldData('d3pdftextkostenstelle_kunden')}]<div>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_INVOICENOTE"}][{$order->getFieldData('d3pdftextkostenstelle_kunden')}]</div>[{/if}]
-        <div class="heading_order_paddingTop1">[{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSINCERELY"}][{$order->getFieldData('oxorderdate')|date_format:"%d.%m.%Y"}][{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSAT"}]</div>
-    </div>
-
-    [{* +++++Artikeltabelle+++++*}]
-    [{block name="articleListing"}]
-        <table class="order_article_marginTop10" cellspacing="0">
-            <tr>
-                <td class="border-bottom order_article_PaddingBottom5 "><div class="vertical-a order_article_listing_fontSize order_article_listing_width_amount">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_AMOUNT"}]</div></td>
-                <td class="border-bottom order_article_PaddingBottom5 "><div class="order_article_listing_fontSize order_article_listing_width_desc">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DESCRIPTION"}]</div></td>
-                <td class="border-bottom order_article_PaddingBottom5 "><div class="aligning order_article_listing_fontSize order_article_listing_width_ust">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTPERCENTAGE"}]</div></td>
-                <td class="border-bottom order_article_PaddingBottom5 "><div class="aligning order_article_listing_fontSize order_article_listing_width_unitPrice">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_UNITPRICE"}]</div></td>
-                <td class="border-bottom order_article_PaddingBottom5 "><div class="aligning order_article_listing_fontSize order_article_listing_width_total_Price">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TOTALPRICE"}]</div></td>
-            </tr>
-            [{foreach from=$order->getOrderArticles(true) item=oOrderArticle}]
-                <tr>
-                    <td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='fontSize12 aligning order_article_listing_width_amount order_article_listing_paddingRight52'>[{$oOrderArticle->oxorderarticles__oxamount->value }]</div></td>
-                    <td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='fontSize12 order_article_listing_width_desc'>
-                            [{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }]
-                            <br>
-                            <span class="order_article_listing_fontSize9">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }]</span>
-                        </div></td>
-                    <td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='aligning fontSize12 order_article_listing_width_ust'>[{$oOrderArticle->oxorderarticles__oxvat->value }]</div></td>
-                    <td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='aligning fontSize12 order_article_listing_width_unitPrice'>[{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}]</div></td>
-                    <td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='aligning fontSize12 order_article_listing_width_total_Price'>[{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}]</div></td>
-                </tr>
-            [{/foreach}]
-        </table>
+    [{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}]
-    <nobreak>
-        [{block name="articleCosts"}]
-            <table class="article_costs_table border-bottom">
-                <tr>
-                    [{block name="d3_article_costs_summary"}]
-                        [{include file="d3_article_costs_summary.tpl"}]
-                    [{/block}]
-                </tr>
-            </table>
-        [{/block}]
-        [{block name="pdfPastThankFile"}]
-            [{include file="d3invoice_pdf_conclusion.tpl"}]
-        [{/block}]
-    </nobreak>
 [{/capture}]
 
 [{capture append="pdfBlock_footer"}]

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

@@ -1,89 +1 @@
-[{assign var="currency"      value=$order->getOrderCurrency()}]
-[{assign var="deliveryPrice" value= $order->getOrderDeliveryPrice()}]
-[{assign var="productVats"   value= $order->getProductVats(false)}]
-
-<style type="text/css">
-	[{include file="d3pdfstyle.css"}]
-</style>
-
-<page backtop="30mm" backbottom="30mm" backleft="10mm" backright="10mm" pageset="new">
-	<page_header>
-        [{block name="pdfTopingFile"}]
-			[{include file="d3pdfheader.tpl" showLogo=false}]
-        [{/block}]
-	</page_header>
-	<page_footer>
-        [{block name="pdfFooterFile"}]
-			[{include file="d3pdffooter.tpl"}]
-        [{/block}]
-	</page_footer>
-
-	[{* +++++ main page part +++++ *}]
-    [{block name="pdfHeadingFile"}]
-        [{block name="pdfHeaderFile"}]
-			[{include file="d3invoice_pdf_addressarea.tpl"}]
-        [{/block}]
-    [{/block}]
-        [{* +++++Artikeltabelle+++++*}]
-    [{block name="articleListing"}]
-        <table class="order_article_marginTop10">
-            <tr>
-                <td class="border-bottom order_article_PaddingBottom5 "><div class="vertical-a order_article_listing_fontSize order_article_listing_width_amount">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_AMOUNT"}]</div></td>
-                <td class="border-bottom order_article_PaddingBottom5 "><div class="order_article_listing_fontSize order_article_listing_width_desc">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DESCRIPTION"}]</div></td>
-                <td class="border-bottom order_article_PaddingBottom5 "><div class="aligning order_article_listing_fontSize order_article_listing_width_ust">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTPERCENTAGE"}]</div></td>
-                <td class="border-bottom order_article_PaddingBottom5 "><div class="aligning order_article_listing_fontSize order_article_listing_width_unitPrice">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_UNITPRICE"}]</div></td>
-                <td class="border-bottom order_article_PaddingBottom5 "><div class="aligning order_article_listing_fontSize order_article_listing_width_total_Price">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TOTALPRICE"}]</div></td>
-            </tr>
-        [{foreach from=$order->getOrderArticles(true) item=oOrderArticle}]
-            <tr>
-                <td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='fontSize12 aligning order_article_listing_width_amount order_article_listing_paddingRight52'>[{$oOrderArticle->oxorderarticles__oxamount->value }]</div></td>
-                <td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='fontSize12 order_article_listing_width_desc'>
-                        [{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }]
-                        <br>
-                        <span class="order_article_listing_fontSize9">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }]</span>
-                    </div></td>
-                <td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='aligning fontSize12 order_article_listing_width_ust'>[{$oOrderArticle->oxorderarticles__oxvat->value }]</div></td>
-                <td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='aligning fontSize12 order_article_listing_width_unitPrice'>[{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}]</div></td>
-                <td class="order_article_PaddingTop5 vertical-a order_article_PaddingBottom5"><div class='aligning fontSize12 order_article_listing_width_total_Price'>[{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}]</div></td>
-            </tr>
-        [{/foreach}]
-        </table>
-    [{/block}]
-	<nobreak>
-		[{block name="articleCosts"}]
-		<table class="article_costs_table border-bottom">
-			<tr>
-				[{* ++++++Artikelzusammenfassung++++++ *}]
-				<td class="article_costs_table_paddingRight article_costs_table_td_width50 ">
-					<div class="order_sum fontSize12 border-bottom  order_article_PaddingBottom5">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO"}]</div>
-				[{if $order->getFormattedDiscount() != 0}]
-					<div class="order_sum fontSize12 border-bottom spacing_order_info">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT"}]</div>
-				[{/if}]
-					<div class="order_sum fontSize12 order_article_PaddingTop5">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMNETTO"}]</div>
-				[{foreach from=$productVats key=VatKey item=oVat}]
-					<div class="order_sum fontSize12 border-bottom spacing_order_info">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAX"}] [{$VatKey}] [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_PERCENTAGE"}] [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAXPERCVALUE"}]</div>
-				[{/foreach}]
-					<div class="order_sum fontSize12 order_article_PaddingTop5">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DELIVERY"}]</div>
-					<div class="fontSize12 border-bottom spacing_order_info aligning order_article_costs_paddingRight66 order_article_costs_marginLeftSub3">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAX"}] [{$VatKey}] [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_PERCENTAGE"}] [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TAXPERCVALUE"}]</div>
-					<div class="order_sum fontSize12 order_article_PaddingTop5 order_article_PaddingBottom5"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TOTALSUMBRUT"}]</strong></div>
-				</td>
-				[{* ++++++Kosten der Bestellung++++++ *}]
-				<td class="article_costs_table_td_width50">
-					<div class="order_sumNum aligning fontSize12 border-bottom  order_article_PaddingBottom5">[{$order->getFormattedTotalBrutSum()}] [{$currency->name}]</div>
-				[{if $order->getFormattedDiscount() != 0}]
-					<div class="spacing_order_info order_sumNum aligning fontSize12 border-bottom">-[{$order->getFormattedDiscount()}] [{$currency->name}]</div>
-				[{/if}]
-					<div class="order_article_PaddingTop5 order_sumNum aligning fontSize12">[{$order->getFormattedTotalNetSum()}] [{$currency->name}]</div>
-					<div class="spacing_order_info order_sumNum aligning fontSize12 border-bottom">[{$lang->formatCurrency($oVat, $currency)}] [{$currency->name}]</div>
-					<div class="order_article_PaddingTop5 order_sumNum aligning fontSize12">[{$lang->formatCurrency($deliveryPrice->getNettoPrice(), $currency)}] [{$currency->name}]</div>
-					<div class="order_article_PaddingTop5 order_article_PaddingBottom5 order_sumNum aligning fontSize12 border-bottom">[{$lang->formatCurrency($deliveryPrice->getVATValue(), $currency)}] [{$currency->name}]</div>
-					<div class="order_article_PaddingTop5 order_article_PaddingBottom5 order_sumNum aligning fontSize12"><strong>[{$order->getFormattedTotalOrderSum()}] [{$currency->name}]</strong></div>
-				</td>
-			</tr>
-		</table>
-	[{/block}]
-	[{block name="pdfPastThankFile"}]
-		[{include file="d3invoice_pdf_conclusion.tpl"}]
-	[{/block}]
-	</nobreak>
-</page>
+[{include file="d3invoice_pdf.tpl" showLogo=false}]

IntelliSenseHelper.php

@@ -1,28 +0,0 @@
-<?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 {}
-}
-
-namespace D3\PdfDocuments\Modules\Application\Model
-{
-    use OxidEsales\Eshop\Application\Model\Order;
-
-    class d3_Order_PdfDocuments_parent extends Order {}
-}

LICENSE

@@ -0,0 +1,675 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
+

Modules/Application/Controller/d3_overview_controller_pdfdocuments.php

@@ -1,67 +1,74 @@
 <?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
+ * See LICENSE file for license details.
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
- * @author    D3 Data Development - Max Buhe <support@shopmodule.com>
- * @link      http://www.oxidmodule.com
+ * @author        D3 Data Development - Max Buhe <support@shopmodule.com>
+ * @link          http://www.oxidmodule.com
  */
 
 namespace D3\PdfDocuments\Modules\Application\Controller;
 
 use D3\PdfDocuments\Application\Controller\orderOverviewPdfGenerator;
+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;
+use OxidEsales\Eshop\Core\Exception\DatabaseConnectionException;
 use OxidEsales\Eshop\Core\Registry;
 use OxidEsales\Eshop\Core\TableViewNameGenerator;
-use OxidEsales\Eshop\Core\UtilsView;
+
+if (false) {
+    class_alias(
+        d3_overview_controller_pdfdocuments_parent::class,
+        OrderOverview::class
+    );
+}
 
 class d3_overview_controller_pdfdocuments extends d3_overview_controller_pdfdocuments_parent
 {
-  public function canExport()
-  {
-    // We force reading from master to prevent issues with slow replications or open transactions (see ESDEV-3804).
-    $masterDb = DatabaseProvider::getMaster();
-    $sOrderId = $this->getEditObjectId();
+    /**
+     * @return bool
+     * @throws DatabaseConnectionException
+     */
+    public function d3CanExport()
+    {
+        // We force reading from master to prevent issues with slow replications or open transactions (see ESDEV-3804).
+        $masterDb = DatabaseProvider::getMaster();
+        $sOrderId = $this->getEditObjectId();
 
-    $viewNameGenerator = Registry::get(TableViewNameGenerator::class);
-    $sTable = $viewNameGenerator->getViewName("oxorderarticles");
+        $viewNameGenerator = Registry::get(TableViewNameGenerator::class);
+        $sTable = $viewNameGenerator->getViewName("oxorderarticles");
 
-    $sQ = "select count(oxid) from {$sTable} where oxorderid = " . $masterDb->quote($sOrderId) . " and oxstorno = 0";
-    $blCan = (bool) $masterDb->getOne($sQ);
-
-    return $blCan;
-  }
-
-  public function createPDF()
-  {
-    $soxId = $this->getEditObjectId();
-    if ($soxId != "-1" && isset($soxId)) {
-      /** @var d3_Order_PdfDocuments $oOrder */
-      $oOrder = oxNew(Order::class);
-      if ($oOrder->load($soxId)) {
-          $generator = oxNew( orderOverviewPdfGenerator::class );
-          $generator->generatePdf($oOrder, Registry::getRequest()->getRequestEscapedParameter("pdflanguage"));
-      }
+        $sQ = "select count(oxid) from $sTable where oxorderid = " . $masterDb->quote($sOrderId) . " and oxstorno = 0";
+        return (bool) $masterDb->getOne($sQ);
     }
-  }
 
     /**
-     * @return registryOrderoverview
+     * @throws noPdfHandlerFoundException
+     * @throws pdfGeneratorExceptionAbstract
      */
-  public function d3getGeneratorList()
-  {
-      return oxNew(registryOrderoverview::class);
-  }
+    public function d3CreatePDF()
+    {
+        $soxId = $this->getEditObjectId();
+        if ($soxId != "-1" && isset($soxId)) {
+            /** @var Order $oOrder */
+            $oOrder = oxNew(Order::class);
+            if ($oOrder->load($soxId)) {
+                $generator = oxNew( orderOverviewPdfGenerator::class );
+                $generator->generatePdf($oOrder, Registry::getRequest()->getRequestEscapedParameter("pdflanguage"));
+            }
+        }
+    }
+
+    /**
+    * @return registryOrderoverview
+    */
+    public function d3getGeneratorList()
+    {
+        return oxNew(registryOrderoverview::class);
+    }
 }

Modules/Application/Model/d3_Order_PdfDocuments.php

@@ -1,41 +0,0 @@
-<?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\Model;
-
-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;
-
-class d3_Order_PdfDocuments extends d3_Order_PdfDocuments_parent
-{
-    /**
-     * compatibility to OXID Invoice PDF module
-     * @param string $sFilename
-     * @param int $iSelLang
-     * @param string $target
-     * @throws noBaseObjectSetException
-     * @throws noPdfHandlerFoundException
-     * @throws pdfGeneratorExceptionAbstract
-     */
-    public function genPdf($sFilename, $iSelLang = 0, $target = 'I')
-    {
-        $generator = oxNew( orderOverviewPdfGenerator::class );
-        $generator->generatePdf($this, $sFilename, $iSelLang, $target);
-    }
-}

README.en.md

@@ -0,0 +1,47 @@
+> [german version](README.md)
+
+# PDF Documents
+
+PDF document generator for OXID eShop
+
+Create a wide variety of static or dynamic PDF documents at the touch of a button. The document content is created from Smarty templates.
+
+At the orders of your OXID shop you have the option of creating an invoice and delivery note.
+
+The module can be easily extended to adapt existing documents or add new ones. Even completely different document types (e.g. article data sheets) are possible.
+
+## System requirements:
+
+- installed OXID eShop version from 6.1
+- PHP version for which installation packages are available (PHP 7 + 8)
+- Installation via Composer
+
+## Compatibility:
+
+The module contains the same functionality as the 'OXID Invoice PDF' module. Basically, both modules can be installed in parallel in the shop, if required. 
+
+If the `OXID Invoice PDF` module is to be completely replaced by the `D3 PDF Documents` module (e.g. because third modules also use its function), we provide [a customization](https://packagist.org/packages/d3/pdfdocuments_compat) which is installed additionally.
+
+## Installation:
+
+```bash
+composer require d3/pdfdocuments:^1.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.
+  
+## Support:
+
+- D3 Data Development (Inh. Thomas Dartsch)
+- Home: [www.d3data.de](https://www.d3data.de)
+- E-Mail: support@shopmodule.com
+
+## Credits:
+
+- PDF logo made by Dimitriy Morilubov from www.flaticon.com
+
+## License
+
+This module is distributed under the GPL v3 License. For more information see the ./LICENSE file.
+ 
+Copyright by D3 Data Development (Inh. Thomas Dartsch)

README.md

@@ -0,0 +1,47 @@
+> [english version](README.en.md)
+
+# PDF-Dokumente
+
+PDF-Dokumentgenerator für OXID eShop
+
+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.
+
+Das Modul kann einfach erweitert werden, um bestehende Dokumente anzupassen oder Neue hinzuzufügen. Auch komplett andere Dokumentarten (z.B. Artikeldatenblätter) sind einfach möglich.
+
+## Systemanforderungen:
+
+- installierter OXID eShop in Version ab 6.1
+- PHP-Version, für die Installationspakete verfügbar sind (PHP 7 + 8)
+- Installation via Composer
+
+## Kompatibilität:
+
+Das Modul enthält die selbe Funktionalität wie das `OXID Invoice-PDF`-Modul. Grundsätzlich können beide Module parallel im Shop installiert werden, wenn dies erforderlich ist. 
+
+Soll das `OXID Invoice-PDF`-Modul komplett vom `PDF Dokumente` Modul ersetzt werden (weil z.B. dritte Module ebenfalls dessen Funktion verwenden), stellen wir [eine Anpassung](https://packagist.org/packages/d3/pdfdocuments_compat) zur Verfügung, die zusätzlich installiert wird.
+
+## Installation:
+
+```bash
+composer require d3/pdfdocuments:^1.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.
+  
+## Support:
+
+- D3 Data Development (Inh. Thomas Dartsch)
+- Home: [www.d3data.de](https://www.d3data.de)
+- E-Mail: support@shopmodule.com
+
+## Danksagung:
+
+- PDF-Logo erstellt von Dimitriy Morilubov von www.flaticon.com
+
+## Lizenz
+
+Dieses Modul wird unter der GPL v3 Lizenz vertrieben. Für weitere Informationen siehe die ./LICENSE Datei.
+ 
+Copyright by D3 Data Development (Inh. Thomas Dartsch)

composer.json

@@ -19,20 +19,23 @@
   ],
   "homepage": "https://www.oxidmodule.com/",
   "license": [
-    "proprietary"
+    "GPL-3.0-or-later"
   ],
   "extra": {
     "oxideshop": {
       "blacklist-filter": [
-        "composer.json"
+        "composer.json",
+        "docs/**/*.*"
       ],
       "target-directory": "d3/pdfdocuments"
     }
   },
   "require": {
-    "php": ">=5.6",
-    "oxid-esales/oxideshop-ce": "6.3 - 6.5",
-    "spipu/html2pdf": "^5.2"
+    "php": "^7.0 || ^8.0",
+    "oxid-esales/oxideshop-ce": "6.3 - 6.14",
+    "spipu/html2pdf": "^5.2",
+    "d3/modcfg": "^5.3.6.000 || ^6",
+    "beberlei/assert": "^3.3.2"
   },
   "autoload": {
     "psr-4": {

docs/daux/_index.md

@@ -0,0 +1,2 @@
+Weitere Informationen zum Modul **{$modulename}** finden Sie in unserem Shop:
+[https://www.oxidmodule.com/OXID-eShop/Module/MODULNAME-fuer-Oxid-PE.html](https://www.oxidmodule.com/OXID-eShop/Module/MODULNAME-fuer-Oxid-PE.html)

docs/daux/changelog/010_Changelog.md

@@ -0,0 +1,46 @@
+---
+title: Changelog
+---
+
+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/1.0.4.0...rel_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
+- 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](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
+
+### Fixed
+- Setzen der Rechnungsnummer setzt den "neue Bestellung"-Status nicht zurück
+
+## [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.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
+- enthält Templates und Basislayouts für Rechnungen und Lieferscheine
+- enthält Registries (Dokumentenlisten) für Bestellungen im Adminbereich sowie für Auftragsmanager-Aktionen 
+- kann als vollwertiger Ersatz für Invoice-PDF-Modul verwendet werden

docs/daux/config.json

@@ -0,0 +1,72 @@
+{
+    "title": "<i class='fab fa-d3 d3fa-color-blue'></i> PDF Dokumente",
+    "moduleversion": "1.0.4.0",
+    "titledesc": "für den Oxid eShop",
+    "author": "D³ Data Development",
+    "moduledate": "22.12.2023",
+    "editors": "",
+    "tagline": "",
+    "image": "",
+    "ignore": {
+        "files": [],
+        "folders": [".idea"]
+    },
+    "live": {
+        "clean_urls": true
+    },
+    "html": {
+        "theme": "d3",
+        "breadcrumbs": true,
+        "breadcrumb_separator": "Chevrons",
+        "toggle_code": false,
+        "date_modified": true,
+        "date_modified_format": "d.m.Y",
+        "float": false,
+        "inherit_index": true,
+        "auto_landing": true,
+
+        "links": {
+            "Shop": "https://www.oxidmodule.com"
+        },
+
+        "powered_by": ""
+    },
+    "languages": {
+        "installation": "Installation",
+        "manual": "Handbuch",
+        "changelog": "Changelog",
+        "support": "Support"
+    },
+    "processor": "d3processor",
+    "language": "de",
+    "strings": {
+        "de": {
+            "CodeBlocks_title": "Code-Blöcke",
+            "CodeBlocks_hide": "Aus",
+            "CodeBlocks_below": "Unterhalb",
+            "CodeBlocks_inline": "Linear",
+            "CodeBlocks_show": "Code-Blöcke anzeigen",
+            "Search_placeholder": "Suchen...",
+            "Link_previous": "Zurück",
+            "Link_next": "Weiter",
+            "Edit_on": "Bearbeiten bei :name:",
+            "View_on_github": "Bei GitHub anzeigen",
+            "View_documentation": "Dokumentation anzeigen",
+            "Table_of_contents": "Inhaltsverzeichnis",
+            "author": "Autor",
+            "moduledate": "Stand",
+            "version": "Version",
+            "editors": "Bearbeiter",
+            "selectversion": "Version wechseln"
+        }
+    },
+    "variables": {
+        "modulename"    : "<i class='fab fa-d3 d3fa-color-blue'></i> PDF Dokumente",
+        "menutitle"     : "<i class='fab fa-d3 d3fa-color-blue'></i> PDF Dokumente",
+        "modulefolder"  : "pdfdocuments",
+        "modcfgident"   : "d3pdfdocuments",
+        "composerident" : "d3/pdfdocuments"
+    },
+    "versionselector": false,
+    "versiondirectoryindex": 2
+}

docs/daux/installation/002_Installation.md

@@ -0,0 +1,10 @@
+---
+title: Installation / Update / Deinstallation
+---
+
+* [Anforderungen](installation/010_Anforderungen/010_Systemanforderungen.md)
+* [Neuinstallation](installation/020_Neuinstallation/020_Modul_hinzufuegen.md)
+* [Update](installation/030_Update/005_Updatedefinition.md)
+* [Deinstallation](installation/060_Deinstallation/010_Modulerweiterungen_deaktivieren_und_entfernen.md)
+
+Bei Bedarf bieten wir Ihnen auch gern die Installation des Moduls in Ihrem Shop an. Geben Sie uns bitte unter den unter [Hilfe und Support](support/010_Hilfe-und-Support.md) genannten Kontaktdaten Bescheid.

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

@@ -0,0 +1,19 @@
+---
+title: Systemanforderungen
+---
+
+* PHP Version
+    * 7.0.x bis 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
+* 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 
+* Template-Engine
+    * Smarty
+* Installation via [Composer](https://getcomposer.org)

docs/daux/installation/010_Anforderungen/030_Kompatibilitaet_mit_anderen_Modulen.md

@@ -0,0 +1,5 @@
+---
+title: Kompatibilität mit anderen Modulen
+---
+
+Das PDF Dokumente-Modul integriert sich auch in die Erweiterung "Auftragsmanager" von (D3) Data Development, sofern dieses im Shop installiert wurde. Diese Integration wurde für die Version 4.0.0.0 des "Auftragsmanager"-Moduls entwickelt. 

docs/daux/installation/020_Neuinstallation/020_Modul_hinzufuegen.md

@@ -0,0 +1,11 @@
+---
+title: Modul zur Installation hinzufügen
+---
+
+Führen Sie in der Konsole im Hauptverzeichnis Ihres Shops (oberhalb des `source`- und `vendor`-Verzeichnisses) diesen Befehl aus, um das Modul **{$modulename}** zur Installation hinzuzufügen:
+
+```bash
+php composer require {$composerident}:^{$moduleversion} --update-no-dev
+``` 
+
+> [i] Benötigt Ihre Installation einen anderen Aufruf von Composer, ändern Sie den Befehl bitte entsprechend ab. Für weitere Optionen dieses Befehls lesen Sie bitte die [Dokumentation von Composer](https://getcomposer.org/doc/03-cli.md#require).

docs/daux/installation/020_Neuinstallation/040_Providerspezifische_Installation.md

@@ -0,0 +1,5 @@
+---
+title: Providerspezifische Installation
+---
+
+Manche Provider erfordern besondere Einstellungen für installierte Module. Treffen Sie bei der Installation auf spezielle Anforderungen, zu denen Sie Unterstützung benötigen, kontaktieren Sie uns bitte für weiteren Support.

docs/daux/installation/020_Neuinstallation/050_Modul_im_Shop_aktivieren.md

@@ -0,0 +1,7 @@
+---
+title: Modul im Shop aktivieren
+---
+
+Aktivieren Sie das Modul über den Shopadmin unter [ Erweiterungen ] -> [ Module ]. Klicken Sie nach Auswahl von [ {$menutitle} ] auf den Button [ Aktivieren ].
+
+> [!] **Enterprise Editon**: Achten Sie darauf, dass das Modul in weiteren Shops (Mall) ebenfalls aktiviert werden muss, um dessen Funktion dort auch zu nutzen.

docs/daux/installation/020_Neuinstallation/070_TMP-Ordner_leeren.md

@@ -0,0 +1,7 @@
+---
+title: TMP-Ordner leeren
+---
+
+Leeren Sie das Verzeichnis `tmp` Ihres Shops. 
+
+> [i] Erfordert Ihre Installation eine andere Vorgehensweise zum Leeren des Caches oder zum Aktualisieren der Datenbank-Viewtabellen, führen Sie diese bitte aus.

docs/daux/installation/020_Neuinstallation/100_Updatefaehigkeit.md

@@ -0,0 +1,7 @@
+---
+title: Updatefähigkeit
+---
+
+Bei individuellen Änderungen von Moduldateien empfehlen wir, jeweils die Überladungsmöglichkeiten des Shops dafür zu verwenden. So brauchen Sie die originalen Moduldateien nicht verändern und erhalten sich so die Updatefähigkeit des Shops und des Moduls. Beachten Sie, dass Moduldateien bei Updateinstallationen überschrieben werden.
+
+Weitere Informationen zu den Überladungsmöglichkeiten verschiedener Dateien finden Sie in unserer [FAQ](https://faq.d3data.de/category/oxid-eshop/module-oxid-eshop/anpassungen/).

docs/daux/installation/020_Neuinstallation/_index.md

@@ -0,0 +1,11 @@
+---
+Title: Schnellstart per Composer
+---
+
+## Schnellstart per Composer
+
+```bash
+php composer require {$composerident}:^{$moduleversion} --update-no-dev
+```
+
+Detailliertere Angaben zur Installation entnehmen Sie bitte den folgenden Seiten.

docs/daux/installation/030_Update/005_Updatedefinition.md

@@ -0,0 +1,8 @@
+---
+title: Wann kann ein Update ausgeführt werden?
+---
+
+Die Updatenaweisungen können verwendet werden, wenn dieses Modul schon früher mit Hilfe von Composer installiert wurde.
+
+Wurde die Installation bisher noch nicht durchgeführt oder die Installation wurde **nicht** über Composer 
+durchgeführt (weil das Modul dies z.B. früher nicht unterstützte), verwenden Sie bitte die Beschreibung unter [Neuinstallation](../020_Neuinstallation/_index.md).

docs/daux/installation/030_Update/010_Modul_deaktivieren.md

@@ -0,0 +1,5 @@
+---
+title: Modul deaktivieren
+---
+
+Deaktivieren Sie das Modul über den Shopadmin unter [ Erweiterungen ] -> [ Module ]. Klicken Sie nach Auswahl von [ {$menutitle} ] auf den Button [ Deaktivieren ].

docs/daux/installation/030_Update/020_Dateien_erneuern.md

@@ -0,0 +1,16 @@
+---
+title: Dateien erneuern
+---
+
+Starten Sie die Konsole Ihres Webservers und wechseln in das Hauptverzeichnis Ihres 
+Shops (oberhalb des `source`- und `vendor`-Verzeichnisses). Führen Sie dort diesen Befehl aus:
+
+```bash
+php composer require {$composerident}:^{$moduleversion} --update-no-dev
+```
+
+Im weiteren Ablauf werden Sie gefragt, ob die Moduldateien überschrieben werden sollen. Bestätigen Sie dies für den Eintrag `{$composerident}`.
+
+> [!] Achten Sie darauf, dass die Installation über Composer mit derselben PHP-Version erfolgt, in der auch Ihr Shop installiert ist. Sie erhalten sonst unpassende Modulpakete.
+
+> [i] Benötigt Ihre Installation einen anderen Aufruf von Composer, ändern Sie den Befehl bitte entsprechend ab. Für weitere Optionen dieses Befehls lesen Sie bitte die [Dokumentation von Composer](https://getcomposer.org/doc/03-cli.md#require).

docs/daux/installation/030_Update/030_Providerspezifische_Installation.md

@@ -0,0 +1,5 @@
+---
+title: Providerspezifische Installation
+---
+
+Manche Provider erfordern besondere Einstellungen für installierte Module. Treffen Sie bei der Installation auf spezielle Anforderungen, zu denen Sie Unterstützung benötigen, kontaktieren Sie uns bitte für weiteren Support.

docs/daux/installation/030_Update/040_Modulinformationen_aktualisieren.md

@@ -0,0 +1,5 @@
+---
+title: Modulinformationen aktualisieren
+---
+
+Wechseln Sie im Adminbereich zu [ Erweiterungen ] -> [ Module ]. Klicken Sie nach Auswahl von [ {$menutitle} ] auf den Button [ Aktivieren ].

docs/daux/installation/030_Update/060_TMP-Ordner_leeren.md

@@ -0,0 +1,7 @@
+---
+title: TMP-Ordner leeren
+---
+
+Leeren Sie das Verzeichnis Ihres Shops. 
+
+> [i] Erfordert Ihre Installation eine andere Vorgehensweise zum Leeren des Caches oder zum Aktualisieren der Datenbank-Viewtabellen, führen Sie diese bitte aus.

docs/daux/installation/030_Update/080_Erweiterungen_anpassen.md

@@ -0,0 +1,5 @@
+---
+title: Erweiterungen anpassen
+---
+
+Haben Sie für dieses Modul eigene Erweiterung entwickelt, gleichen Sie dies bitte mit der neuen Fassung des Moduls ab.

docs/daux/installation/040_Installationspruefung.md

@@ -0,0 +1,13 @@
+---
+title: Installationsprüfung
+---
+
+Um die erfolgreiche Installation zu prüfen, können Sie die folgende(n) Checkliste(n) verwenden:
+
+## Einstellungsunabhängige Prüfungen
+
+### Backend
+
+* Modul ist unter [ Erweiterungen ] -> [ Module ] aktiv geschaltet
+* Modul zeigt unter [ Bestellungen verwalten ] -> [ Bestellungen ] -> [ Übersicht ] einen eigenen Bereich für PDF-Exporte
+

docs/daux/installation/060_Deinstallation/010_Modulerweiterungen_deaktivieren_und_entfernen.md

@@ -0,0 +1,5 @@
+---
+title: Modulerweiterungen deaktivieren und entfernen
+---
+
+Deaktivieren Sie alle vorhandenen Erweiterungen, die auf dem Modul **{$modulename}** aufbauen und löschen bitte alle Dateien dieser Erweiterungen. Entfernen Sie ebenfalls alle individuellen Templateanpassungen für dieses Modul.

docs/daux/installation/060_Deinstallation/020_Modul_deaktivieren.md

@@ -0,0 +1,6 @@
+---
+title: Modul deaktivieren
+---
+
+Deaktivieren Sie das Modul **{$modulename}** über den Shopadmin [ Erweiterungen ] -> [ Module ]. Klicken Sie nach Auswahl von [ {$menutitle} ] auf den Button [ Deaktivieren ].
+

docs/daux/installation/060_Deinstallation/030_Modul_aus_der_Installation_entfernen.md

@@ -0,0 +1,13 @@
+---
+title: Modul aus der Installation entfernen
+---
+
+Starten Sie die Konsole Ihres Webservers und wechseln in das Hauptverzeichnis Ihres Shops (oberhalb des `source`- und `vendor`-Verzeichnisses). Führen Sie Sie dort diesen Befehl aus:
+
+```Bash
+php composer remove {$composerident} --no-update
+``` 
+
+> [!] Achten Sie darauf, dass die Installation über Composer mit derselben PHP-Version erfolgt, in der auch Ihr Shop installiert ist. Sie erhalten sonst unpassende Modulpakete.
+    
+> [i] Benötigt Ihre Installation einen anderen Aufruf von Composer, ändern Sie den Befehl bitte entsprechend ab. Für weitere Optionen dieses Befehls lesen Sie bitte die [Dokumentation von Composer](https://getcomposer.org/doc/03-cli.md#require).

docs/daux/installation/060_Deinstallation/040_Dateien_loeschen.md

@@ -0,0 +1,9 @@
+---
+title: Dateien löschen
+---
+  
+Löschen Sie den Ordner `{$modulefolder}` und seine enthaltenen Elemente aus dem Verzeichnis `source/modules/d3` Ihres Shops. 
+Bestätigen Sie anschließend im Shopadmin unter [ Erweiterungen ] -> [ Module ] -> [ Installierte Shop-Module ] die Nachricht:
+
+> Es gibt registrierte Erweiterungen im eShop, deren Verzeichnis nicht vorhanden ist.    
+> Möchten Sie alle Modulinformationen einschließlich Konfigurationseinstellungen und Blockinformationen für Templates löschen?

docs/daux/installation/060_Deinstallation/060_TMP-Ordner_leeren.md

@@ -0,0 +1,7 @@
+---
+title: TMP-Ordner leeren
+---
+
+Leeren Sie das Verzeichnis Ihres Shops. 
+
+> [i] Erfordert Ihre Installation eine andere Vorgehensweise zum Leeren des Caches oder zum Aktualisieren der Datenbank-Viewtabellen, führen Sie diese bitte aus.

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

@@ -0,0 +1,9 @@
+---
+title: Funktionen
+---
+
+Erstellen Sie unterschiedlichste statische oder dynamische PDF-Dokument 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.
+
+Das Modul kann einfach erweitert werden, um bestehende Dokumente anzupassen oder Neue hinzuzufügen.  

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

@@ -0,0 +1,7 @@
+---
+title: Kompatibilität
+---
+
+Das Modul enthält die selbe Funktionalität wie das `OXID Invoice-PDF`-Modul. Grundsätzlich können beide Module parallel im Shop installiert werden, wenn dies erforderlich ist. 
+
+Soll das `OXID Invoice-PDF`-Modul komplett vom `PDF Dokumente` Modul ersetzt werden (weil z.B. dritte Module ebenfalls dessen Funktion verwenden), stellen wir in Kürze eine Anpassung dafür zur Verfügung.

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

@@ -0,0 +1,11 @@
+---
+title: Anpassungen an bestehenden Dokumenten
+---
+
+Die Dokumente werden aus Smartytemplates erstellt, die Sie im `Application/views/tpl/documents` finden.
+
+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.
+
+Beachten Sie, dass Templateblöcke in gemeinsam genutzen Templates auch in allen Dokumenten Änderungen hervorrufen.
+
+Für umfangreichere Veränderungen können Sie dem jeweiligen Dokument auch auch anderes Template zuordnen. Überladen Sie dafür die entsprechende Dokumentenklasse und verändern Sie den Rückgabewert der Methode `getTemplate`.

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

@@ -0,0 +1,24 @@
+---
+title: Hinweise für Templatedesigner
+---
+
+## HTML
+
+Aus den Templates wird HTML-ähnlicher Quellcode mit CSS-Angaben erzeugt, der zur Erzeugung des PDF-Dokumentes dient.
+
+Der Quellcode beinhaltet jedoch einige wenige Besonderheiten (z.B. die `page`-, `page_head`- und `page_footer`-Tags), die im [HTML2PDF-Projekt](https://github.com/spipu/html2pdf) beschrieben sind. 
+
+## CSS
+
+Layouts können mit inline CSS-Styles definiert werden. Die Einbindung externer Stylesheets wird zum Zeitpunkt der Dokumentationserstellung leider nicht unterstützt.
+
+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
+
+Innerhalb der Templates steht Ihnen die komplette Smarty-Funktionalität zur Verfügung. 
+
+## Debug
+
+Zur Erstellung der Dokumente kann es hilfreich sein, dass statt des fertigen PDFs eine besser prüfbare Zwischenversion exportiert wird.
+Dies können Sie mit der Entwickleroption im Modul erreichen, die Sie im Adminbereich des Shops unter `Erweiterungen -> Module -> D3 PDF-Dokumente -> Einstell. -> Grundeinstellungen`. Sie erhalten dann beim Download ein HTML-Dokument, welches einfach im Browser analysiert werden kann.

docs/daux/manual/020_Programmierung/030_neueDokumente.md

@@ -0,0 +1,9 @@
+---
+title: neue Dokumente hinzufügen
+---
+
+Erstellen Sie eine neue PHP-Klasse, die mindestens das Interface `D3\PdfDocuments\Application\Model\Interfaces\pdfdocumentsGenericInterface` implementiert. Für Dokumente, die auf Bestellungen basieren (z.B. Rechnungen, Angebote, ...) können Sie statt dessen auch das optimierte Interface `D3\PdfDocuments\Application\Model\Interfaces\pdfdocumentOrderInterface` verwenden.
+
+Wenn Sie Ihre Dokumentenklasse von `D3\PdfDocuments\Application\Model\AbstractClasses\pdfdocumentsGeneric` bzw. von `D3\PdfDocuments\Application\Model\AbstractClasses\pdfdocumentsOrder` ableiten, sind für jedes Dokument nur noch wenige Zeilen Quellcode nötig. Beide abstrakte Klassen implementieren die oben genannten Interfaces automatisch.
+
+Als Beispiele dienen Ihnen die im Modul enthaltenen Dokumentklassen `invoice` und `deliverynote`. 

docs/daux/manual/020_Programmierung/040_Registries.md

@@ -0,0 +1,12 @@
+---
+title: Registries
+---
+
+Sollen in einem bestimmten Bereich des Shops mehrere Dokumente zur Auswahl angeboten werden, verwenden wir so genannte Registries für diese Liste. 
+So gibt es zum Beispiel eine Registry für den Bereich der Bestellungsdokumente im Adminbereich des Shops unter `Bestellungen verwalten -> Bestellungen -> Übersicht`.
+
+Sollen in diesem Bereich neue Dokumente zusätzlich angeboten werden oder bestehende Dokumente entfernt werden, können Sie die jeweilige Registry im eigenen Modul überladen und mit deren Methoden die Dokumentliste manipulieren.
+
+Benötigen Sie eine eigene Regsitry, können Sie eine eigene Klasse erstellen, die `D3\PdfDocuments\Application\Model\Registries\registryAbstract` erweitert.
+
+Ein Beispiel zur Verwendung von Registries finden Sie in der Erweiterung des im 1. Abschnitt genannten Adminbereich.

docs/daux/manual/_index.md

@@ -0,0 +1,7 @@
+---
+title: Handbuch
+---
+
+Im Abschnitt [Funktionen](010_Funktionen/010_Funktionen.md) finden Sie Informationen zum Funktionsumfang des Moduls und dessen Zusammenspiel mit dem `InvoicePdf` Modul von OXID eSales.
+
+Unter [Programmierung](020_Programmierung/010_Anpassungen.md) sind Hinweise enthalten, die Templatedesignern und Programmierern als Hinweise zur Erweiterung der Dokumente behilflich sind.

docs/daux/support/010_Hilfe-und-Support.md

@@ -0,0 +1,16 @@
+---
+title: Hilfe und Support
+---
+
+Bei Bedarf bieten wir Ihnen auch gern die Installation des Moduls in Ihrem Shop an. Geben Sie uns bitte unter den unten genannten Kontaktdaten Bescheid.
+
+Haben Sie Fragen oder Unklarheiten in Verbindung mit diesem Modul oder dessen Installation, stehen Ihnen Hilfetexte in unserem [HelpCenter](https://faq.d3data.de/) zur Verfügung. Finden Sie darin die benötigten Antworten nicht, kontaktieren Sie uns bitte unter den folgenden Möglichkeiten:
+1. per E-Mail: <support@shopmodule.com> oder
+2. über das Kontaktformular auf [Oxidmodule.com](https://www.oxidmodule.com/) oder
+3. per Telefon: (+49) 37 21 / 26 80 90 zu unseren Bürozeiten
+
+Geben Sie bitte an, wo und wie wir gegebenenfalls vorhandene Schwierigkeiten nachvollziehen können. Sind Ihre Fragen shopspezifisch, benötigen wir möglicherweise Zugangsdaten zum betreffenden Shop.
+ 
+Wir wünschen Ihnen mit Ihrem Shop und dem Modul viel Erfolg!
+
+Ihr D³-Team.

metadata.php

@@ -1,32 +1,22 @@
 <?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
+ * 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
+ * @author        D3 Data Development - Max Buhe <support@shopmodule.com>
+ * @link          http://www.oxidmodule.com
  */
 
-use D3\ModCfg\Application\Model\d3utils;
 use D3\PdfDocuments\Modules\Application\Controller\d3_overview_controller_pdfdocuments;
-use D3\PdfDocuments\Modules\Application\Model\d3_Order_PdfDocuments as d3_pdfdocs_OrderModel;
 use OxidEsales\Eshop\Application\Controller\Admin\OrderOverview;
-use OxidEsales\Eshop\Application\Model as OxidModel;
 
 /**
  * Metadata version
  */
-$sMetadataVersion = '2.0';
+$sMetadataVersion = '2.1';
 
-$logo = '<svg style="height:1em;width:1em"><image xlink:href="https://logos.oxidmodule.com/d3logo.svg" style="height:1em;width:1em" /></svg>';
+$logo = '<img src="https://logos.oxidmodule.com/d3logo.svg" alt="(D3)" style="height:1em;width:1em">';
 
 $sModuleId = 'd3PdfDocuments';
 /**
@@ -38,29 +28,31 @@ $aModule = [
         'de'        => $logo.' PDF-Dokumente',
         'en'        => $logo.' PDF documents',
     ],
-    'version'       => '0.1',
+    'version'       => '1.0.4.0',
     'author'        => 'D&sup3; Data Development (Inh.: Thomas Dartsch)',
     'email'         => 'support@shopmodule.com',
-    'url'           => 'http://www.oxidmodule.com/',
+    'url'           => 'https://www.oxidmodule.com/',
     'extend'        => [
-        OxidModel\Order::class             => d3_pdfdocs_OrderModel::class,
-        OrderOverview::class => d3_overview_controller_pdfdocuments::class
+        OrderOverview::class    => d3_overview_controller_pdfdocuments::class
     ],
-    'controllers'           => [],
-    'templates'             => [
+    'controllers'   => [],
+    'thumbnail'     => 'picture.svg',
+    'templates'     => [
         'd3orderoverview_pdfform.tpl'   => 'd3/pdfdocuments/Application/views/tpl/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_addressarea.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/deliverynote/includingFiles/pdfHeader.tpl',
-        'd3delnote_pdf_conclusion.tpl'  => 'd3/pdfdocuments/Application/views/tpl/documents/deliverynote/includingFiles/pdfPastThank.tpl',
-        'd3delnote_pdf_style.css'       => 'd3/pdfdocuments/out/src/css/deliverynote.css',
+        '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',
 
         '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_addressarea.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/includingFiles/pdfHeader.tpl',
-        'd3invoice_pdf_conclusion.tpl'  => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl',
-        'd3_article_costs_summary.tpl'  => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/includingFiles/d3_article_costs_summary.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',
 
         'd3pdfbase.tpl'                 => 'd3/pdfdocuments/Application/views/tpl/documents/inc/page/base.tpl',
         'd3pdfheader.tpl'               => 'd3/pdfdocuments/Application/views/tpl/documents/inc/page/header.tpl',
@@ -68,7 +60,11 @@ $aModule = [
         'd3pdfreturnaddress.tpl'        => 'd3/pdfdocuments/Application/views/tpl/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',
 
         'd3pdfstyles.css'               => 'd3/pdfdocuments/out/src/css/pdfStyling.css',

out/img/pdf.svg

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
+<path style="fill:#E2E5E7;" d="M128,0c-17.6,0-32,14.4-32,32v448c0,17.6,14.4,32,32,32h320c17.6,0,32-14.4,32-32V128L352,0H128z"/>
+<path style="fill:#B0B7BD;" d="M384,128h96L352,0v96C352,113.6,366.4,128,384,128z"/>
+<polygon style="fill:#CAD1D8;" points="480,224 384,128 480,128 "/>
+<path style="fill:#F15642;" d="M416,416c0,8.8-7.2,16-16,16H48c-8.8,0-16-7.2-16-16V256c0-8.8,7.2-16,16-16h352c8.8,0,16,7.2,16,16
+	V416z"/>
+<g>
+	<path style="fill:#FFFFFF;" d="M101.744,303.152c0-4.224,3.328-8.832,8.688-8.832h29.552c16.64,0,31.616,11.136,31.616,32.48
+		c0,20.224-14.976,31.488-31.616,31.488h-21.36v16.896c0,5.632-3.584,8.816-8.192,8.816c-4.224,0-8.688-3.184-8.688-8.816V303.152z
+		 M118.624,310.432v31.872h21.36c8.576,0,15.36-7.568,15.36-15.504c0-8.944-6.784-16.368-15.36-16.368H118.624z"/>
+	<path style="fill:#FFFFFF;" d="M196.656,384c-4.224,0-8.832-2.304-8.832-7.92v-72.672c0-4.592,4.608-7.936,8.832-7.936h29.296
+		c58.464,0,57.184,88.528,1.152,88.528H196.656z M204.72,311.088V368.4h21.232c34.544,0,36.08-57.312,0-57.312H204.72z"/>
+	<path style="fill:#FFFFFF;" d="M303.872,312.112v20.336h32.624c4.608,0,9.216,4.608,9.216,9.072c0,4.224-4.608,7.68-9.216,7.68
+		h-32.624v26.864c0,4.48-3.184,7.92-7.664,7.92c-5.632,0-9.072-3.44-9.072-7.92v-72.672c0-4.592,3.456-7.936,9.072-7.936h44.912
+		c5.632,0,8.96,3.344,8.96,7.936c0,4.096-3.328,8.704-8.96,8.704h-37.248V312.112z"/>
+</g>
+<path style="fill:#CAD1D8;" d="M400,432H96v16h304c8.8,0,16-7.2,16-16v-16C416,424.8,408.8,432,400,432z"/>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>

out/src/css/deliverynote.css

@@ -1,18 +0,0 @@
-.deliverynote_width_amount{
-  width: 20px;
-}
-.deliverynote_width_artnum{
-  width: 80px;
-}
-.deliverynote_width_desc{
-  width: 469.5px;
-}
-.textAlignLeft{
- text-align: left;
-}
-.paddingLeft{
-  padding-left: 2.4px;
-}
-.deliveryNote_paddingTop20{
-  padding-top: 20px;
-}

out/src/css/deliverynote_.css

@@ -1,173 +0,0 @@
-/*debug hilfe*/
-.eraseBug{
-  border: dashed blueviolet 1px;
-}
-
-table{
-  font-family: "helvetica";
-}
-.aligning{
-  text-align: right;
-}
-.vertical-a{
-  vertical-align: top;
-}
-.fontSize12{
-  font-size: 12px;
-}
-.order_sum{
-  margin-left: 181px;
-}
-.order_sumNum{
-  margin-right: -2.2px;
-}
-.border-bottom{
-  border-bottom: solid 0.15mm #000;
-}
-.paddingTop{
-  padding-top: 5px;
-}
-.paddingBottom{
-  padding-bottom: 5px;
-}
-.spacing_order_info{
-  padding-bottom: 5px;
-  padding-top: 5px;
-}
-
-/*pdf_header*/
-.pdf_header_positioning{
-  position: absolute;
-  top: 30px;
-  right: 44px;
-}
-
-/*pdf_footer*/
-.pdf_footer_table{
-  width: 688px;
-  font-size: 9px;
-  margin: 0 30px 0 30px;
-  border-top: solid 1px #000;
-}
-
-/*pdf_heading*/
-.pdf_heading_table{
-  width: 100%;
-  margin-top: 8mm;
-}
-.pdf_heading_width35{
-  width: 35%;
-}
-.pdf_heading_fontSize8{
-  font-size: 8px;
-}
-.pdf_heading_width65{
-  width: 65%;
-}
-.pdf_heading_fontSize12{
-  font-size: 12px;
-}
-
-/*heading_order_information*/
-.heading_order_paddingTop10{
-  padding-top: 10px;
-}
-.heading_order_width35{
-  width: 35%;
-}
-.heading_order_paddingTopSub5{
-  padding-top: -5px;
-}
-.heading_order_paddingTop1{
-  padding-top: 1mm;
-}
-.heading_order_fontSize15{
-  font-size: 15px;
-}
-.heading_order_paddingTop22{
-  padding-top: 22px;
-}
-.heading_order_paddingBottom8{
-  padding-bottom: 8px;
-}
-.heading_order_paddingBottom15{
-  padding-bottom: 15px;
-}
-.heading_order_fontSize10{
-  font-size: 10px;
-}
-.heading_order_paddingTopSub5{
-  padding-top: -5px;
-}
-.heading_order_width65{
-  width: 65%;
-}
-
-/*order_article_listing*/
-.order_article_listing_width_amount{
-  width: 20px;
-}
-.order_article_listing_width_desc{
-  width: 398px;
-}
-.order_article_listing_width_ust{
-  width: 10px;
-}
-.order_article_listing_width_unitPrice{
-  width: 90px;
-}
-.order_article_listing_width_total_Price{
-  width: 100px;
-}
-.order_article_listing_paddingRight52{
-  padding-right: 52.1px;
-}
-.order_article_listing_fontSize{
-  font-size: 11px;
-}
-.order_article_PaddingBottom5{
-  padding-bottom: 5px;
-}
-.order_article_PaddingTop5{
-  padding-top: 5px;
-}
-.order_article_marginTop10{
-  margin-top: 10px;
-}
-.order_article_costs_marginLeftSub3{
-  margin-left: -3px;
-}
-.order_article_costs_paddingRight66{
-  padding-right: 65.9px;
-}
-.order_article_listing_fontSize9{
-  font-size: 9px;
-}
-.order_article_listing_fontSize12{
-  font-size: 12px;
-}
-
-/* order_article_costs */
-.article_costs_table{
-  width: 100%;
-  border-top: solid 0.15mm #000;
-}
-.article_costs_table_td_width50{
-  width: 50%;
-}
-.article_costs_table_paddingRight{
-  padding-right: -3px;
-}
-.order_article_costs_fontSize12{
-  font-size: 12px;
-}
-
-/*order_shop_past_thank*/
-.past_thank_width100{
-  width: 100%;
-}
-
-/* footer styling */
-.footer_parts{
-  width: 33.33%;
-}

out/src/css/pdfInvoiceCorrection.css

@@ -1,32 +0,0 @@
-.invoiceCorrection_width_40{
-  width: 40%;
-}
-.invoiceCorrection_width_60{
-  width: 60%;
-}
-.invoiceCorrection_font8{
-  font-size: 8px;
-}
-.invoiceCorrection_font9{
-  font-size: 9px;
-}
-.invoiceCorrection_tableMarginTop15{
-  margin-top: 15px;
-}
-.invoiceCorrection_spacingLeft20{
-  margin-left: 73.6px;
-}
-
-.invoiceCorrectionPaddingTop4{
-  padding-top: 4px;
-}
-.invoiceCorrectionPaddingTop5{
-  padding-top: 5px;
-}
-
-.invoiceCorrectionPaddingBottom20{
- padding-bottom: 20px;
-}
-.invoiceCorrectionPaddingBottom16{
-  padding-bottom: 16px;
-}