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

cleanup

This commit is contained in:
Daniel Seifert 2020-06-29 10:52:29 +02:00
parent b73219f6b5
commit 71d91b4136
Signed by: DanielS
GPG Key ID: 8A7C4C6ED1915C6F
15 changed files with 151 additions and 329 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Application/views/tpl/admin/orderoverview_pdfform.tpl
View File

@ -5,8 +5,7 @@
<input type="hidden" name="cl" value="order_overview">
<input type="hidden" name="fnc" value="createPDF">
<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">
<table style="border-spacing: 0;border-collapse: collapse;padding: 5px;border : 1px #A9A9A9 solid; width:220px">
<tr>
<td rowspan="3">
<img src="[{$oViewConf->getImageUrl()}]/pdf_icon.gif" width="41" height="38" alt="" border="0" hspace="0" vspace="0" align="absmiddle">

9
Application/views/tpl/documents/deliverynote/inc/conclusion.tpl Normal file
View File

@ -0,0 +1,9 @@
[{block name="conclusion"}]
<table class="conclusion_table">
<tr>
<td>
[{oxmultilang ident="D3_DELIVERYNOTE_PDF_PAYABLEUNTIL"}] 20.05.2020
</td>
</tr>
</table>
[{/block}]

0
Application/views/tpl/documents/deliverynote/includingFiles/informations.tpl → Application/views/tpl/documents/deliverynote/inc/informations.tpl
View File

25
Application/views/tpl/documents/deliverynote/inc/recipientAddress.tpl Normal file
View File

@ -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}]

2
Application/views/tpl/documents/deliverynote/includingFiles/salutation.tpl → Application/views/tpl/documents/deliverynote/inc/salutation.tpl
View File

@ -1,6 +1,6 @@
[{block name="salutation"}]
<div class="salutation">
<div class="documenttype">Rechnung</div>
<div class="documenttype">noch übersetzen: Lieferschein</div>
<div class="documentnumber">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERNR"}][{$order->getFieldData('oxordernr')}]</div>
<div>[{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSINCERELY"}][{$order->getFieldData('oxorderdate')|date_format:"%d.%m.%Y"}][{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSAT"}] [{$shop->oxshops__oxname->value}]</div>
</div>

5
Application/views/tpl/documents/deliverynote/includingFiles/conclusion.tpl
View File

@ -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}]

25
Application/views/tpl/documents/deliverynote/includingFiles/recipientAddress.tpl
View File

@ -1,25 +0,0 @@
[{block name="recipientaddress"}]
[{if $order->getFieldData('oxdellname')}]
[{if $order->getFieldData('oxdelcompany')}]
<div>[{$order->getFieldData('oxdelcompany')}]</div>
[{/if}]
<div>[{$order->getFieldData('oxdelfname')}] [{$order->getFieldData('oxdellname')}]</div>
[{if $order->getFieldData('oxdeladdinfo')}]
<div>[{$order->getFieldData('oxdeladdinfo')}]</div>
[{/if}]
<div>[{$order->getFieldData('oxdelstreet')}] [{$order->getFieldData('oxdelstreetnr')}]</div>
<div><strong>[{$order->getFieldData('oxdelzip')}] [{$order->getFieldData('oxdelcity')}]</strong></div>
<div class="heading_order_paddingBottom15">[{$order->getFieldData('oxdelcountry')}]</div>
[{else}]
[{if $order->getFieldData('oxbillcompany')}]
<div>[{$order->getFieldData('oxbillcompany')}]</div>
[{/if}]
<div>[{$order->getFieldData('oxbillfname')}] [{$order->getFieldData('oxbilllname')}]</div>
[{if $order->getFieldData('oxbilladdinfo')}]
<div>[{$order->getFieldData('oxbilladdinfo')}]</div>
[{/if}]
<div>[{$order->getFieldData('oxbillstreet')}] [{$order->getFieldData('oxbillstreetnr')}]</div>
<div><strong>[{$order->getFieldData('oxbillzip')}] [{$order->getFieldData('oxbillcity')}]</strong></div>
<div class="heading_order_paddingBottom15">[{$order->getFieldData('oxbillcountry')}]</div>
[{/if}]
[{/block}]

64
Application/views/tpl/documents/inc/elements/articlecostssummary.tpl
View File

