diff --git a/app/Services/Filters/Applications/ApplicationFilters.php b/app/Services/Filters/Applications/ApplicationFilters.php index b388892..ba1f4cc 100644 --- a/app/Services/Filters/Applications/ApplicationFilters.php +++ b/app/Services/Filters/Applications/ApplicationFilters.php @@ -50,6 +50,24 @@ class ApplicationFilters extends FiltersService { 'type' => FieldType::RELATION, 'represented' => $this->getExperts($filters), 'value' => ($val = $filters->get('expert')) ? fractal(CompanyMember::byUuids($val)->get(), new CompanyMemberTransformer()) : null + ], + [ + 'name' => 'product_name', + 'title' => 'Наименование продукции', + 'type' => FieldType::STRING, + 'value' => $filters->get('product_name') + ], + [ + 'name' => 'product_purpose', + 'title' => 'Назначение продукции', + 'type' => FieldType::STRING, + 'value' => $filters->get('product_purpose') + ], + [ + 'name' => 'product_usage', + 'title' => 'Область применения продукции', + 'type' => FieldType::STRING, + 'value' => $filters->get('product_usage') ] ]; } @@ -93,6 +111,9 @@ 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 === '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']]]); } }