From 6f459811d98463881056f23ed5cb6cdbd37af690 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20B=C3=B6hmer?= <mail@jan-boehmer.de>
Date: Sun, 27 Oct 2024 19:40:18 +0100
Subject: [PATCH] Allow to submit supporting funding date via the form
 submission

---
 src/Form/PaymentOrderType.php                 | 29 ++++++++++++-------
 templates/PaymentOrder/form.html.twig         |  6 ++++
 .../pdf/payment_order/payment_order.html.twig |  2 +-
 translations/messages.de.xlf                  |  6 ++++
 4 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/src/Form/PaymentOrderType.php b/src/Form/PaymentOrderType.php
index ceb5918..844d04f 100644
--- a/src/Form/PaymentOrderType.php
+++ b/src/Form/PaymentOrderType.php
@@ -58,13 +58,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             'label' => 'payment_order.department.label',
         ]);
 
-        $builder->add('funding_id', TextType::class, [
-            'label' => 'payment_order.funding_id.label',
-            'attr' => [
-                'placeholder' => 'payment_order.funding_id.placeholder',
-            ],
-        ]);
-
         $builder->add('amount', MoneyType::class, [
             'label' => 'payment_order.amount.label',
             'divisor' => 100,
@@ -74,6 +67,22 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             ],
         ]);
 
+        $builder->add('funding_id', TextType::class, [
+            'label' => 'payment_order.funding_id.label',
+            'attr' => [
+                'placeholder' => 'payment_order.funding_id.placeholder',
+            ],
+        ]);
+
+        $builder->add('resolution_date', DateType::class, [
+            'label' => 'payment_order.resolution_date.label',
+            'required' => false,
+            'html5' => true,
+            'widget' => 'single_text',
+        ]);
+
+
+
         $builder->add('supporting_amount', MoneyType::class, [
             'label' => 'payment_order.supporting_amount.label',
             'divisor' => 100,
@@ -92,14 +101,14 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             ],
         ]);
 
-
-        $builder->add('resolution_date', DateType::class, [
-            'label' => 'payment_order.resolution_date.label',
+        $builder->add('supporting_funding_date', DateType::class, [
+            'label' => 'payment_order.supporting_resolution_date.label',
             'required' => false,
             'html5' => true,
             'widget' => 'single_text',
         ]);
 
+
         $builder->add('project_name', TextType::class, [
             'label' => 'payment_order.project_name.label',
             'attr' => [
diff --git a/templates/PaymentOrder/form.html.twig b/templates/PaymentOrder/form.html.twig
index a4b1c97..6614dd1 100644
--- a/templates/PaymentOrder/form.html.twig
+++ b/templates/PaymentOrder/form.html.twig
@@ -50,8 +50,14 @@
                 {{ form_row(form.funding_id) }}
                 {{ form_row(form.resolution_date) }}
 
+                <hr>
+                <h6>Unterstützende Mittelfreigabe</h6>
+                <p>Wenn ein Teil des Zahlungsauftrags aus einer weiteren Mittelfreigabe (z.B. durch einen FSR-Kom Beschluss) finanziert werden soll, gib die
+                Daten dazu hier unten an.</p>
+
                 {{ form_row(form.supporting_amount) }}
                 {{ form_row(form.supporting_funding_id) }}
+                {{ form_row(form.supporting_funding_date) }}
 
             </fieldset>
 
diff --git a/templates/pdf/payment_order/payment_order.html.twig b/templates/pdf/payment_order/payment_order.html.twig
index 49bf20a..c38266d 100644
--- a/templates/pdf/payment_order/payment_order.html.twig
+++ b/templates/pdf/payment_order/payment_order.html.twig
@@ -66,7 +66,7 @@
         <tr>
             <td>Unterstützende Mittelfreigabe:</td>
             <td>{{ fc.field(changes, "supporting_funding_id") }}{{ _self.valOrNull(paymentOrder.supportingFundingId) }}
-                {% if paymentOrder.supportingFundingDate %}({{ fc.field(changes,"supporting_funding_date") }}{{ paymentOrder.supportingFundingDate }}){% endif %}
+                {% if paymentOrder.supportingFundingDate %}({{ fc.field(changes,"supporting_funding_date") }}{{ paymentOrder.supportingFundingDate | format_date }}){% endif %}
             </td>
         </tr>
         <tr>
diff --git a/translations/messages.de.xlf b/translations/messages.de.xlf
index b6da1b0..117bffc 100644
--- a/translations/messages.de.xlf
+++ b/translations/messages.de.xlf
@@ -2603,5 +2603,11 @@ Wenn du diese überschreiben möchtest, lösche die bestehende Vorlage und speic
         <target>Bearbeitete Informationen</target>
       </segment>
     </unit>
+    <unit id="28eXnC2" name="payment_order.supporting_resolution_date.label">
+      <segment>
+        <source>payment_order.supporting_resolution_date.label</source>
+        <target>Beschlussdatum unterstützende Mittelfreigabe</target>
+      </segment>
+    </unit>
   </file>
 </xliff>