diff --git a/app/Modules/CityManager/Http/Livewire/CityManagerInfo.php b/app/Modules/CityManager/Http/Livewire/CityManagerInfo.php index 5fdc052..c87170c 100644 --- a/app/Modules/CityManager/Http/Livewire/CityManagerInfo.php +++ b/app/Modules/CityManager/Http/Livewire/CityManagerInfo.php @@ -8,23 +8,18 @@ class CityManagerInfo extends Component { public $managers = []; - public $manager = false; public function mount() { $availableCities = GetAvailableCities(); CityManager::whereIn('city_id', $availableCities->pluck('id'))->get()->each(function ($cityManager) { - $this->managers[] = $cityManager->user; - }); - - //depricated, but leave for now, maybe will be used in future for list of managers in city - $city = false; - if (($company = AdminCompanyOfUser()) || ($company = AgentCompanyOfUser())) - { - if ($cityManager = CityManager::where('city_id', $company->city->id)->first()) - { - $this->manager = $cityManager->user; + if (!array_key_exists($cityManager->user->id, $this->managers)) { + $this->managers[$cityManager->user->id] = [ + 'user' => $cityManager->user, + 'cities' => [] + ]; } - } + $this->managers[$cityManager->user->id]['cities'][] = $cityManager->city->name; + }); } public function render() diff --git a/app/Modules/CityManager/Views/livewire/info/index.blade.php b/app/Modules/CityManager/Views/livewire/info/index.blade.php index 59d8285..8951f88 100644 --- a/app/Modules/CityManager/Views/livewire/info/index.blade.php +++ b/app/Modules/CityManager/Views/livewire/info/index.blade.php @@ -1,38 +1,46 @@