diff --git a/src/Controller/ExpenseReportAdminController.php b/src/Controller/ExpenseReportAdminController.php index 20009b8..8175e75 100644 --- a/src/Controller/ExpenseReportAdminController.php +++ b/src/Controller/ExpenseReportAdminController.php @@ -318,6 +318,7 @@ class ExpenseReportAdminController extends CrudController ->setView('form', 'admin/expense_report/_form.html.twig') ->setView('show_entity', 'admin/expense_report/_show.html.twig') ->setView('edit', 'admin/expense_report/edit.html.twig') + ->setView('show', 'admin/expense_report/show.html.twig') ->setForm('edit', Type::class, []) ->setForm('new', Type::class) diff --git a/templates/admin/expense_report/_show.html.twig b/templates/admin/expense_report/_show.html.twig index f1b81e4..3b4b056 100644 --- a/templates/admin/expense_report/_show.html.twig +++ b/templates/admin/expense_report/_show.html.twig @@ -1,117 +1,123 @@ -{% set total = 0 %} +
Date | +Évènement | +Trajet | +Distance | +Aller-retour | +Péage(s) | +Parkink(s) | +Montant TTC | +
---|
Date | -Évènement | -Trajet | -Distance | -Aller-retour | -Péage(s) | -Parkink(s) | -Montant TTC | -
---|---|---|---|---|---|---|---|
- {{ item.date|date('d/m/Y') }} - | -- {{ item.event }} - | -
- {{ item.addressFrom }} - {{ item.addressTo }} - |
- - {{ item.distance }}Km - | -- {{ item.isRoundTrip ? 'oui' : 'non' }} - | -- {{ item.highwayPay > 0 ? (item.highwayPay|number_format(2, ',') ~ '€') : '-' }} - | -- {{ item.parkingPay > 0 ? (item.parkingPay|number_format(2, ',') ~ '€') : '-' }} - | -- {{ entity.totalAmount('move', item)|number_format(2, ',') }}€ - | -
Date | -Libellé | -Montant TTC | -
---|---|---|
- {{ item.date|date('d/m/Y') }} - | -- {{ item.label }} - | -- {{ entity.totalAmount('various_payment', item)|number_format(2, ',') }}€ - | -
- Facture(s) - | -Total {{ entity.totalAmount|number_format(2, ',') }}€ | -|||||||
- {% for item in entity.bills %}
-
- {{ item|split('/')|last }}
+ {% for item in entity.moves %}
+
+ {{ item.date|date('d/m/Y') }}
+ |
+
+ {{ item.event }}
+ |
+
+ {{ item.addressFrom }} |
+ + {{ item.addressTo }} +
+ {{ item.distance }}Km
+ |
+
+ {{ item.isRoundTrip ? 'oui' : 'non' }}
+ |
+
+ {{ item.highwayPay > 0 ? (item.highwayPay|number_format(2, ',') ~ '€') : '-' }}
+ |
+
+ {{ item.parkingPay > 0 ? (item.parkingPay|number_format(2, ',') ~ '€') : '-' }}
+ |
+
+ {{ entity.totalAmount('move', item)|number_format(2, ',') }}€
+ |
+ |
Date | +Libellé | +Montant TTC | +
---|---|---|
+ {{ item.date|date('d/m/Y') }} + | ++ {{ item.label }} + | ++ {{ entity.totalAmount('various_payment', item)|number_format(2, ',') }}€ + | +
+ Facture(s) + | +Total {{ entity.totalAmount|number_format(2, ',') }}€ | +
+ {% for item in entity.bills %} + + {% else %} + - + {% endfor %} + | +
+ Barème au kilomètre : {{ entity.scalePerKilometer|number_format(2, ',') }}
+ + + + {% if entity.isPaid %} + {% if entity.paidAt %} + Payée le {{ entity.paidAt|date('d/m/Y à H:i') }} + {% else %} + Payée + {% endif %} + {% elseif entity.isRequestedPayment %} + En attente de paiement + {% else %} + Brouillon + {% endif %} + |
+