From 2aefa5a154a1bdef68cef47f234ae53b0eea6527 Mon Sep 17 00:00:00 2001 From: MaxBUhe Date: Mon, 18 May 2020 14:30:17 +0200 Subject: [PATCH] changing included file's path; add: css classes; reorderung header; including new oxmultilang idents --- .../views/tpl/offers/deliverynote.tpl | 93 +++++++++---------- .../tpl/offers/includingFiles/pdfHeader.tpl | 71 +++++++------- .../offers/includingFiles/pdfPastThank.tpl | 21 ++--- 3 files changed, 93 insertions(+), 92 deletions(-) diff --git a/source/modules/d3/pdfdocuments/src/Application/views/tpl/offers/deliverynote.tpl b/source/modules/d3/pdfdocuments/src/Application/views/tpl/offers/deliverynote.tpl index cb91e0d..386a17f 100644 --- a/source/modules/d3/pdfdocuments/src/Application/views/tpl/offers/deliverynote.tpl +++ b/source/modules/d3/pdfdocuments/src/Application/views/tpl/offers/deliverynote.tpl @@ -2,51 +2,50 @@ [{assign var= deliveryPrice value= $order->getOrderDeliveryPrice()}] - [{block name="pdfTopingFile"}] - [{include file="/home/elegltyp/schmidtshop.wkgisp.de/source/modules/d3/pdfdocuments/Application/views/tpl/includingFiles/pdfToping.tpl"}] - [{/block}] + [{block name="pdfTopingFile"}] + [{include file=$oViewConf->getModulePath('d3invoicePdf', 'Application/views/tpl/offers/includingFiles/pdfToping.tpl')}] + [{/block}] - [{block name="pdfFooterFile"}] - [{include file="/home/elegltyp/schmidtshop.wkgisp.de/source/modules/d3/pdfdocuments/Application/views/tpl/includingFiles/pdfFooter.tpl"}] - [{/block}] + [{block name="pdfFooterFile"}] + [{include file=$oViewConf->getModulePath('d3invoicePdf', 'Application/views/tpl/offers/includingFiles/pdfFooter.tpl')}] + [{/block}] [{* +++++ main page part +++++ *}] - [{block name="pdfHeadingFile"}] - [{block name="pdfHeaderFile"}] - [{include file="/home/elegltyp/schmidtshop.wkgisp.de/source/modules/d3/pdfdocuments/Application/views/tpl/includingFiles/pdfHeader.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="pdfHeaderFile"}] + [{include file=$oViewConf->getModulePath('d3invoicePdf', 'Application/views/tpl/offers/includingFiles/pdfHeader.tpl')}] + [{/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"}] @@ -54,13 +53,13 @@ [{* ++++++Artikelzusammenfassung++++++ *}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMBRUTTO"}]
- [{if $order->getFormattedDiscount() != 0}] + [{if $order->getFormattedDiscount() != 0}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_DISCOUNT"}]
- [{/if}] + [{/if}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_SUMNETTO"}]
- [{foreach from=$order->getVats() key=VatKey item=oVat}] + [{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}] + [{/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"}]
@@ -68,9 +67,9 @@ [{* ++++++Kosten der Bestellung++++++ *}]
[{$order->getFormattedTotalBrutSum()}] [{$currency->name}]
- [{if $order->getFormattedDiscount() != 0}] + [{if $order->getFormattedDiscount() != 0}]
-[{$order->getFormattedDiscount()}] [{$currency->name}]
- [{/if}] + [{/if}]
[{$order->getFormattedTotalNetSum()}] [{$currency->name}]
[{$lang->formatCurrency($oVat, $currency)}] [{$currency->name}]
[{$lang->formatCurrency($deliveryPrice->getNettoPrice(), $currency)}] [{$currency->name}]
@@ -79,9 +78,9 @@
- [{/block}] - [{block name="pdfPastThankFile"}] - [{include file="/home/elegltyp/schmidtshop.wkgisp.de/source/modules/d3/pdfdocuments/Application/views/tpl/includingFiles/pdfPastThank.tpl"}] - [{/block}] + [{/block}] + [{block name="pdfPastThankFile"}] + [{include file=$oViewConf->getModulePath('d3invoicePdf', 'Application/views/tpl/offers/includingFiles/pdfPastThank.tpl')}] + [{/block}] \ No newline at end of file diff --git a/source/modules/d3/pdfdocuments/src/Application/views/tpl/offers/includingFiles/pdfHeader.tpl b/source/modules/d3/pdfdocuments/src/Application/views/tpl/offers/includingFiles/pdfHeader.tpl index a4aaa3c..57df2d5 100644 --- a/source/modules/d3/pdfdocuments/src/Application/views/tpl/offers/includingFiles/pdfHeader.tpl +++ b/source/modules/d3/pdfdocuments/src/Application/views/tpl/offers/includingFiles/pdfHeader.tpl @@ -1,56 +1,61 @@ [{block name="pdfHeading"}] - - [{block name="heading_owner_information"}] - - - - - [{/block}] +
-
[{$shop->oxshops__oxname->value}] - [{$shop->oxshops__oxstreet->value}] - [{$shop->oxshops__oxzip->value}] [{$shop->oxshops__oxcity->value}]
- 		-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_GET_IN_CONTACT"}]
-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TELEFON"}][{$shop->oxshops__oxtelefon->value}]
-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_FAX"}][{$shop->oxshops__oxtelefax->value}]
-
[{$shop->oxshops__oxinfoemail->value}]
-
[{block name="heading_order_information"}] - + + [{/block}] + [{/block}] +
- [{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}]
- - [{* +++++++Lieferadressen dynamisch+++++++ *}] +
[{$shop->oxshops__oxname->value}] - [{$shop->oxshops__oxstreet->value}] - [{$shop->oxshops__oxzip->value}] - [{$shop->oxshops__oxcity->value}]
[{if $order->oxorder__oxdelstreet->value}] -
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYADDRESS"}]
- [{if $order->oxorder__oxdelcompany->value}]
[{$order->oxorder__oxdelcompany->value}]
[{/if}] + [{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}] - - [{*Bestellnummer,Rechnungsvermerk, 'Ihre bestellung vom...'*}] -
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERNR"}][{$order->oxorder__oxordernr->value}]
-
[{if $order->oxorder__d3pdftextkostenstelle_kunden->value}][{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_INVOICENOTE"}][{$order->oxorder__d3pdftextkostenstelle_kunden->value}][{/if}]
-
[{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_BANKVERBINDUNG"}]
+ [{block name="heading_owner_information"}] + 		+
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_GET_IN_CONTACT"}]
+
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_TELEFON"}][{$shop->oxshops__oxtelefon->value}]
+
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_FAX"}][{$shop->oxshops__oxtelefax->value}]
+
[{$shop->oxshops__oxinfoemail->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_HEADER"}][{$shop->oxshops__oxbiccode->value}]
-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILLNR"}][{$order->oxorder__oxbillnr->value}]
+
+ + [{block name="table_toping_information"}] + + + +
+
[{oxmultilang ident="D3_OFFER_PDF_OFFERN"}][0000]
+
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_ORDERBILL_CUSTOMERNR"}] [{$user->oxuser__oxcustnr->value}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DATE"}][{$order->oxorder__oxbilldate->value|date_format:"%d.%m.%Y"}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTIDNR"}][{$shop->oxshops__oxvatnumber->value}]
+ + + + [{/block}]
+
[{oxmultilang ident="D3_OFFER_PDF_THANKINTEREST"}]
+
[{oxmultilang ident="D3_OFFER_PDF_OFFERTEXT"}]
+
[{/block}] \ No newline at end of file diff --git a/source/modules/d3/pdfdocuments/src/Application/views/tpl/offers/includingFiles/pdfPastThank.tpl b/source/modules/d3/pdfdocuments/src/Application/views/tpl/offers/includingFiles/pdfPastThank.tpl index 907388c..a2f4330 100644 --- a/source/modules/d3/pdfdocuments/src/Application/views/tpl/offers/includingFiles/pdfPastThank.tpl +++ b/source/modules/d3/pdfdocuments/src/Application/views/tpl/offers/includingFiles/pdfPastThank.tpl @@ -1,16 +1,13 @@ [{block name="pdfPastThankFile"}] - +
- - [{* +++++++Individueller Zahlungstext+++++++ *}] - [{if $order->oxorder__d3pdftextbestellbestaetigung->value}] - - [{else}] - - [{/if}] - [{*+++++++++++*}] - - - + [{* material info *}] + + [{* price is inkl. *}] + + + [{* offer delay *}] + +
 
[{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"}]
[{oxmultilang ident="D3_OFFER_PDF_INFO"}][{$payment->oxpayments__oxdesc->value}]
[{oxmultilang ident="D3_OFFER_PDF_PRICEINFO"}]
[{oxmultilang ident="D3_OFFER_PDF_OFFERTIME"}]
[{oxmultilang ident="D3_OFFER_PDF_OFFER"}]
[{oxmultilang ident="ORDER_OVERVIEW_PDF_GREETINGS_AUFTRAG_2"}]
[{/block}] \ No newline at end of file