From bd3922c0b527e7950eaeb419835ee3ea4399f47c Mon Sep 17 00:00:00 2001
From: F4ilji <f4ilj@yandex.ru>
Date: Wed, 23 Apr 2025 14:23:20 +0500
Subject: [PATCH] added filters in additional edu

---
 .../Controllers/ClientAdditionalEducationController.php   | 8 ++++++++
 app/Http/Controllers/ClientProgramController.php          | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/ClientAdditionalEducationController.php b/app/Http/Controllers/ClientAdditionalEducationController.php
index 00a1508..2a6d5bf 100644
--- a/app/Http/Controllers/ClientAdditionalEducationController.php
+++ b/app/Http/Controllers/ClientAdditionalEducationController.php
@@ -52,6 +52,14 @@ class ClientAdditionalEducationController extends Controller
                     ->has('additionalEducations')
                     ->WithActivePrograms()
                     ->where('is_active', true)
+                    ->when($request->input('form'), function ($q, $form) {
+                        $q->whereHas('additionalEducations', function ($q) use ($form) {
+                            $q->where('form_education', FormEducation::fromName($form)->value);
+                        });
+                    })
+                    ->when($request->input('category'), function($q, $slugs) {
+                        $q->whereIn('slug', $slugs);
+                    })
                     ->when($request->direction, function ($q, $direction) use ($request) {
                         return $q->whereHas('direction', fn($query) => $query->where('slug', $direction))
                             ->when($request->form, fn($query, $form) => $query->whereHas('additionalEducations', fn($q) => $q->where('form_education', FormEducation::fromName($form))
diff --git a/app/Http/Controllers/ClientProgramController.php b/app/Http/Controllers/ClientProgramController.php
index 29e8804..eba06ac 100644
--- a/app/Http/Controllers/ClientProgramController.php
+++ b/app/Http/Controllers/ClientProgramController.php
@@ -81,7 +81,7 @@ class ClientProgramController extends Controller
                     ->when($request->input('budget'), fn($q, $budget) =>
                     $this->applyBudgetFilter($q, $budget))
                     ->when($request->input('direction'), fn($q, $slugs) =>
-                    is_array($slugs) ? $q->whereIn('slug', $slugs) : $q)
+                        is_array($slugs) ? $q->whereIn('slug', $slugs) : $q)
                     ->get()
             );
         });