Merge pull request #109 from itk-dev/feature/1207-search-invoice

1207: Added invoice query
itk-dev · Apr 19, 2024 · 0cd9127 · 0cd9127
2 parents a0b727e + 58b1299
commit 0cd9127
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+* [PR-109](https://github.com/itk-dev/economics/pull/109)
+  1207: Added invoice query
 * [PR-106](https://github.com/itk-dev/economics/pull/106)
   1202: Handled worklog deletions
 

diff --git a/assets/styles/app.css b/assets/styles/app.css
@@ -140,10 +140,14 @@
         @apply invisible;
     }
 
-    .form-default, #sprint_report {
+    #sprint_report {
         @apply grid gap-3 mb-6 md:grid-cols-4;
     }
 
+    .form-default {
+        @apply grid gap-3 mb-6 md:grid-cols-5;
+    }
+
     .form-default > div {
         @apply flex flex-col justify-end;
     }

diff --git a/src/Form/InvoiceFilterType.php b/src/Form/InvoiceFilterType.php
@@ -14,6 +14,14 @@ class InvoiceFilterType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
+            ->add('query', SearchType::class, [
+                'label' => 'invoices.query_label',
+                'label_attr' => ['class' => 'label'],
+                'attr' => [
+                    'class' => 'form-element',
+                    'placeholder' => 'invoices.query_placeholder',
+                ],
+            ])
             ->add('recorded', ChoiceType::class, [
                 'required' => true,
                 'label' => 'invoices.recorded',

diff --git a/src/Model/Invoices/InvoiceFilterData.php b/src/Model/Invoices/InvoiceFilterData.php
@@ -4,6 +4,7 @@
 
 class InvoiceFilterData
 {
+    public ?string $query = '';
     public ?bool $recorded = false;
     public ?string $createdBy = '';
     public ?bool $projectBilling = false;

diff --git a/src/Repository/InvoiceRepository.php b/src/Repository/InvoiceRepository.php
@@ -82,8 +82,14 @@ public function getFilteredPagination(InvoiceFilterData $invoiceFilterData, int
 
         $qb->andWhere('invoice.recorded = :recorded')->setParameter('recorded', $invoiceFilterData->recorded);
 
+        $getLikeExpression = static fn (string $value) => str_contains($value, '%') ? $value : '%'.$value.'%';
+
+        if (!empty($invoiceFilterData->query)) {
+            $qb->andWhere('invoice.name LIKE :query')->setParameter('query', $getLikeExpression($invoiceFilterData->query));
+        }
+
         if (!empty($invoiceFilterData->createdBy)) {
-            $qb->andWhere('invoice.createdBy LIKE :createdBy')->setParameter('createdBy', $invoiceFilterData->createdBy);
+            $qb->andWhere('invoice.createdBy LIKE :createdBy')->setParameter('createdBy', $getLikeExpression($invoiceFilterData->createdBy));
         }
 
         if ($invoiceFilterData->projectBilling) {

diff --git a/templates/invoices/index.html.twig b/templates/invoices/index.html.twig
@@ -12,6 +12,7 @@
 
     {{ form_start(form) }}
     <div class="form-default">
+        {{ form_row(form.query) }}
         {{ form_row(form.recorded) }}
         {{ form_row(form.createdBy) }}
         {{ form_row(form.projectBilling) }}

diff --git a/translations/messages.da.yaml b/translations/messages.da.yaml
@@ -280,6 +280,8 @@ invoices:
     client_project_lead: "Project Lead"
     required_fields_not_set_for_creating_entries: "\"Til konto\" og \"Materialenummer\" skal være valgt før der kan oprettes fakturalinjer."
     type: "Kundekonto type"
+    query_label: Søg
+    query_placeholder: Søg på fakturanavn
 
 material_number_enum:
     internal: "Interne: 103361"