From 0262ac99db84ee9cf184e882848e80f274c97a79 Mon Sep 17 00:00:00 2001
From: developer <developer@zachem.info>
Date: Tue, 28 Apr 2026 13:51:15 +0800
Subject: [PATCH] =?UTF-8?q?=D0=B2=20=D1=84=D0=BE=D1=80=D0=BC=D1=83=20?=
 =?UTF-8?q?=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BA=D0=BB?=
 =?UTF-8?q?=D0=B8=D0=B5=D0=BD=D1=82=D0=BE=D0=B2=20=D0=B4=D0=BE=D0=B1=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=B8=D0=BB=20=D1=80=D0=B0=D0=B7=D0=B4=D0=B5=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B0=D0=B3=D0=B5=D0=BD=D1=82=D0=BE=D0=B2?=
 =?UTF-8?q?=20=D0=BF=D0=BE=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ClientCreateForm/Views/livewire/form.blade.php    | 11 ++++++++++-
 app/Modules/Main/Helpers/helper.php                   |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/Modules/ClientCreateForm/Views/livewire/form.blade.php b/app/Modules/ClientCreateForm/Views/livewire/form.blade.php
index 8dbc8aa..9c1fe95 100644
--- a/app/Modules/ClientCreateForm/Views/livewire/form.blade.php
+++ b/app/Modules/ClientCreateForm/Views/livewire/form.blade.php
@@ -217,11 +217,20 @@ class="bi bi-plus-circle" viewBox="0 0 16 16">
                         <select wire:model.live="agentId" class="form-select rounded-4 @error('agentId') is-invalid @enderror"
                             id="agentId" name="agent" aria-label="Агент">
                             <option selected></option>
-                            @foreach ($availableAgents as $agent)
+                            @php($currentCompanyId = false)
+                            @foreach ($availableAgents as $num=>$agent)
+                                @if($currentCompanyId !== $agent['company_id'])
+                                    @if($num !== 0)
+                                        </optgroup>
+                                    @endif
+                                    <optgroup label="{{ $agent['company']['name'] }}">
+                                    @php( $currentCompanyId = $agent['company_id'])
+                                @endif
                                 <option value="{{ $agent['id'] }}">
                                     {{ $agent['user']['name'] }}
                                 </option>
                             @endforeach
+                            </optgroup>
                         </select>
                         <label for="agentId">Агент</label>
                         @error('agentId')
diff --git a/app/Modules/Main/Helpers/helper.php b/app/Modules/Main/Helpers/helper.php
index bbe2f73..b448a9e 100644
--- a/app/Modules/Main/Helpers/helper.php
+++ b/app/Modules/Main/Helpers/helper.php
@@ -59,6 +59,7 @@ function GetAvailableAgents($resultType = 'Collection')
         }
         $agents->with('company:id,name');
         $agents->with('user:id,name');
+        $agents->orderBy('company_id');
         if ($resultType == 'Collection') {
             return $agents->get();
         } else {