diff --git a/Application/Model/Documents/deliverynotewithoutlogoPdf.php b/Application/Model/Documents/deliverynotewithoutlogoPdf.php index 3291940..da32ac7 100644 --- a/Application/Model/Documents/deliverynotewithoutlogoPdf.php +++ b/Application/Model/Documents/deliverynotewithoutlogoPdf.php @@ -40,6 +40,6 @@ class deliverynotewithoutlogoPdf extends deliverynotePdf */ public function getTemplate() { - return 'd3deliverynote_pdf.tpl'; + return 'd3deliverynoteNoLogo_pdf.tpl'; } } \ No newline at end of file diff --git a/Application/Model/Documents/invoicewithoutlogoPdf.php b/Application/Model/Documents/invoicewithoutlogoPdf.php index c15a049..3d905e0 100644 --- a/Application/Model/Documents/invoicewithoutlogoPdf.php +++ b/Application/Model/Documents/invoicewithoutlogoPdf.php @@ -40,6 +40,6 @@ class invoicewithoutlogoPdf extends invoicePdf * @return string */ public function getTemplate(){ - return 'd3invoice_pdf.tpl'; + return 'd3invoiceNoLogo_pdf.tpl'; } } \ No newline at end of file diff --git a/Application/views/tpl/documents/deliverynote/deliverynote.tpl b/Application/views/tpl/documents/deliverynote/deliverynote.tpl index b243720..ba569c0 100644 --- a/Application/views/tpl/documents/deliverynote/deliverynote.tpl +++ b/Application/views/tpl/documents/deliverynote/deliverynote.tpl @@ -9,7 +9,7 @@ [{block name="pdfTopingFile"}] - [{include file="d3pdfheader.tpl"}] + [{include file="d3pdfheader.tpl" showLogo=true}] [{/block}] diff --git a/Application/views/tpl/documents/deliverynote/deliverynoteNoLogo.tpl b/Application/views/tpl/documents/deliverynote/deliverynoteNoLogo.tpl new file mode 100644 index 0000000..66e8e60 --- /dev/null +++ b/Application/views/tpl/documents/deliverynote/deliverynoteNoLogo.tpl @@ -0,0 +1,92 @@ +[{assign var= currency value= $order->getOrderCurrency()}] +[{assign var= deliveryPrice value= $order->getOrderDeliveryPrice()}] + + + + + + [{block name="pdfTopingFile"}] + [{include file="d3pdfheader.tpl" showLogo=false}] + [{/block}] + + + [{block name="pdfFooterFile"}] + [{include file="d3pdffooter.tpl"}] + [{/block}] + + + [{* +++++ main page part +++++ *}] + [{block name="pdfHeadingFile"}] + [{block name="pdfHeaderFile"}] + [{include file="d3delnote_pdf_addressarea.tpl"}] + [{/block}] + [{/block}] + [{* +++++Artikeltabelle+++++*}] + [{block name="articleListing"}] + + + + + + + [{foreach from=$order->getOrderArticles(true) item=oOrderArticle}] + [{* + + + + + + *}] + + + + + + [{/foreach}] +
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_AMOUNT"}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DESCRIPTION"}]
[{$oOrderArticle->oxorderarticles__oxamount->value }]
+ [{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }] +
+ [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }] +
[{$oOrderArticle->oxorderarticles__oxvat->value }]
[{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}]
[{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}]
[{$oOrderArticle->oxorderarticles__oxamount->value }]
[{$oOrderArticle->oxorderarticles__oxartnum->value }]
[{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{$oOrderArticle->oxorderarticles__oxselvariant->getRawValue()}]
+ [{/block}] + + [{block name="articleCosts"}] + [{* + + [{ ++++++Artikelzusammenfassung++++++ }] + + [{ ++++++Kosten der Bestellung++++++ }] + + +
+
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO"}]
+ [{if $order->getFormattedDiscount() != 0}] +
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT"}]
+ [{/if}] +
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMNETTO"}]
+ [{foreach from=$order->getVats() key=VatKey item=oVat}] +
[{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"}]
+ [{/foreach}] +
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DELIVERY"}]
+
[{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"}]
+
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TOTALSUMBRUT"}]
+ 		+
[{$order->getFormattedTotalBrutSum()}] [{$currency->name}]
+ [{if $order->getFormattedDiscount() != 0}] +
-[{$order->getFormattedDiscount()}] [{$currency->name}]
+ [{/if}] +
[{$order->getFormattedTotalNetSum()}] [{$currency->name}]
+
[{$lang->formatCurrency($oVat, $currency)}] [{$currency->name}]
+
[{$lang->formatCurrency($deliveryPrice->getNettoPrice(), $currency)}] [{$currency->name}]
+
[{$lang->formatCurrency($deliveryPrice->getVATValue(), $currency)}] [{$currency->name}]
+
[{$order->getFormattedTotalOrderSum()}] [{$currency->name}]
+
*}] + [{/block}] + [{block name="pdfPastThankFile"}] + [{include file="d3delnote_pdf_conclusion.tpl"}] + [{/block}] + + \ No newline at end of file diff --git a/Application/views/tpl/documents/inc/header.tpl b/Application/views/tpl/documents/inc/header.tpl index d5a29f2..9d20cc2 100644 --- a/Application/views/tpl/documents/inc/header.tpl +++ b/Application/views/tpl/documents/inc/header.tpl @@ -1,5 +1,9 @@ +[{assign var="showLogo" value=$showLogo|default:true}] + [{block name="pdfToping"}]
- + [{if $showLogo}] + + [{/if}]
[{/block}] \ No newline at end of file diff --git a/Application/views/tpl/documents/invoice/invoice.tpl b/Application/views/tpl/documents/invoice/invoice.tpl index a22be15..d10352f 100644 --- a/Application/views/tpl/documents/invoice/invoice.tpl +++ b/Application/views/tpl/documents/invoice/invoice.tpl @@ -1,6 +1,6 @@ -[{assign var= currency value= $order->getOrderCurrency()}] -[{assign var= deliveryPrice value= $order->getOrderDeliveryPrice()}] -[{assign var= productVats value= $order->getProductVats(false)}] +[{assign var="currency" value=$order->getOrderCurrency()}] +[{assign var="deliveryPrice" value= $order->getOrderDeliveryPrice()}] +[{assign var="productVats" value= $order->getProductVats(false)}] + + + + [{block name="pdfTopingFile"}] + [{include file="d3pdfheader.tpl" showLogo=false}] + [{/block}] + + + [{block name="pdfFooterFile"}] + [{include file="d3pdffooter.tpl"}] + [{/block}] + + + [{* +++++ main page part +++++ *}] + [{block name="pdfHeadingFile"}] + [{block name="pdfHeaderFile"}] + [{include file="d3invoice_pdf_addressarea.tpl"}] + [{/block}] + [{/block}] + [{* +++++Artikeltabelle+++++*}] + [{block name="articleListing"}] + + + + + + + + + [{foreach from=$order->getOrderArticles(true) item=oOrderArticle}] + + + + + + + + [{/foreach}] +
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_AMOUNT"}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DESCRIPTION"}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTPERCENTAGE"}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_UNITPRICE"}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TOTALPRICE"}]
[{$oOrderArticle->oxorderarticles__oxamount->value }]
+ [{$oOrderArticle->oxorderarticles__oxtitle->getRawValue() }] [{ $oOrderArticle->oxorderarticles__oxselvariant->getRawValue() }] +
+ [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ARTNR"}] [{$oOrderArticle->oxorderarticles__oxartnum->value }] +
[{$oOrderArticle->oxorderarticles__oxvat->value }]
[{$oOrderArticle->getBrutPriceFormated()}] [{$currency->name}]
[{$oOrderArticle->getTotalBrutPriceFormated()}] [{$currency->name}]
+ [{/block}] + + [{block name="articleCosts"}] + + + [{* ++++++Artikelzusammenfassung++++++ *}] + + [{* ++++++Kosten der Bestellung++++++ *}] + + +
+
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO"}]
+ [{if $order->getFormattedDiscount() != 0}] +
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT"}]
+ [{/if}] +
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMNETTO"}]
+ [{foreach from=$productVats key=VatKey item=oVat}] +
[{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"}]
+ [{/foreach}] +
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DELIVERY"}]
+
[{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"}]
+
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TOTALSUMBRUT"}]
+ 		+
[{$order->getFormattedTotalBrutSum()}] [{$currency->name}]
+ [{if $order->getFormattedDiscount() != 0}] +
-[{$order->getFormattedDiscount()}] [{$currency->name}]
+ [{/if}] +
[{$order->getFormattedTotalNetSum()}] [{$currency->name}]
+
[{$lang->formatCurrency($oVat, $currency)}] [{$currency->name}]
+
[{$lang->formatCurrency($deliveryPrice->getNettoPrice(), $currency)}] [{$currency->name}]
+
[{$lang->formatCurrency($deliveryPrice->getVATValue(), $currency)}] [{$currency->name}]
+
[{$order->getFormattedTotalOrderSum()}] [{$currency->name}]
+
+ [{/block}] + [{block name="pdfPastThankFile"}] + [{include file="d3invoice_pdf_conclusion.tpl"}] + [{/block}] + + \ No newline at end of file diff --git a/metadata.php b/metadata.php index b445bfd..3e60cac 100644 --- a/metadata.php +++ b/metadata.php @@ -52,11 +52,13 @@ $aModule = [ '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', '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',