From a8efcc6ad246b1a9c74e7c5fc9489ccd6ca7ebf1 Mon Sep 17 00:00:00 2001
From: panabonic <panabonic@gmail.com>
Date: Mon, 11 Sep 2023 11:27:23 +0300
Subject: [PATCH] minor application filters update

---
 .../Filters/Applications/ApplicationFilters.php    | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/app/Services/Filters/Applications/ApplicationFilters.php b/app/Services/Filters/Applications/ApplicationFilters.php
index ba1f4cc..40cc573 100644
--- a/app/Services/Filters/Applications/ApplicationFilters.php
+++ b/app/Services/Filters/Applications/ApplicationFilters.php
@@ -51,6 +51,18 @@ class ApplicationFilters extends FiltersService {
                 'represented' => $this->getExperts($filters),
                 'value' => ($val = $filters->get('expert')) ? fractal(CompanyMember::byUuids($val)->get(), new CompanyMemberTransformer()) : null
             ],
+            [
+                'name' => 'applicant',
+                'title' => 'Организация-заявитель',
+                'type' => FieldType::STRING,
+                'value' => $filters->get('applicant')
+            ],
+            [
+                'name' => 'product_producer',
+                'title' => 'Изготовитель / разработчик',
+                'type' => FieldType::STRING,
+                'value' => $filters->get('product_producer')
+            ],
             [
                 'name' => 'product_name',
                 'title' => 'Наименование продукции',
@@ -111,6 +123,8 @@ class ApplicationFilters extends FiltersService {
             elseif ($prop === 'created_at') $this->applyDateFilter($query, 'created_at', $value);
             elseif ($prop === 'status') $query->whereIn('status', is_array($value) ? $value : [$value]);
             elseif ($prop === 'expert') $this->applyRelationFilter($query, 'expert', $value);
+            elseif ($prop === 'applicant') $this->applySearchFilter($query, $value, ['applicant']);
+            elseif ($prop === 'product_producer') $this->applySearchFilter($query, $value, [['product' => ['producer']]]);
             elseif ($prop === 'product_name') $this->applySearchFilter($query, $value, [['product' => ['name']]]);
             elseif ($prop === 'product_purpose') $this->applySearchFilter($query, $value, [['product' => ['purpose']]]);
             elseif ($prop === 'product_usage') $this->applySearchFilter($query, $value, [['product' => ['usage']]]);