From 0d5e0b3e80d00998eb1fd9f221147bdf4d9993b6 Mon Sep 17 00:00:00 2001
From: Kevin Papst <kevinpapst@users.noreply.github.com>
Date: Fri, 25 Jun 2021 09:48:38 +0200
Subject: [PATCH] fix url under certain environments (#2621)

---
 src/Controller/InvoiceController.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Controller/InvoiceController.php b/src/Controller/InvoiceController.php
index dc9d7b92..1bba82c5 100644
--- a/src/Controller/InvoiceController.php
+++ b/src/Controller/InvoiceController.php
@@ -233,7 +233,7 @@ final class InvoiceController extends AbstractController
     public function changeStatusAction(Invoice $invoice, string $status, Request $request): Response
     {
         if ($status === Invoice::STATUS_PAID) {
-            $form = $this->createPaymentDateForm($invoice, $request);
+            $form = $this->createPaymentDateForm($invoice, $status);
             $form->handleRequest($request);
 
             if (!$form->isSubmitted() || !$form->isValid()) {
@@ -525,14 +525,16 @@ final class InvoiceController extends AbstractController
         ]);
     }
 
-    private function createPaymentDateForm(Invoice $invoice, Request $request): FormInterface
+    private function createPaymentDateForm(Invoice $invoice, string $status): FormInterface
     {
         if (null === $invoice->getPaymentDate()) {
             $invoice->setPaymentDate($this->getDateTimeFactory()->createDateTime());
         }
 
+        $url = $this->generateUrl('admin_invoice_status', ['id' => $invoice->getId(), 'status' => $status]);
+
         return $this->createForm(InvoicePaymentDateForm::class, $invoice, [
-            'action' => $request->getUri(),
+            'action' => $url,
             'method' => 'POST',
             'timezone' => $this->getDateTimeFactory()->getTimezone()->getName(),
         ]);