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

allow to filter for canceled invoices (#3415)

Browse Source
This commit is contained in:
Kevin Papst
2022-07-13 12:21:57 +02:00
committed by GitHub
parent 0616506b31
commit dc40a05ebd
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Form/Type/InvoiceStatusType.php
View File

@@ -14,9 +14,6 @@ use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\OptionsResolver\OptionsResolver;
/**
* Custom form field type to select an invoice template.
*/
class InvoiceStatusType extends AbstractType class InvoiceStatusType extends AbstractType
{ {
/** /**
@@ -31,6 +28,7 @@ class InvoiceStatusType extends AbstractType
'status.' . Invoice::STATUS_NEW => Invoice::STATUS_NEW, 'status.' . Invoice::STATUS_NEW => Invoice::STATUS_NEW,
'status.' . Invoice::STATUS_PENDING => Invoice::STATUS_PENDING, 'status.' . Invoice::STATUS_PENDING => Invoice::STATUS_PENDING,
'status.' . Invoice::STATUS_PAID => Invoice::STATUS_PAID, 'status.' . Invoice::STATUS_PAID => Invoice::STATUS_PAID,
'status.' . Invoice::STATUS_CANCELED => Invoice::STATUS_CANCELED,
], ],
]); ]);
} }

2
src/Repository/Query/InvoiceArchiveQuery.php
View File

@@ -94,7 +94,7 @@ class InvoiceArchiveQuery extends BaseQuery
public function addStatus(string $status): void public function addStatus(string $status): void
{ {
if (!\in_array($status, [Invoice::STATUS_NEW, Invoice::STATUS_PENDING, Invoice::STATUS_PAID])) { if (!\in_array($status, [Invoice::STATUS_NEW, Invoice::STATUS_PENDING, Invoice::STATUS_PAID, Invoice::STATUS_CANCELED])) {
throw new \InvalidArgumentException('Unknown invoice status given.'); throw new \InvalidArgumentException('Unknown invoice status given.');
} }