diff --git a/Application/views/tpl/admin/orderoverview_pdfform.tpl b/Application/views/tpl/admin/orderoverview_pdfform.tpl index 93a2d5b..27e8ff0 100644 --- a/Application/views/tpl/admin/orderoverview_pdfform.tpl +++ b/Application/views/tpl/admin/orderoverview_pdfform.tpl @@ -5,8 +5,7 @@ - - +
-[{* ++++++Kostensummierung++++++ *}] - \ No newline at end of file diff --git a/Application/views/tpl/documents/invoice/includingFiles/conclusion.tpl b/Application/views/tpl/documents/invoice/inc/conclusion.tpl similarity index 100% rename from Application/views/tpl/documents/invoice/includingFiles/conclusion.tpl rename to Application/views/tpl/documents/invoice/inc/conclusion.tpl diff --git a/Application/views/tpl/documents/invoice/includingFiles/informations.tpl b/Application/views/tpl/documents/invoice/inc/informations.tpl similarity index 100% rename from Application/views/tpl/documents/invoice/includingFiles/informations.tpl rename to Application/views/tpl/documents/invoice/inc/informations.tpl diff --git a/Application/views/tpl/documents/invoice/includingFiles/salutation.tpl b/Application/views/tpl/documents/invoice/inc/salutation.tpl similarity index 100% rename from Application/views/tpl/documents/invoice/includingFiles/salutation.tpl rename to Application/views/tpl/documents/invoice/inc/salutation.tpl diff --git a/Application/views/tpl/documents/invoice/includingFiles/recipientAddress.tpl b/Application/views/tpl/documents/invoice/includingFiles/recipientAddress.tpl deleted file mode 100644 index 7a02ef5..0000000 --- a/Application/views/tpl/documents/invoice/includingFiles/recipientAddress.tpl +++ /dev/null @@ -1,12 +0,0 @@ -[{block name="recipientaddress"}] - [{if $order->getFieldData('oxbillcompany')}] -
[{$order->getFieldData('oxbillcompany')}]
- [{/if}] -
[{$order->getFieldData('oxbillfname')}] [{$order->getFieldData('oxbilllname')}]
- [{if $order->getFieldData('oxbilladdinfo')}] -
[{$order->getFieldData('oxbilladdinfo')}]
- [{/if}] -
[{$order->getFieldData('oxbillstreet')}] [{$order->getFieldData('oxbillstreetnr')}]
-
[{$order->getFieldData('oxbillzip')}] [{$order->getFieldData('oxbillcity')}]
-
[{$shop->getFieldData('oxcountry')}]
-[{/block}] \ No newline at end of file diff --git a/metadata.php b/metadata.php index 777179e..022bc2d 100644 --- a/metadata.php +++ b/metadata.php @@ -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', diff --git a/out/src/css/deliverynote.css b/out/src/css/deliverynote.css deleted file mode 100644 index 380994a..0000000 --- a/out/src/css/deliverynote.css +++ /dev/null @@ -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; -} \ No newline at end of file diff --git a/out/src/css/pdfStyling.css b/out/src/css/pdfStyling.css index 366f541..c019ec4 100644 --- a/out/src/css/pdfStyling.css +++ b/out/src/css/pdfStyling.css @@ -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; +} \ No newline at end of file
diff --git a/Application/views/tpl/documents/deliverynote/inc/conclusion.tpl b/Application/views/tpl/documents/deliverynote/inc/conclusion.tpl new file mode 100644 index 0000000..bbfde06 --- /dev/null +++ b/Application/views/tpl/documents/deliverynote/inc/conclusion.tpl @@ -0,0 +1,9 @@ +[{block name="conclusion"}] + + + + +
+ [{oxmultilang ident="D3_DELIVERYNOTE_PDF_PAYABLEUNTIL"}] 20.05.2020 +
+[{/block}] \ No newline at end of file diff --git a/Application/views/tpl/documents/deliverynote/includingFiles/informations.tpl b/Application/views/tpl/documents/deliverynote/inc/informations.tpl similarity index 100% rename from Application/views/tpl/documents/deliverynote/includingFiles/informations.tpl rename to Application/views/tpl/documents/deliverynote/inc/informations.tpl diff --git a/Application/views/tpl/documents/deliverynote/inc/recipientAddress.tpl b/Application/views/tpl/documents/deliverynote/inc/recipientAddress.tpl new file mode 100644 index 0000000..e872462 --- /dev/null +++ b/Application/views/tpl/documents/deliverynote/inc/recipientAddress.tpl @@ -0,0 +1,25 @@ +[{block name="recipientaddress"}] + [{if $order->getFieldData('oxdellname')}] + [{if $order->getFieldData('oxdelcompany')}] +
[{$order->getFieldData('oxdelcompany')}]
+ [{/if}] +
[{$order->getFieldData('oxdelfname')}] [{$order->getFieldData('oxdellname')}]
+ [{if $order->getFieldData('oxdeladdinfo')}] +
[{$order->getFieldData('oxdeladdinfo')}]
+ [{/if}] +
[{$order->getFieldData('oxdelstreet')}] [{$order->getFieldData('oxdelstreetnr')}]
+
[{$order->getFieldData('oxdelzip')}] [{$order->getFieldData('oxdelcity')}]
+
[{$order->getFieldData('oxdelcountry')}]
+ [{else}] + [{if $order->getFieldData('oxbillcompany')}] +
[{$order->getFieldData('oxbillcompany')}]
+ [{/if}] +
[{$order->getFieldData('oxbillfname')}] [{$order->getFieldData('oxbilllname')}]
+ [{if $order->getFieldData('oxbilladdinfo')}] +
[{$order->getFieldData('oxbilladdinfo')}]
+ [{/if}] +
[{$order->getFieldData('oxbillstreet')}] [{$order->getFieldData('oxbillstreetnr')}]
+
[{$order->getFieldData('oxbillzip')}] [{$order->getFieldData('oxbillcity')}]
+
[{$order->getFieldData('oxbillcountry')}]
+ [{/if}] +[{/block}] \ No newline at end of file diff --git a/Application/views/tpl/documents/deliverynote/includingFiles/salutation.tpl b/Application/views/tpl/documents/deliverynote/inc/salutation.tpl similarity index 83% rename from Application/views/tpl/documents/deliverynote/includingFiles/salutation.tpl rename to Application/views/tpl/documents/deliverynote/inc/salutation.tpl index 58390f8..32e8c5a 100644 --- a/Application/views/tpl/documents/deliverynote/includingFiles/salutation.tpl +++ b/Application/views/tpl/documents/deliverynote/inc/salutation.tpl @@ -1,6 +1,6 @@ [{block name="salutation"}]
-
Rechnung
+
noch übersetzen: Lieferschein
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERNR"}][{$order->getFieldData('oxordernr')}]
[{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSINCERELY"}][{$order->getFieldData('oxorderdate')|date_format:"%d.%m.%Y"}][{oxmultilang ident="ORDER_OVERVIEW_PDF_ORDERSAT"}] [{$shop->oxshops__oxname->value}]
diff --git a/Application/views/tpl/documents/deliverynote/includingFiles/conclusion.tpl b/Application/views/tpl/documents/deliverynote/includingFiles/conclusion.tpl deleted file mode 100644 index ff3ee3e..0000000 --- a/Application/views/tpl/documents/deliverynote/includingFiles/conclusion.tpl +++ /dev/null @@ -1,5 +0,0 @@ -[{block name="pdfPastThankFile"}] - - -
[{oxmultilang ident="D3_DELIVERYNOTE_PDF_PAYABLEUNTIL"}] 20.05.2020
-[{/block}] \ No newline at end of file diff --git a/Application/views/tpl/documents/deliverynote/includingFiles/recipientAddress.tpl b/Application/views/tpl/documents/deliverynote/includingFiles/recipientAddress.tpl deleted file mode 100644 index bb4e8c3..0000000 --- a/Application/views/tpl/documents/deliverynote/includingFiles/recipientAddress.tpl +++ /dev/null @@ -1,25 +0,0 @@ -[{block name="recipientaddress"}] - [{if $order->getFieldData('oxdellname')}] - [{if $order->getFieldData('oxdelcompany')}] -
[{$order->getFieldData('oxdelcompany')}]
- [{/if}] -
[{$order->getFieldData('oxdelfname')}] [{$order->getFieldData('oxdellname')}]
- [{if $order->getFieldData('oxdeladdinfo')}] -
[{$order->getFieldData('oxdeladdinfo')}]
- [{/if}] -
[{$order->getFieldData('oxdelstreet')}] [{$order->getFieldData('oxdelstreetnr')}]
-
[{$order->getFieldData('oxdelzip')}] [{$order->getFieldData('oxdelcity')}]
-
[{$order->getFieldData('oxdelcountry')}]
- [{else}] - [{if $order->getFieldData('oxbillcompany')}] -
[{$order->getFieldData('oxbillcompany')}]
- [{/if}] -
[{$order->getFieldData('oxbillfname')}] [{$order->getFieldData('oxbilllname')}]
- [{if $order->getFieldData('oxbilladdinfo')}] -
[{$order->getFieldData('oxbilladdinfo')}]
- [{/if}] -
[{$order->getFieldData('oxbillstreet')}] [{$order->getFieldData('oxbillstreetnr')}]
-
[{$order->getFieldData('oxbillzip')}] [{$order->getFieldData('oxbillcity')}]
-
[{$order->getFieldData('oxbillcountry')}]
- [{/if}] -[{/block}] \ No newline at end of file diff --git a/Application/views/tpl/documents/inc/elements/articlecostssummary.tpl b/Application/views/tpl/documents/inc/elements/articlecostssummary.tpl index a440358..68c1aab 100644 --- a/Application/views/tpl/documents/inc/elements/articlecostssummary.tpl +++ b/Application/views/tpl/documents/inc/elements/articlecostssummary.tpl @@ -1,26 +1,54 @@ -[{* ++++++Beschreibung der Kostensummierung++++++ *}] -
-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO"}]
+
+
+ [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO"}] +
[{if $order->getFormattedDiscount() != 0}] -
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT"}]
+
+ [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT"}] +
[{/if}] -
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMNETTO"}]
+
+ [{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"}]
+
+ [{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"}]
+
+ [{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}]
+
+
+ [{$order->getFormattedTotalBrutSum()}] [{$currency->name}] +
[{if $order->getFormattedDiscount() != 0}] -
-[{$order->getFormattedDiscount()}] [{$currency->name}]
+
+ -[{$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}]
+
+ [{$order->getFormattedTotalNetSum()}] [{$currency->name}] +
+[{* ToDo: kein foreach wie oben ??? *}] +
+ [{$lang->formatCurrency($oVat, $currency)}] [{$currency->name}] +
+
+ [{$lang->formatCurrency($deliveryPrice->getNettoPrice(), $currency)}] [{$currency->name}] +
+
+ [{$lang->formatCurrency($deliveryPrice->getVATValue(), $currency)}] [{$currency->name}] +
+[{* ToDo: keine payment costs ??? *}] +
+ [{$order->getFormattedTotalOrderSum()}] [{$currency->name}] +