From 8437314019deadb7f6885b182cd4a17e02089e67 Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Thu, 28 May 2020 14:31:35 +0200 Subject: [PATCH] add missing css files, change template aliases --- .../Model/Documents/deliverynotePdf.php | 2 +- Application/Model/Documents/invoicePdf.php | 2 +- .../views/tpl/deliverynote/deliverynote.tpl | 7 +- Application/views/tpl/invoice/invoice.tpl | 2 +- composer.json | 4 +- metadata.php | 4 +- out/src/css/deliverynote.css | 18 ++ out/src/css/deliverynote_.css | 173 ++++++++++++++++++ out/src/css/offers.css | 24 +++ out/src/css/pdfInvoiceCorrection.css | 32 ++++ out/src/css/pdfStyling.css | 173 ++++++++++++++++++ 11 files changed, 430 insertions(+), 11 deletions(-) create mode 100644 out/src/css/deliverynote.css create mode 100644 out/src/css/deliverynote_.css create mode 100644 out/src/css/offers.css create mode 100644 out/src/css/pdfInvoiceCorrection.css create mode 100644 out/src/css/pdfStyling.css diff --git a/Application/Model/Documents/deliverynotePdf.php b/Application/Model/Documents/deliverynotePdf.php index 09b3088..ccb64a2 100644 --- a/Application/Model/Documents/deliverynotePdf.php +++ b/Application/Model/Documents/deliverynotePdf.php @@ -22,6 +22,6 @@ use D3\PdfDocuments\Application\Model\AbstractClasses\pdfDocuments_order; class deliverynotePdf extends pdfDocuments_order { public function getTemplate(){ - return 'deliverynote.tpl'; + return 'd3deliverynote_pdf.tpl'; } } \ No newline at end of file diff --git a/Application/Model/Documents/invoicePdf.php b/Application/Model/Documents/invoicePdf.php index 77c0b58..581dcde 100644 --- a/Application/Model/Documents/invoicePdf.php +++ b/Application/Model/Documents/invoicePdf.php @@ -61,6 +61,6 @@ class invoicePdf extends pdfDocuments_order implements pdfdocuments_orderinvoice } public function getTemplate(){ - return 'invoice.tpl'; + return 'd3invoice_pdf.tpl'; } } \ No newline at end of file diff --git a/Application/views/tpl/deliverynote/deliverynote.tpl b/Application/views/tpl/deliverynote/deliverynote.tpl index 00c4b3c..db4cc9c 100644 --- a/Application/views/tpl/deliverynote/deliverynote.tpl +++ b/Application/views/tpl/deliverynote/deliverynote.tpl @@ -5,22 +5,23 @@ [{include file=$oViewConf->getModulePath('pdfDocuments', 'out/src/css/deliverynote.css')}], [{include file=$oViewConf->getModulePath('pdfDocuments', 'out/src/css/pdfStyling.css')}] + [{block name="pdfTopingFile"}] - [{include file=$oViewConf->getModulePath('pdfDocuments', 'Application/views/tpl/deliveryNote/includingFiles/pdfToping.tpl')}] + [{include file=$oViewConf->getModulePath('pdfDocuments', 'Application/views/tpl/deliverynote/includingFiles/pdfToping.tpl')}] [{/block}] [{block name="pdfFooterFile"}] - [{include file=$oViewConf->getModulePath('pdfDocuments', 'Application/views/tpl/deliveryNote/includingFiles/pdfFooter.tpl')}] + [{include file=$oViewConf->getModulePath('pdfDocuments', 'Application/views/tpl/deliverynote/includingFiles/pdfFooter.tpl')}] [{/block}] [{* +++++ main page part +++++ *}] [{block name="pdfHeadingFile"}] [{block name="pdfHeaderFile"}] - [{include file=$oViewConf->getModulePath('pdfDocuments', 'Application/views/tpl/deliveryNote/includingFiles/pdfHeader.tpl')}] + [{include file=$oViewConf->getModulePath('pdfDocuments', 'Application/views/tpl/deliverynote/includingFiles/pdfHeader.tpl')}] [{/block}] [{/block}] [{* +++++Artikeltabelle+++++*}] diff --git a/Application/views/tpl/invoice/invoice.tpl b/Application/views/tpl/invoice/invoice.tpl index 3fc4b99..bc51aa4 100644 --- a/Application/views/tpl/invoice/invoice.tpl +++ b/Application/views/tpl/invoice/invoice.tpl @@ -14,7 +14,7 @@ [{block name="pdfFooterFile"}] - [{include file=$oViewConf->getModulePath('pdfDocuments', 'Application/views/tpl/includingFiles/pdfFooter.tpl')}] + [{include file=$oViewConf->getModulePath('pdfDocuments', 'Application/views/tpl/invoice/includingFiles/pdfFooter.tpl')}] [{/block}] diff --git a/composer.json b/composer.json index 3888376..9923320 100644 --- a/composer.json +++ b/composer.json @@ -30,9 +30,7 @@ } }, "require": { - "php": ">=5.6", - "oxid-esales/oxideshop-ce": "6.0 - 6.3", - "spipu/html2pdf": "^5.2" + "oxid-esales/oxideshop-ce": "6.0 - 6.3" }, "autoload": { "psr-4": { diff --git a/metadata.php b/metadata.php index 176e4d8..6842c9f 100644 --- a/metadata.php +++ b/metadata.php @@ -49,8 +49,8 @@ $aModule = [ ], 'controllers' => [], 'templates' => [ - 'd3deliverynote.tpl' => 'd3/pdfdocuments/Application/views/tpl/deliverynote/deliverynote.tpl', - 'invoice.tpl' => 'd3/pdfdocuments/Application/views/tpl/invoice/invoice.tpl', + 'd3deliverynote_pdf.tpl' => 'd3/pdfdocuments/Application/views/tpl/deliverynote/deliverynote.tpl', + 'd3invoice_pdf.tpl' => 'd3/pdfdocuments/Application/views/tpl/invoice/invoice.tpl', 'd3tplheader.tpl' => 'd3/pdfdocuments/Application/views/tpl/header.tpl' ], 'events' => [], diff --git a/out/src/css/deliverynote.css b/out/src/css/deliverynote.css new file mode 100644 index 0000000..900f0ea --- /dev/null +++ b/out/src/css/deliverynote.css @@ -0,0 +1,18 @@ +.deliverynote_width_amount{ + width: 20px; +} +.deliverynote_width_artnum{ + width: 80px; +} +.deliverynote_width_desc{ + width: 469.5px; +} +.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/deliverynote_.css b/out/src/css/deliverynote_.css new file mode 100644 index 0000000..8b9c9a1 --- /dev/null +++ b/out/src/css/deliverynote_.css @@ -0,0 +1,173 @@ +/*debug hilfe*/ +.eraseBug{ + border: dashed blueviolet 1px; +} + +table{ + font-family: "helvetica"; +} +.aligning{ + text-align: right; +} +.vertical-a{ + vertical-align: top; +} +.fontSize12{ + font-size: 12px; +} +.order_sum{ + margin-left: 181px; +} +.order_sumNum{ + margin-right: -2.2px; +} +.border-bottom{ + border-bottom: solid 0.15mm #000; +} +.hermes{ + padding-top: 5px; +} +.mercurius{ + padding-bottom: 5px; +} +.spacing_order_info{ + padding-bottom: 5px; + padding-top: 5px; +} + +/*pdf_header*/ +.pdf_header_positioning{ + position: absolute; + top: 30px; + right: 44px; +} + +/*pdf_footer*/ +.pdf_footer_table{ + width: 688px; + font-size: 9px; + margin: 0 30px 0 30px; + border-top: solid 1px #000; +} + +/*pdf_heading*/ +.pdf_heading_table{ + width: 100%; + margin-top: 8mm; +} +.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_paddingTop1{ + padding-top: 1mm; +} +.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*/ +.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{ + font-size: 9px; +} +.order_article_listing_fontSize12{ + font-size: 12px; +} + +/* order_article_costs */ +.article_costs_table{ + width: 100%; + border-top: solid 0.15mm #000; +} +.article_costs_table_td_width50{ + width: 50%; +} +.article_costs_table_paddingRight{ + padding-right: -3px; +} +.order_article_costs_fontSize12{ + font-size: 12px; +} + +/*order_shop_past_thank*/ +.past_thank_width100{ + width: 100%; +} + +/* footer styling */ +.footer_parts{ + width: 33.33%; +} diff --git a/out/src/css/offers.css b/out/src/css/offers.css new file mode 100644 index 0000000..b5c01c2 --- /dev/null +++ b/out/src/css/offers.css @@ -0,0 +1,24 @@ +.offers_subTitle_font14{ + font-size: 14px; +} +.helvetica{ + font-family: helvetica; +} +.offers_width50{ + width: 50%; +} +.offers_width100{ + width: 100%; +} +.offers_margin_top20{ + margin-top: 20px; +} +.offers_margin_bottom20{ + margin-bottom: 20px; +} +.offers_pstThank_margin_top20{ + margin-top: 20px; +} +.offers_pstThank_font20{ + font-size: 20px; +} diff --git a/out/src/css/pdfInvoiceCorrection.css b/out/src/css/pdfInvoiceCorrection.css new file mode 100644 index 0000000..2c2ec33 --- /dev/null +++ b/out/src/css/pdfInvoiceCorrection.css @@ -0,0 +1,32 @@ +.invoiceCorrection_width_40{ + width: 40%; +} +.invoiceCorrection_width_60{ + width: 60%; +} +.invoiceCorrection_font8{ + font-size: 8px; +} +.invoiceCorrection_font9{ + font-size: 9px; +} +.invoiceCorrection_tableMarginTop15{ + margin-top: 15px; +} +.invoiceCorrection_spacingLeft20{ + margin-left: 73.6px; +} + +.invoiceCorrectionPaddingTop4{ + padding-top: 4px; +} +.invoiceCorrectionPaddingTop5{ + padding-top: 5px; +} + +.invoiceCorrectionPaddingBottom20{ + padding-bottom: 20px; +} +.invoiceCorrectionPaddingBottom16{ + padding-bottom: 16px; +} diff --git a/out/src/css/pdfStyling.css b/out/src/css/pdfStyling.css new file mode 100644 index 0000000..8b9c9a1 --- /dev/null +++ b/out/src/css/pdfStyling.css @@ -0,0 +1,173 @@ +/*debug hilfe*/ +.eraseBug{ + border: dashed blueviolet 1px; +} + +table{ + font-family: "helvetica"; +} +.aligning{ + text-align: right; +} +.vertical-a{ + vertical-align: top; +} +.fontSize12{ + font-size: 12px; +} +.order_sum{ + margin-left: 181px; +} +.order_sumNum{ + margin-right: -2.2px; +} +.border-bottom{ + border-bottom: solid 0.15mm #000; +} +.hermes{ + padding-top: 5px; +} +.mercurius{ + padding-bottom: 5px; +} +.spacing_order_info{ + padding-bottom: 5px; + padding-top: 5px; +} + +/*pdf_header*/ +.pdf_header_positioning{ + position: absolute; + top: 30px; + right: 44px; +} + +/*pdf_footer*/ +.pdf_footer_table{ + width: 688px; + font-size: 9px; + margin: 0 30px 0 30px; + border-top: solid 1px #000; +} + +/*pdf_heading*/ +.pdf_heading_table{ + width: 100%; + margin-top: 8mm; +} +.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_paddingTop1{ + padding-top: 1mm; +} +.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*/ +.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{ + font-size: 9px; +} +.order_article_listing_fontSize12{ + font-size: 12px; +} + +/* order_article_costs */ +.article_costs_table{ + width: 100%; + border-top: solid 0.15mm #000; +} +.article_costs_table_td_width50{ + width: 50%; +} +.article_costs_table_paddingRight{ + padding-right: -3px; +} +.order_article_costs_fontSize12{ + font-size: 12px; +} + +/*order_shop_past_thank*/ +.past_thank_width100{ + width: 100%; +} + +/* footer styling */ +.footer_parts{ + width: 33.33%; +}