@ -1,26 +1,54 @@
[{* ++++++Beschreibung der Kostensummierung++++++ *}]
<td class="article_costs_table_paddingRight article_costs_table_desc_width70 ">
<div class="order_sum paddingTopBottom5 fontSize12 border-bottom">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO"}]</div>
<td class="description">
<div class="sumbrutto">
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO"}]
</div>
[{if $order->getFormattedDiscount() != 0}]
<div class="order_sum paddingTopBottom5 fontSize12 border-bottom">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT"}]</div>
<div class="discount">
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT"}]
</div>
[{/if}]
<div class="order_sum order_article_PaddingTop5 fontSize12">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMNETTO"}]</div>
<div class="sumnetto">
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMNETTO"}]
</div>
[{foreach from=$productVats key=VatKey item=oVat}]
<div class="order_sum paddingTopBottom5 fontSize12 border-bottom">[{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="producttax">
[{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 order_article_PaddingTop5 fontSize12">[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DELIVERY"}]</div>
<div class="order_sum paddingTopBottom5 fontSize12 border-bottom">[{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 paddingTopBottom5 fontSize12"><strong>[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TOTALSUMBRUT"}]</strong></div>
<div class="delivery">
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DELIVERY"}]
</div>
<div class="deliverytax">
[{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="totalsum">
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_TOTALSUMBRUT"}]
</div>
</td>
[{* ++++++Kostensummierung++++++ *}]
<td class="article_costs_table_sum_width30">
<div class="order_sumNum paddingTopBottom5 aligning fontSize12 border-bottom">[{$order->getFormattedTotalBrutSum()}] [{$currency->name}]</div>
<td class="values">
<div class="sumbrutto">
[{$order->getFormattedTotalBrutSum()}] [{$currency->name}]
</div>
[{if $order->getFormattedDiscount() != 0}]
<div class="order_sumNum paddingTopBottom5 aligning fontSize12 border-bottom">-[{$order->getFormattedDiscount()}] [{$currency->name}]</div>
<div class="discount">
-[{$order->getFormattedDiscount()}] [{$currency->name}]
</div>
[{/if}]
<div class="order_sumNum order_article_PaddingTop5 aligning fontSize12">[{$order->getFormattedTotalNetSum()}] [{$currency->name}]</div>
<div class="order_sumNum paddingTopBottom5 aligning fontSize12 border-bottom">[{$lang->formatCurrency($oVat, $currency)}] [{$currency->name}]</div>
<div class="order_sumNum order_article_PaddingTop5 aligning fontSize12">[{$lang->formatCurrency($deliveryPrice->getNettoPrice(), $currency)}] [{$currency->name}]</div>
<div class="order_sumNum paddingTopBottom5 aligning fontSize12 border-bottom">[{$lang->formatCurrency($deliveryPrice->getVATValue(), $currency)}] [{$currency->name}]</div>
<div class="order_sumNum paddingTopBottom5 aligning fontSize12"><strong>[{$order->getFormattedTotalOrderSum()}] [{$currency->name}]</strong></div>
<div class="sumnetto">
[{$order->getFormattedTotalNetSum()}] [{$currency->name}]
</div>
[{* ToDo: kein foreach wie oben ??? *}]
<div class="producttax">
[{$lang->formatCurrency($oVat, $currency)}] [{$currency->name}]
</div>
<div class="delivery">
[{$lang->formatCurrency($deliveryPrice->getNettoPrice(), $currency)}] [{$currency->name}]
</div>
<div class="deliverytax">
[{$lang->formatCurrency($deliveryPrice->getVATValue(), $currency)}] [{$currency->name}]
</div>
[{* ToDo: keine payment costs ??? *}]
<div class="totalsum">
[{$order->getFormattedTotalOrderSum()}] [{$currency->name}]
</div>
</td>

0
Application/views/tpl/documents/invoice/includingFiles/conclusion.tpl → Application/views/tpl/documents/invoice/inc/conclusion.tpl
View File

0
Application/views/tpl/documents/invoice/includingFiles/informations.tpl → Application/views/tpl/documents/invoice/inc/informations.tpl
View File

0
Application/views/tpl/documents/invoice/includingFiles/salutation.tpl → Application/views/tpl/documents/invoice/inc/salutation.tpl
View File

12
Application/views/tpl/documents/invoice/includingFiles/recipientAddress.tpl
View File

@ -1,12 +0,0 @@
[{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">[{$shop->getFieldData('oxcountry')}]</div>
[{/block}]

15
metadata.php
View File

@ -51,17 +51,16 @@ $aModule = [
'd3deliverynote_pdf.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/deliverynote/deliverynote.tpl',
'd3deliverynoteNoLogo_pdf.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/deliverynote/deliverynoteNoLogo.tpl',
'd3delnote_pdf_informations.tpl'=> 'd3/pdfdocuments/Application/views/tpl/documents/deliverynote/includingFiles/informations.tpl',
'd3delnote_pdf_recipient.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/deliverynote/includingFiles/recipientAddress.tpl',
'd3delnote_pdf_salutation.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/deliverynote/includingFiles/salutation.tpl',
'd3delnote_pdf_conclusion.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/deliverynote/includingFiles/conclusion.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_informations.tpl'=> 'd3/pdfdocuments/Application/views/tpl/documents/invoice/includingFiles/informations.tpl',
'd3invoice_pdf_salutation.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/includingFiles/salutation.tpl',
'd3invoice_pdf_conclusion.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/includingFiles/conclusion.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',
'd3pdfbase.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/inc/page/base.tpl',
'd3pdfheader.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/inc/page/header.tpl',

40
out/src/css/deliverynote.css
View File

@ -1,40 +0,0 @@
.deliveryNote_table{
width: 678px;
}
.dN_width20{
width: 20%;
}
.dN_width80{
width: 80%;
}
.dN_paddingTopBottom5{
padding-top: 5px;
padding-bottom: 5px;
}
.dN_fontSize12{
font-size: 12px;
}
.dN_fontSize8{
font-size: 8px;
}
.dN_paddingRight52{
padding-right: 52.1px;
}
.dN_paddingLeft12{
padding-left: 12.5px
}
.deliverynote_width_artnum{
width: 80px;
}
.dN_width_658{
width: 658px;
}
.textAlignLeft{
text-align: left;
}
.paddingLeft{
padding-left: 2.4px;
}
.deliveryNote_paddingTop20{
padding-top: 20px;
}

280
out/src/css/pdfStyling.css
View File

@ -1,10 +1,13 @@
table{
font-family: "helvetica";
}
.header {
padding: 5mm;
height: 35mm;
width: 100%;
position: relative;
}
.header img.logo {
float: right;
margin: 10mm;
@ -18,21 +21,21 @@
height: 45mm;
position: relative;
}
.deliveryaddress {
margin-top: 10mm;
height: 27.3mm;
}
.addressarea .returnAddress,
.addressarea .recipientAddress {
position: relative;
}
.addressarea .returnAddress {
height: 17.7mm;
font-size: 8px;
}
.addressarea .returnAddress div {
padding-top: 3mm;
}
.addressarea .recipientAddress {
height: 27.3mm;
}
@ -54,41 +57,6 @@
top: 5mm;
position: absolute;
}
.deliveryaddress {
margin-top: 10mm;
height: 27.3mm;
}
.salutation {
margin-top: 5mm;
}
.salutation .documentnumber {
font-weight: bold;
}
.footer{
width: 173mm;
font-size: 9px;
position: relative;
margin: 0;
padding: 0;
}
.footer table {
border-top: solid 1px #000;
width: 100%;
position: relative;
}
.footerLeft,
.footerCenter,
.footerRight {
width: 33%;
padding: 0 2mm;
}
.contactinformations,
.bankaccountinformations,
.documentinformations {
@ -106,106 +74,13 @@
font-weight: bold;
}
/*debug hilfe*/
.eraseBug{
border: dashed blueviolet 1px;
.salutation {
margin-top: 5mm;
}
.salutation .documentnumber {
font-weight: bold;
}
table{
font-family: "helvetica";
}
.aligning{
text-align: right;
}
.vertical-a{
vertical-align: top;
}
.fontSize12{
font-size: 12px;
}
.order_sum{
margin-left: 300px;
}
.order_sumNum{
margin-right: -2.2px;
}
.border-bottom{
border-bottom: solid 0.15mm #000;
}
.paddingTop10{
padding-top: 10px
}
.paddingTop{
padding-top: 5px;
}
.paddingBottom{
padding-bottom: 5px;
}
.paddingTopBottom5{
padding-bottom: 5px;
padding-top: 5px;
}
/*pdf_footer*/
/*pdf_heading*/
.pdf_heading_table{
width: 100%;
margin-top: 8mm;
}
.paddingTop10{
padding-top: 10px;
}
.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_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*/
.article_table,
.article_table_prices {
width: 100%;
@ -276,6 +151,40 @@ table{
padding-right: 0;
}
.article_costs_table{
width: 100%;
border-top: solid 0.15mm #000;
border-bottom: solid 0.15mm #000;
}
.article_costs_table .description {
padding-right: -3px;
width: 70%;
}
.article_costs_table div {
padding-bottom: 5px;
padding-top: 5px;
font-size: 12px;
}
.article_costs_table .description div {
margin-left: 300px;
}
.article_costs_table .values {
width: 30%;
}
.article_costs_table .values div {
margin-right: -2.2px;
text-align: right;
}
.article_costs_table .sumbrutto,
.article_costs_table .discount,
.article_costs_table .producttax,
.article_costs_table .deliverytax {
border-bottom: solid 0.15mm #000;
}
.article_costs_table .totalsum {
font-weight: bold;
}
.conclusion_table {
width: 100%;
border-spacing: 0;
@ -285,87 +194,22 @@ table{
.conclusion_table td {
font-size: 12px;
}
.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{
.footer{
width: 173mm;
font-size: 9px;
position: relative;
margin: 0;
padding: 0;
}
.order_article_listing_fontSize12{
font-size: 12px;
}
/* order_article_costs */
.article_costs_table{
.footer table {
border-top: solid 1px #000;
width: 100%;
border-top: solid 0.15mm #000;
border-bottom: solid 0.15mm #000;
}
.article_costs_table_desc_width70{
width: 70%;
}
.article_costs_table_sum_width30{
width: 30%;
}
.article_costs_table_paddingRight{
padding-right: -3px;
}
.order_article_costs_fontSize12{
font-size: 12px;
}
/*order_shop_past_thank*/
.past_thank_width100{
width: 100%;
}
.paddingBottomSub10{
padding-bottom: -10px;
}
.marginTop0{
margin-top: 0;
}
.marginLeftSub3{
padding-left: -3.5px;
}
.marginLeft3{
margin-left: 3px;
}
/* footer styling */
.footer_parts{
width: 33.33%;
position: relative;
}
.footerLeft,
.footerCenter,
.footerRight {
width: 33%;
padding: 0 2mm;
}