diff --git a/templates/PaymentOrder/confirm/confirm.html.twig b/templates/PaymentOrder/confirm/confirm.html.twig index 7b56d0b..164b8c5 100644 --- a/templates/PaymentOrder/confirm/confirm.html.twig +++ b/templates/PaymentOrder/confirm/confirm.html.twig @@ -1,6 +1,10 @@ {% extends "main_card.html.twig" %} {% set confirmation_nr = 1 %} +{% import "macros/field_changes.macro.twig" as fc %} +{# @var \App\Entity\FieldChanges changes #} +{% set changes = entity.fieldChanges %} + {% block title %}Zahlungsauftrag {{ entity.iDString }}{% endblock %} {% block card_type %} @@ -42,18 +46,18 @@ {% trans %}payment_order.name.label{% endtrans %} - {{ entity.submitterName }} ({{ entity.submitterEmail }}) + {{ fc.icon(changes, "submitter_name") }}{{ entity.submitterName }} ({{ fc.icon(changes, "submitter_email") }}{{ entity.submitterEmail }}) {% trans %}payment_order.department.label{% endtrans %} - {{ entity.department.name }} + {{ fc.icon(changes, "department") }}{{ entity.department.name }} {% trans %}payment_order.project_name.label{% endtrans %} - {{ entity.projectName }} + {{ fc.icon(changes, "project_name") }}{{ entity.projectName }} {# For legacy payment orders #} @@ -68,31 +72,31 @@ Mittelfreigabe / Finanzantrag - {{ entity.fundingId }} + {{ fc.icon(changes, "funding_id") }}{{ entity.fundingId }} {% if entity.resolutionDate %} - ({{ entity.resolutionDate | format_date }}) + ({{ fc.icon(changes, "resolution_date") }}{{ entity.resolutionDate | format_date }}) {% endif %} Gesamtbetrag - {{ (entity.amount/100) | format_currency("EUR") }} + {{ fc.icon(changes, "amount") }}{{ (entity.amount/100) | format_currency("EUR") }} Unterstützende Mittelfreigabe - {{ entity.supportingFundingId ?? '' }} + {{ fc.icon(changes, "suppporting_funding_id") }}{{ entity.supportingFundingId ?? '' }} {% if entity.supportingFundingDate %} - ({{ entity.supportingFundingDate | format_date }}) + ({{ fc.icon(changes, "supporting_fundinng_date") }}{{ entity.supportingFundingDate | format_date }}) {% endif %} Unterstützer Betrag - {% if entity.supportingAmount %}{{ (entity.supportingAmount/100) | format_currency("EUR") }}{% endif %} + {{ fc.icon(changes, "suppporting_amount") }}{% if entity.supportingAmount %}{{ (entity.supportingAmount/100) | format_currency("EUR") }}{% endif %} @@ -100,19 +104,19 @@ {% trans %}bank_info.account_owner.label{% endtrans %} - {{ entity.bankInfo.accountOwner }} + {{ fc.icon(changes, "account_owner") }}{{ entity.bankInfo.accountOwner }} {% trans %}bank_info.address.label{% endtrans %} - {{ entity.bankInfo.address }} + {{ fc.icon(changes, "bank_info.street") }}{{ fc.icon(changes, "bank_info.zip_code") }}{{ fc.icon(changes, "bank_info.city") }}{{ entity.bankInfo.address }} {% trans %}payment_order.invoice_number.label{% endtrans %} - {{ entity.invoiceNumber ?? '' }} + {{ fc.icon(changes, "invoice_number") }}{{ entity.invoiceNumber ?? '' }} {% trans %}payment_order.customer_number.label{% endtrans %} - {{ entity.customerNumber ?? '' }} + {{ fc.icon(changes, "customer_number") }}{{ entity.customerNumber ?? '' }} @@ -122,16 +126,16 @@ {% trans %}bank_info.iban.label{% endtrans %} - {{ entity.bankInfo.ibanFormatted }} + {{ fc.icon(changes, "bank_info.iban") }}{{ entity.bankInfo.ibanFormatted }} {% if entity.bankInfo.bic is not empty %} - (BIC: {{ entity.bankInfo.bic }}) + (BIC: {{ fc.icon(changes, "bank_info.bic") }}{{ entity.bankInfo.bic }}) {% endif %} {% trans %}bank_info.reference.label{% endtrans %} - {{ entity.bankInfo.reference }} + {{ fc.icon(changes, "bank_info.reference") }}{{ entity.bankInfo.reference }} @@ -147,6 +151,13 @@ + {% if changes.mostRecentChangedField is not null %} +

+ Werte mit einem am Anfang weisen darauf hin, dass dieses Feld von den StuRa-Finanzer*innen bearbeitet wurde.
+ Die letzte Änderung erfolgte {{ changes.mostRecentChangeDate | format_datetime("short") }} durch {{ changes.mostRecentChangeUser }}. +

+ {% endif %} +

{% trans %}payment_order.confirm.title_2{% endtrans %}

diff --git a/templates/macros/field_changes.macro.twig b/templates/macros/field_changes.macro.twig index 07fe75c..e367f9b 100644 --- a/templates/macros/field_changes.macro.twig +++ b/templates/macros/field_changes.macro.twig @@ -3,4 +3,11 @@ {% if field_changes.wasChanged(field) %} {{ symbol }} {% endif %} +{% endmacro %} + +{% macro icon(field_changes, field, icon = "fa-solid fa-user-pen text-primary") %} + {# @var \App\Entity\FieldChanges field_changes #} + {% if field_changes.wasChanged(field) %} + + {% endif %} {% endmacro %} \ No newline at end of file