D3Public/pdfdokumente
8
0
Vork 0
Code Pull-aanvragen Publicaties Activiteit

add final changes

Bladeren bron
This commit is contained in:
Daniel Seifert 2020-07-03 21:59:18 +02:00
bovenliggende 70605bdbd9
commit a3ea238afb
5 gewijzigde bestanden met toevoegingen van 48 en 41 verwijderingen
Statistieken weergeven Download Patch-bestand Download Diff-bestand Expand all files Collapse all files

3
Application/Model/Documents/invoicePdf.php
Bestand weergeven

@ -31,8 +31,7 @@ class invoicePdf extends pdfdocumentsOrder implements pdfdocumentsOrderinvoiceIn
*/
public function getRequestId()
{
// same like in OXID PDF module
return 'standart';
return 'invoice';
}
/**

1
Application/views/admin/de/pdfdocuments_lang.php
Bestand weergeven

@ -19,6 +19,7 @@ $aLang = array(
'SHOP_MODULE_GROUP_d3PdfDocumentsmain' => 'Grundeinstellungen',
'SHOP_MODULE_d3PdfDocumentsbDev' => 'Entwicklermodus',
'D3_PDFDOCUMENTS' => 'PDF-Dokumente',
'D3_PDFDOCUMENTS_INVOICE' => 'Rechnung',
'D3_PDFDOCUMENTS_INVOICE_WITHOUT_LOGO' => 'Rechnung ohne Logo',
'D3_PDFDOCUMENTS_DELIVERYNOTE' => 'Lieferschein',

1
Application/views/admin/en/pdfdocuments_lang.php
Bestand weergeven

@ -19,6 +19,7 @@ $aLang = array(
'SHOP_MODULE_GROUP_d3PdfDocumentsmain' => 'Basic settings',
'SHOP_MODULE_d3PdfDocumentsbDev' => 'Developer mode',
'D3_PDFDOCUMENTS' => 'PDF Documents',
'D3_PDFDOCUMENTS_INVOICE' => 'Invoice',
'D3_PDFDOCUMENTS_INVOICE_WITHOUT_LOGO' => 'Invoice without logo',
'D3_PDFDOCUMENTS_DELIVERYNOTE' => 'Deliverynote',

71
Application/views/tpl/admin/orderoverview_pdfform.tpl
Bestand weergeven

@ -1,43 +1,46 @@
[{if $edit && $oView->d3CanExport()}]
<br>
<form name="myedit2" id="myedit2" action="[{$oViewConf->getSelfLink()}]" method="post" target="expPDF">
<form name="d3CreatePdf" id="d3CreatePdf" action="[{$oViewConf->getSelfLink()}]" method="post" target="d3ExpPDF">
[{$oViewConf->getHiddenSid()}]
<input type="hidden" name="cl" value="order_overview">
<input type="hidden" name="fnc" value="d3CreatePDF">
<input type="hidden" name="oxid" value="[{$oxid}]">
<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" style="width: 41px; height: 38px; border: none;" alt="" hspace="0" vspace="0" align="absmiddle">
</td>
<td style="vertical-align: top; text-align: right" class="edittext">
<label for="pdftype">[{oxmultilang ident="D3_PDFDOCUMENTS_PDF_TYPE"}]</label>:&nbsp;
<select id="pdftype" name="pdftype" class="editinput" style="width:80px;">
[{block name="d3_pdfdocuments_order_overview_pdfTypeOptions"}]
[{assign var="generatorList" value=$oView->d3getGeneratorList()}]
[{foreach from=$generatorList->getList() item="generator"}]
<option value="[{$generator->getRequestId()}]">[{oxmultilang ident=$generator->getTitleIdent()}]</option>
<fieldset style="padding: 5px">
<legend>[{oxmultilang ident="D3_PDFDOCUMENTS"}]</legend>
<table style="width: 100%">
<tr>
<td rowspan="3">
<img src="[{$oViewConf->getImageUrl()}]/pdf_icon.gif" alt="[{oxmultilang ident="D3_PDFDOCUMENTS"}]">
</td>
<td style="vertical-align: top; text-align: right" class="edittext">
<label for="pdftype">[{oxmultilang ident="D3_PDFDOCUMENTS_PDF_TYPE"}]</label>:&nbsp;
<select id="pdftype" name="pdftype" class="editinput" style="width:80px;">
[{block name="d3_pdfdocuments_order_overview_pdfTypeOptions"}]
[{assign var="generatorList" value=$oView->d3getGeneratorList()}]
[{foreach from=$generatorList->getList() item="generator"}]
<option value="[{$generator->getRequestId()}]">[{oxmultilang ident=$generator->getTitleIdent()}]</option>
[{/foreach}]
[{/block}]
</select>
</td>
</tr>
<tr>
<td style="text-align: right" class="edittext">
<label for="pdflanguage">[{oxmultilang ident="GENERAL_LANGUAGE"}]</label>
<select id="pdflanguage" name="pdflanguage" class="saveinnewlanginput" style="width:80px;">
[{foreach from=$alangs key=lang item=slang}]
<option value="[{$lang}]" [{if $lang == "0"}]SELECTED[{/if}]>[{$slang}]</option>
[{/foreach}]
[{/block}]
</select>
</td>
</tr>
<tr>
<td style="text-align: right" class="edittext">
<label for="pdflanguage">[{oxmultilang ident="GENERAL_LANGUAGE"}]</label>
<select id="pdflanguage" name="pdflanguage" class="saveinnewlanginput" style="width:80px;">
[{foreach from=$alangs key=lang item=slang}]
<option value="[{$lang}]" [{if $lang == "0"}]SELECTED[{/if}]>[{$slang}]</option>
[{/foreach}]
</select>
</td>
</tr>
<tr>
<td style="text-align: right" class="edittext"><br/>
<input type="submit" class="edittext" name="save" value="[{oxmultilang ident="D3_PDFDOCUMENTS_PDF_GENERATE"}]">
<iframe name="expPDF" style="width: 0; height: 0; border: none; display:none;"></iframe>
</td>
</tr>
</table>
</select>
</td>
</tr>
<tr>
<td style="text-align: right" class="edittext"><br/>
<input type="submit" class="edittext" name="save" value="[{oxmultilang ident="D3_PDFDOCUMENTS_PDF_GENERATE"}]">
<iframe name="d3ExpPDF" style="width: 0; height: 0; border: none; display:none;"></iframe>
</td>
</tr>
</table>
</fieldset>
</form>
[{/if}]

13
out/src/css/pdfStyling.css
Bestand weergeven

@ -98,7 +98,7 @@ table{
}
.article_table th,
.article_table_prices th {
border-bottom: solid 0.15mm #000;
border-bottom: solid 0.75pt #000;
font-weight: normal;
font-size: 11px;
}
@ -174,11 +174,11 @@ table{
text-align: right;
}
.article_costs_table .sumnetto td {
border-top: solid 0.15mm #000;
border-top: 0.75pt solid #000;
}
.article_costs_table .voucherdiscount td,
.article_costs_table .sumbrutto td {
border-bottom: solid 0.15mm #000;
border-bottom: solid 0.75pt #000;
}
.article_costs_table .totalseparator td {
height: 0;
@ -186,9 +186,12 @@ table{
}
.article_costs_table .totalseparator td,
.article_costs_table .totalsum td {
border-bottom: solid 0.3mm #000;
border-bottom: solid 0.75pt #000;
font-weight: bold;
}
.article_costs_table .totalsum td {
border-bottom: double 2pt #000;
}
.conclusion_payment,
.conclusion_thankyou {
@ -204,7 +207,7 @@ table{
padding: 0;
}
.footer table {
border-top: solid 1px #000;
border-top: solid 0.75pt #000;
width: 100%;
position: relative;
}