diff --git a/Application/Model/AbstractClasses/pdfDocuments_generic.php b/Application/Model/AbstractClasses/pdfDocuments_generic.php index 4d7645e..77510c7 100644 --- a/Application/Model/AbstractClasses/pdfDocuments_generic.php +++ b/Application/Model/AbstractClasses/pdfDocuments_generic.php @@ -44,7 +44,6 @@ abstract class pdfDocuments_generic implements genericInterface public function genPdf($sFilename, $iSelLang = 0, $target = 'I') { $sFilename = $this->getFilename( $sFilename); - $oPdf = oxNew(Html2Pdf::class, ...$this->getPdfProperties()); $oPdf->writeHTML($this->getHTMLContent($iSelLang)); $oPdf->output($sFilename, $target); diff --git a/Application/Model/Exceptions/d3noPdfHandlerFoundException.php b/Application/Model/Exceptions/d3noPdfHandlerFoundException.php index 7c481d1..beaf672 100644 --- a/Application/Model/Exceptions/d3noPdfHandlerFoundException.php +++ b/Application/Model/Exceptions/d3noPdfHandlerFoundException.php @@ -29,7 +29,7 @@ class d3noPdfHandlerFoundException extends StandardException */ public function __construct( $requestId, $sMessage = "no pdf handler defined for given request id", $iCode = 0, \Exception $previous = null ) { - $sMessage .= '"'.$requestId.'"'; + $sMessage .= ' "'.$requestId.'"'; parent::__construct( $sMessage, $iCode, $previous ); } } \ No newline at end of file diff --git a/Application/views/tpl/invoiceCorrection/includingFiles/pdfFooter.tpl b/Application/views/tpl/invoiceCorrection/includingFiles/pdfFooter.tpl deleted file mode 100644 index d625e44..0000000 --- a/Application/views/tpl/invoiceCorrection/includingFiles/pdfFooter.tpl +++ /dev/null @@ -1,32 +0,0 @@ -[{block name="pdfFooter"}] - - - [{block name="shop_basic_information"}] - - [{/block}] - [{block name="owner_basic_information"}] - - [{/block}] - [{block name="bank_basic_information"}] - - [{/block}] - -
-
[{$shop->oxshops__oxname->value}]
-
[{$shop->oxshops__oxstreet->value}]
-
[{$shop->oxshops__oxzip->value}] [{$shop->oxshops__oxcity->value}]
-
[{$shop->oxshops__oxcountry->value}]
-
[{$shop->oxshops__oxurl->value}]
-
[{$shop->oxshops__oxinfoemail->value}]
- 		-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_MANAGINGDIRECTOR"}][{$shop->oxshops__oxfname->value}] [{$shop->oxshops__oxlname->value}]
-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_COURT"}] [{$shop->oxshops__oxcourt->value}]
-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_HRBNR"}][{$shop->oxshops__oxhrbnr->value}]
-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTID"}][{$shop->oxshops__oxvatnumber->value}]
- 		-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_BANKVERBINDUNG"}]
-
[{$shop->oxshops__oxbankname->value}]
-
[{oxmultilang ident="ORDER_OVERVIEW_PDF_ACCOUNTNR"}][{$shop->oxshops__oxibannumber->value}]
-
[{oxmultilang ident="ORDER_OVERVIEW_PDF_BANKCODE"}][{$shop->oxshops__oxbiccode->value}]
-
-[{/block}] \ No newline at end of file diff --git a/Application/views/tpl/invoiceCorrection/includingFiles/pdfHeader.tpl b/Application/views/tpl/invoiceCorrection/includingFiles/pdfHeader.tpl deleted file mode 100644 index 1d6d92b..0000000 --- a/Application/views/tpl/invoiceCorrection/includingFiles/pdfHeader.tpl +++ /dev/null @@ -1,48 +0,0 @@ -[{block name="pdfHeading"}] - - [{block name="heading_owner_information"}] - - - - - [{/block}] - [{block name="heading_order_information"}] - - - -
-
[{$shop->oxshops__oxname->value}] - [{$shop->oxshops__oxstreet->value}] - [{$shop->oxshops__oxzip->value}] [{$shop->oxshops__oxcity->value}]
- 		-
[{oxmultilang ident="D3_DELIVERYNOTE_PDF_QUOTECUSTMNR"}]
-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_CUSTOMERNR"}] [{$user->oxuser__oxcustnr->value}]
-
- [{if $order->oxorder__oxbilllname->value}] - [{if $order->oxorder__oxdelcompany->value}]
[{$order->oxorder__oxdelcompany->value}]
[{/if}] -
[{$order->oxorder__oxdelfname->value}] [{$order->oxorder__oxdellname->value}]
-
[{$order->oxorder__oxdelstreet->value}] [{$order->oxorder__oxdelstreetnr->value}]
-
[{$order->oxorder__oxdelzip->value}] [{$order->oxorder__oxdelcity->value}]
-
[{$shop->oxshops__oxcountry->value}]
-
[{$shop->oxshops__oxdeladdinfo->value}]
- [{else}] - [{if $order->oxorder__oxbillcompany->value}]
[{$order->oxorder__oxbillcompany->value}]
[{/if}] -
[{$order->oxorder__oxbillfname->value}] [{$order->oxorder__oxbilllname->value}]
-
[{$order->oxorder__oxbillstreet->value}] [{$order->oxorder__oxbillstreetnr->value}]
-
[{$order->oxorder__oxbillzip->value}] [{$order->oxorder__oxbillcity->value}]
-
[{$shop->oxshops__oxcountry->value}]
- [{/if}] -
- - - - - - [{/block}] -
-
[{oxmultilang ident="D3_DELIVERYNOTE_PDF_INVOICECORRECTION"}] 0000 [{oxmultilang ident="D3_DELIVERYNOTE_PDF_TOINVOICE"}][{$order->oxorder__oxbillnr->value}]
-
[{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSINCERELY"}][{$order->oxorder__oxorderdate->value|date_format:"%d.%m.%Y"}][{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSAT"}]
- 		-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DATE"}]
-
[{$shop->oxshops__oxcity->value}], [{$order->oxorder__oxorderdate->value|date_format:"%d.%m.%Y"}]
-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERNR"}][{$order->oxorder__oxordernr->value}]
-
- [{/block}] \ No newline at end of file diff --git a/Application/views/tpl/invoiceCorrection/includingFiles/pdfPastThank.tpl b/Application/views/tpl/invoiceCorrection/includingFiles/pdfPastThank.tpl deleted file mode 100644 index 907388c..0000000 --- a/Application/views/tpl/invoiceCorrection/includingFiles/pdfPastThank.tpl +++ /dev/null @@ -1,16 +0,0 @@ -[{block name="pdfPastThankFile"}] - - - - [{* +++++++Individueller Zahlungstext+++++++ *}] - [{if $order->oxorder__d3pdftextbestellbestaetigung->value}] - - [{else}] - - [{/if}] - [{*+++++++++++*}] - - - -
 
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USED_PAYMENTMETHOD"}][{$payment->oxpayments__oxdesc->value}]
[{$order->oxorder__d3pdftextbestellbestaetigung->value}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USED_GREETINGSORDER"}]
 
[{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_1"}]
[{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_2"}]
-[{/block}] \ No newline at end of file diff --git a/Application/views/tpl/invoiceCorrection/includingFiles/pdfToping.tpl b/Application/views/tpl/invoiceCorrection/includingFiles/pdfToping.tpl deleted file mode 100644 index 77a8ed7..0000000 --- a/Application/views/tpl/invoiceCorrection/includingFiles/pdfToping.tpl +++ /dev/null @@ -1,5 +0,0 @@ -[{block name="pdfToping"}] -
- -
-[{/block}] \ No newline at end of file