jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Updated HTML invoice templates (#560)

Browse Source
This commit is contained in:
Kevin Papst
2019-02-12 15:35:33 +01:00
committed by GitHub
parent 742e6eb3a3
commit fd60d5bb17
10 changed files with 75 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
templates/invoice/renderer/default.html.twig
View File

@@ -75,7 +75,13 @@
{% endif %}
<tr>
<td>{{ entry.begin|date_short }}</td>
<td>{{ entry.activity.name }} / {{ entry.project.name }}</td>
<td>
{% if entry.description is not empty %}
{{ entry.description }}
{% else %}
{{ entry.activity.name }} / {{ entry.project.name }}
{% endif %}
</td>
<td contenteditable="true">{{ rate|money(model.calculator.currency) }}</td>
<td>{{ duration }}</td>
<td>{{ entry.rate|money(model.calculator.currency) }}</td>

10
templates/invoice/renderer/freelancer.html.twig
View File

@@ -4,7 +4,7 @@
{% block invoice %}
{# You can overwrite these settings in your config/packages.local.yaml under the key "twig.globals.company" #}
{# You can overwrite these settings in your config/packages/local.yaml under the key "twig.globals.company" #}
{% set company = company|default({
name: 'Kimai Inc.',
homepage: 'www.kimai.org',
@@ -88,7 +88,13 @@
{% endif %}
<tr>
<td contenteditable="true">{{ entry.description }}</td>
<td contenteditable="true">
{% if entry.description is not empty %}
{{ entry.description }}
{% else %}
{{ entry.activity.name }} / {{ entry.project.name }}
{% endif %}
</td>
<td contenteditable="true">{{ rate|money(model.calculator.currency) }}</td>
<td contenteditable="true">{{ duration }}</td>
<td>{{ entry.rate|money(model.calculator.currency) }}</td>

16
templates/invoice/renderer/timesheet.html.twig
View File

@@ -10,9 +10,9 @@
</div>
</div>
<div class="row invoice-info" style="padding: 10px 0 20px 0">
<div class="col-sm-12 invoice-col">
<table>
<div class="row">
<div class="col-xs-12">
<table class="table no-border table-condensed">
<tr>
<th>{{ 'invoice.from'|trans }}</th>
<td contenteditable="true">
@@ -24,7 +24,7 @@
</td>
</tr>
<tr>
<th style="width:50%">{{ 'label.date'|trans }}</th>
<th>{{ 'label.date'|trans }}</th>
<td contenteditable="true">
{% if model.query.begin|date('m') != model.query.end|date('m') or model.query.begin|date('Y') != model.query.end|date('Y') %}
{{ model.query.begin|date_short }} - {{ model.query.end|date_short }}
@@ -72,7 +72,13 @@
{% if model.query.user is empty %}
<td>{{ widgets.username(entry.user) }}</td>
{% endif %}
<td>{{ entry.activity.name }} / {{ entry.project.name }}</td>
<td>
{% if entry.description is not empty %}
{{ entry.description }}
{% else %}
{{ entry.activity.name }} / {{ entry.project.name }}
{% endif %}
</td>
<td>{{ entry.duration|duration }}</td>
</tr>
{% endfor %}