From e27ce83d4b948437a399a5964ef9ae3b9353b445 Mon Sep 17 00:00:00 2001 From: MaxBUhe Date: Mon, 18 May 2020 14:35:46 +0200 Subject: [PATCH] rm unneseccary files and an unnesecarry folder --- .../Application/views/tpl/deliverynote.tpl | 87 ------------------- .../views/tpl/includingFiles/pdfFooter.tpl | 32 ------- .../views/tpl/includingFiles/pdfHeader.tpl | 56 ------------ .../views/tpl/includingFiles/pdfPastThank.tpl | 16 ---- .../views/tpl/includingFiles/pdfToping.tpl | 5 -- 5 files changed, 196 deletions(-) delete mode 100644 source/modules/d3/pdfdocuments/src/Application/views/tpl/deliverynote.tpl delete mode 100644 source/modules/d3/pdfdocuments/src/Application/views/tpl/includingFiles/pdfFooter.tpl delete mode 100644 source/modules/d3/pdfdocuments/src/Application/views/tpl/includingFiles/pdfHeader.tpl delete mode 100644 source/modules/d3/pdfdocuments/src/Application/views/tpl/includingFiles/pdfPastThank.tpl delete mode 100644 source/modules/d3/pdfdocuments/src/Application/views/tpl/includingFiles/pdfToping.tpl diff --git a/source/modules/d3/pdfdocuments/src/Application/views/tpl/deliverynote.tpl b/source/modules/d3/pdfdocuments/src/Application/views/tpl/deliverynote.tpl deleted file mode 100644 index 17d2436..0000000 --- a/source/modules/d3/pdfdocuments/src/Application/views/tpl/deliverynote.tpl +++ /dev/null @@ -1,87 +0,0 @@ -[{assign var= currency value= $order->getOrderCurrency()}] -[{assign var= deliveryPrice value= $order->getOrderDeliveryPrice()}] - - - - - [{block name="pdfTopingFile"}] - [{include file=$oViewConf->getModulePath('d3invoicePdf', 'Application/views/tpl/includingFiles/pdfToping.tpl')}] - [{/block}] - - - [{block name="pdfFooterFile"}] - [{include file=$oViewConf->getModulePath('d3invoicePdf', 'Application/views/tpl/includingFiles/pdfFooter.tpl')}] - [{/block}] - - - [{* +++++ main page part +++++ *}] - [{block name="pdfHeadingFile"}] - [{block name="pdfHeaderFile"}] - [{include file=$oViewConf->getModulePath('d3invoicePdf', '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="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=$oViewConf->getModulePath('d3InvoicePdf', 'Application/views/tpl/includingFiles/pdfPastThank.tpl')}] - [{/block}] - - \ No newline at end of file diff --git a/source/modules/d3/pdfdocuments/src/Application/views/tpl/includingFiles/pdfFooter.tpl b/source/modules/d3/pdfdocuments/src/Application/views/tpl/includingFiles/pdfFooter.tpl deleted file mode 100644 index d625e44..0000000 --- a/source/modules/d3/pdfdocuments/src/Application/views/tpl/includingFiles/pdfFooter.tpl +++ /dev/null @@ -1,32 +0,0 @@ -[{block name="pdfFooter"}] - - - [{block name="shop_basic_information"}] - - [{/block}] - [{block name="owner_basic_information"}] - - [{/block}] - [{block name="bank_basic_information"}] - - [{/block}] - -
-
[{$shop->oxshops__oxname->value}]
-
[{$shop->oxshops__oxstreet->value}]
-
[{$shop->oxshops__oxzip->value}] [{$shop->oxshops__oxcity->value}]
-
[{$shop->oxshops__oxcountry->value}]
-
[{$shop->oxshops__oxurl->value}]
-
[{$shop->oxshops__oxinfoemail->value}]
- 		-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_MANAGINGDIRECTOR"}][{$shop->oxshops__oxfname->value}] [{$shop->oxshops__oxlname->value}]
-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_COURT"}] [{$shop->oxshops__oxcourt->value}]
-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_HRBNR"}][{$shop->oxshops__oxhrbnr->value}]
-
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_USTID"}][{$shop->oxshops__oxvatnumber->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"}][{$shop->oxshops__oxbiccode->value}]
-
-[{/block}] \ No newline at end of file diff --git a/source/modules/d3/pdfdocuments/src/Application/views/tpl/includingFiles/pdfHeader.tpl b/source/modules/d3/pdfdocuments/src/Application/views/tpl/includingFiles/pdfHeader.tpl deleted file mode 100644 index a4aaa3c..0000000 --- a/source/modules/d3/pdfdocuments/src/Application/views/tpl/includingFiles/pdfHeader.tpl +++ /dev/null @@ -1,56 +0,0 @@ -[{block name="pdfHeading"}] - - [{block name="heading_owner_information"}] - - - - - [{/block}] - [{block name="heading_order_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}]
-
- [{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+++++++ *}] - [{if $order->oxorder__oxdelstreet->value}] -
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYADDRESS"}]
- [{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}]
- [{/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"}]
-
[{$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}]
-
[{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}] \ No newline at end of file diff --git a/source/modules/d3/pdfdocuments/src/Application/views/tpl/includingFiles/pdfPastThank.tpl b/source/modules/d3/pdfdocuments/src/Application/views/tpl/includingFiles/pdfPastThank.tpl deleted file mode 100644 index 907388c..0000000 --- a/source/modules/d3/pdfdocuments/src/Application/views/tpl/includingFiles/pdfPastThank.tpl +++ /dev/null @@ -1,16 +0,0 @@ -[{block name="pdfPastThankFile"}] - - - - [{* +++++++Individueller Zahlungstext+++++++ *}] - [{if $order->oxorder__d3pdftextbestellbestaetigung->value}] - - [{else}] - - [{/if}] - [{*+++++++++++*}] - - - -
 
[{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"}]
-[{/block}] \ No newline at end of file diff --git a/source/modules/d3/pdfdocuments/src/Application/views/tpl/includingFiles/pdfToping.tpl b/source/modules/d3/pdfdocuments/src/Application/views/tpl/includingFiles/pdfToping.tpl deleted file mode 100644 index 77a8ed7..0000000 --- a/source/modules/d3/pdfdocuments/src/Application/views/tpl/includingFiles/pdfToping.tpl +++ /dev/null @@ -1,5 +0,0 @@ -[{block name="pdfToping"}] -
- -
-[{/block}] \ No newline at end of file