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

added new invoice status: canceled (#2922)

Browse Source
This commit is contained in:
Kevin Papst
2021-11-10 12:37:36 +01:00
committed by GitHub
parent 21dbfdb4f9
commit 6e6c60b29a
10 changed files with 49 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/invoice/listing.html.twig
View File

@@ -36,7 +36,7 @@
{% else %}
{{ tables.datatable_header(tableName, columns, query, {}) }}
{% for entry in entries %}
<tr class="alternative-link open-edit" data-href="{{ path('admin_invoice_download', {'id': entry.id}) }}">
<tr class="alternative-link open-edit{% if entry.canceled %} warning text-muted{% endif %}" data-href="{{ path('admin_invoice_download', {'id': entry.id}) }}">
<td class="{{ tables.data_table_column_class(tableName, columns, 'date') }}">{{ entry.createdAt|date_short }}</td>
<td class="{{ tables.data_table_column_class(tableName, columns, 'user') }}">{{ widgets.user_avatar(entry.user) }} {{ widgets.username(entry.user) }}</td>
<td class="{{ tables.data_table_column_class(tableName, columns, 'customer') }}">{{ widgets.label_customer(entry.customer) }}</td>

6
templates/invoice/macros.html.twig
View File

@@ -12,12 +12,16 @@
{{ widgets.label('status.pending'|trans, 'warning') }}
{% elseif invoice.paid %}
{{ widgets.label('status.paid'|trans, 'success') }}
{% elseif invoice.canceled %}
{{ widgets.label('status.canceled'|trans, 'gray') }}
{% endif %}
{% endmacro %}
{% macro invoice_due_date(invoice) %}
{% import "macros/widgets.html.twig" as widgets %}
{% if invoice.overdue and not invoice.paid %}
{% if invoice.canceled %}
{{ widgets.label('status.canceled'|trans, 'gray') }}
{% elseif invoice.overdue and not invoice.paid %}
{{ widgets.label(invoice.dueDate|date_short, 'danger') }}
{% else %}
{{ widgets.label(invoice.dueDate|date_short, 'primary') }}