jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix url under certain environments (#2621)

Browse Source
This commit is contained in:
Kevin Papst
2021-06-25 09:48:38 +02:00
committed by GitHub
parent 7460647d58
commit 0d5e0b3e80
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Controller/InvoiceController.php
View File

@@ -233,7 +233,7 @@ final class InvoiceController extends AbstractController
public function changeStatusAction(Invoice $invoice, string $status, Request $request): Response public function changeStatusAction(Invoice $invoice, string $status, Request $request): Response
{ {
if ($status === Invoice::STATUS_PAID) { if ($status === Invoice::STATUS_PAID) {
$form = $this->createPaymentDateForm($invoice, $request); $form = $this->createPaymentDateForm($invoice, $status);
$form->handleRequest($request); $form->handleRequest($request);
if (!$form->isSubmitted() || !$form->isValid()) { 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()) { if (null === $invoice->getPaymentDate()) {
$invoice->setPaymentDate($this->getDateTimeFactory()->createDateTime()); $invoice->setPaymentDate($this->getDateTimeFactory()->createDateTime());
} }
$url = $this->generateUrl('admin_invoice_status', ['id' => $invoice->getId(), 'status' => $status]);
return $this->createForm(InvoicePaymentDateForm::class, $invoice, [ return $this->createForm(InvoicePaymentDateForm::class, $invoice, [
'action' => $request->getUri(), 'action' => $url,
'method' => 'POST', 'method' => 'POST',
'timezone' => $this->getDateTimeFactory()->getTimezone()->getName(), 'timezone' => $this->getDateTimeFactory()->getTimezone()->getName(),
]); ]);