From 5ac688259ead479f1d386ddfad1545868f9a1dd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= <fromme@dreipunktnull.com>
Date: Wed, 17 Apr 2024 17:32:02 +0200
Subject: [PATCH] fix: properly check disposition status regarding invoice
 upload

---
 config/packages/workflow.yaml                 |  4 +++-
 templates/teamer/disposition/detail.html.twig | 15 ++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/config/packages/workflow.yaml b/config/packages/workflow.yaml
index e3ce393..d706e0c 100644
--- a/config/packages/workflow.yaml
+++ b/config/packages/workflow.yaml
@@ -28,7 +28,9 @@ framework:
                         - checking_contract
                     to: new
                 upload_invoice:
-                    from: confirmed
+                    from:
+                        - confirmed
+                        - completed
                     to: checking_invoice
                 confirm_invoice:
                     from: checking_invoice
diff --git a/templates/teamer/disposition/detail.html.twig b/templates/teamer/disposition/detail.html.twig
index 0b1af59..9dded1c 100644
--- a/templates/teamer/disposition/detail.html.twig
+++ b/templates/teamer/disposition/detail.html.twig
@@ -5,7 +5,11 @@
 {% block content %}
     {% set assignment = disposition.assignment %}
     <h1 class="text-2xl font-bold pb-8">
-        Dein Einsatz wurde bestätigt!
+        {% if workflow_has_marked_place(disposition, 'completed') %}
+            Dein Einsatz ist abgeschlossen
+        {% else %}
+            Dein Einsatz wurde bestätigt!
+        {% endif %}
     </h1>
     <div class="grid lg:grid-cols-2 gap-8 items-start">
         <div>
@@ -72,7 +76,7 @@
             {% endif %}
 
             {# Upload invoice #}
-            {% if workflow_has_marked_place(disposition, 'confirmed') %}
+            {% if workflow_has_marked_place(disposition, 'completed') %}
                 <h2 class="text-lg font-bold pb-4">
                     Honorarnote
                 </h2>
@@ -140,13 +144,6 @@
                 </h3>
             {% endif %}
 
-            {# No invoice required #}
-            {% if workflow_has_marked_place(disposition, 'completed') %}
-                <h3 class="text-xl font-bold pb-4">
-                    Dein Einsatz ist abgeschlossen
-                </h3>
-            {% endif %}
-
             <div class="pt-4">
                 <a href="{{ returnUrl }}" class="underline">
                     zurück