D3Public/pdfdokumente
8
0
Fork 0
Code Pull Requests Releases Activity

add documents without logo

Browse Source
This commit is contained in:
Daniel Seifert 2020-06-02 10:03:00 +02:00
parent 3c2dc2df5f
commit fa96df326d
Signed by: DanielS
GPG Key ID: 8A7C4C6ED1915C6F
8 changed files with 195 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Application/Model/Documents/deliverynotewithoutlogoPdf.php
View File

@ -40,6 +40,6 @@ class deliverynotewithoutlogoPdf extends deliverynotePdf
*/ */
public function getTemplate() public function getTemplate()
{ {
return 'd3deliverynote_pdf.tpl'; return 'd3deliverynoteNoLogo_pdf.tpl';
} }
} }

2
Application/Model/Documents/invoicewithoutlogoPdf.php
View File

@ -40,6 +40,6 @@ class invoicewithoutlogoPdf extends invoicePdf
* @return string * @return string
*/ */
public function getTemplate(){ public function getTemplate(){
return 'd3invoice_pdf.tpl'; return 'd3invoiceNoLogo_pdf.tpl';
} }
} }

2
Application/views/tpl/documents/deliverynote/deliverynote.tpl
View File

@ -9,7 +9,7 @@
<page backtop="30mm" backbottom="30mm" backleft="10mm" backright="10mm" pageset="new"> <page backtop="30mm" backbottom="30mm" backleft="10mm" backright="10mm" pageset="new">
<page_header> <page_header>
[{block name="pdfTopingFile"}] [{block name="pdfTopingFile"}]
[{include file="d3pdfheader.tpl"}] [{include file="d3pdfheader.tpl" showLogo=true}]
[{/block}] [{/block}]
</page_header> </page_header>
<page_footer> <page_footer>

92
Application/views/tpl/documents/deliverynote/deliverynoteNoLogo.tpl Normal file
View File

@ -0,0 +1,92 @@
[{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>

4
Application/views/tpl/documents/inc/header.tpl
View File

@ -1,5 +1,9 @@
[{assign var="showLogo" value=$showLogo|default:true}]
[{block name="pdfToping"}] [{block name="pdfToping"}]
<div class="pdf_header_positioning"> <div class="pdf_header_positioning">
[{if $showLogo}]
<img alt="" src="[{$oViewConf->getImageUrl('Elektroversand-Schmidt_Logo_180.jpg')}]"> <img alt="" src="[{$oViewConf->getImageUrl('Elektroversand-Schmidt_Logo_180.jpg')}]">
[{/if}]
</div> </div>
[{/block}] [{/block}]

8
Application/views/tpl/documents/invoice/invoice.tpl
View File

@ -1,6 +1,6 @@
[{assign var= currency value= $order->getOrderCurrency()}] [{assign var="currency" value=$order->getOrderCurrency()}]
[{assign var= deliveryPrice value= $order->getOrderDeliveryPrice()}] [{assign var="deliveryPrice" value= $order->getOrderDeliveryPrice()}]
[{assign var= productVats value= $order->getProductVats(false)}] [{assign var="productVats" value= $order->getProductVats(false)}]
<style type="text/css"> <style type="text/css">
[{include file="d3pdfstyle.css"}] [{include file="d3pdfstyle.css"}]
@ -9,7 +9,7 @@
<page backtop="30mm" backbottom="30mm" backleft="10mm" backright="10mm" pageset="new"> <page backtop="30mm" backbottom="30mm" backleft="10mm" backright="10mm" pageset="new">
<page_header> <page_header>
[{block name="pdfTopingFile"}] [{block name="pdfTopingFile"}]
[{include file="d3pdfheader.tpl"}] [{include file="d3pdfheader.tpl" showLogo=true}]
[{/block}] [{/block}]
</page_header> </page_header>
<page_footer> <page_footer>

89
Application/views/tpl/documents/invoice/invoiceNoLogo.tpl Normal file
View File

@ -0,0 +1,89 @@
[{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>

2
metadata.php
View File

@ -52,11 +52,13 @@ $aModule = [
'd3orderoverview_pdfform.tpl' => 'd3/pdfdocuments/Application/views/tpl/admin/orderoverview_pdfform.tpl', 'd3orderoverview_pdfform.tpl' => 'd3/pdfdocuments/Application/views/tpl/admin/orderoverview_pdfform.tpl',
'd3deliverynote_pdf.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/deliverynote/deliverynote.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_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_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_style.css' => 'd3/pdfdocuments/out/src/css/deliverynote.css',
'd3invoice_pdf.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/invoice.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_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', 'd3invoice_pdf_conclusion.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl',