diff --git a/app/Modules/CityManager/Http/Livewire/CityManagerInfo.php b/app/Modules/CityManager/Http/Livewire/CityManagerInfo.php
new file mode 100644
index 0000000..37c4bc0
--- /dev/null
+++ b/app/Modules/CityManager/Http/Livewire/CityManagerInfo.php
@@ -0,0 +1,28 @@
+city->id)->first())
+ {
+ $this->manager = $cityManager->user;
+ }
+ }
+ }
+
+ public function render()
+ {
+ return view('citymanager::livewire.info.index');
+ }
+}
\ No newline at end of file
diff --git a/app/Modules/CityManager/Models/CityManager.php b/app/Modules/CityManager/Models/CityManager.php
index 3d4dd24..cbae419 100644
--- a/app/Modules/CityManager/Models/CityManager.php
+++ b/app/Modules/CityManager/Models/CityManager.php
@@ -4,7 +4,7 @@
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
-use App\Models\User;
+use Modules\User\Models\User;
use Modules\Main\Models\City;
class CityManager extends Model
{
diff --git a/app/Modules/CityManager/Providers/ModuleServiceProvider.php b/app/Modules/CityManager/Providers/ModuleServiceProvider.php
index 966ec74..5d02fe1 100644
--- a/app/Modules/CityManager/Providers/ModuleServiceProvider.php
+++ b/app/Modules/CityManager/Providers/ModuleServiceProvider.php
@@ -8,7 +8,7 @@
class ModuleServiceProvider extends ServiceProvider
{
- protected String $moduleName = 'CityManager';
+ protected string $moduleName = 'CityManager';
public function register()
{
@@ -27,38 +27,41 @@ public function boot()
protected function registerViews()
{
- $moduleViewsPath = __DIR__.'/../Views';
+ $moduleViewsPath = __DIR__ . '/../Views';
$this->loadViewsFrom(
- $moduleViewsPath, strtolower($this->moduleName)
+ $moduleViewsPath,
+ strtolower($this->moduleName)
);
}
protected function registerLivewireViews()
{
- $moduleViewsPath = __DIR__.'/../Views/livewire';
+ $moduleViewsPath = __DIR__ . '/../Views/livewire';
$this->loadViewsFrom(
- $moduleViewsPath, strtolower($this->moduleName)
+ $moduleViewsPath,
+ strtolower($this->moduleName)
);
}
protected function registerMigrations()
{
$this->loadMigrationsFrom(
- app_path('Modules/'.$this->moduleName.'/Database/Migrations')
+ app_path('Modules/' . $this->moduleName . '/Database/Migrations')
);
}
protected function registerConfig()
{
- $path = app_path('Modules/'.$this->moduleName.'/Config/config.php');
+ $path = app_path('Modules/' . $this->moduleName . '/Config/config.php');
$this->mergeConfigFrom(
- $path, strtolower($this->moduleName)
+ $path,
+ strtolower($this->moduleName)
);
}
protected function registerLivewire()
{
- //Livewire::component('
', \Modules\\Http\Livewire\::class);
+ Livewire::component('citymanagerinfo', \Modules\CityManager\Http\Livewire\CityManagerInfo::class);
}
protected function registerComponent()
diff --git a/app/Modules/CityManager/Views/livewire/info/index.blade.php b/app/Modules/CityManager/Views/livewire/info/index.blade.php
new file mode 100644
index 0000000..cfd3813
--- /dev/null
+++ b/app/Modules/CityManager/Views/livewire/info/index.blade.php
@@ -0,0 +1,12 @@
+
+ @if ($manager)
+
Ваш менеджер:
+
+ {{ $manager->name }}
+
+
+ {{ $manager->phone }}
+ {{ $manager->email }}
+
+ @endif
+
diff --git a/app/Modules/ClientCreateForm/Helpers/helper.php b/app/Modules/ClientCreateForm/Helpers/helper.php
index dfb6dc8..a8dffe9 100644
--- a/app/Modules/ClientCreateForm/Helpers/helper.php
+++ b/app/Modules/ClientCreateForm/Helpers/helper.php
@@ -20,6 +20,22 @@ function AdminCompanyOfUser()
}
}
+if (!function_exists(function: 'AgentCompanyOfUser'))
+{
+ function AgentCompanyOfUser()
+ {
+ $city = false;
+ if ($adminAccount = Agent::where('user_id', auth()->user()->id)->first())
+ {
+ return $adminAccount->company;
+ }
+ else
+ {
+ return false;
+ }
+ }
+}
+
if (!function_exists('GetAvailableAgents'))
{
function GetAvailableAgents()
diff --git a/app/Modules/Main/Models/Company/Company.php b/app/Modules/Main/Models/Company/Company.php
index 9ee0030..8c12970 100644
--- a/app/Modules/Main/Models/Company/Company.php
+++ b/app/Modules/Main/Models/Company/Company.php
@@ -5,6 +5,7 @@
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Modules\Payment\Traits\Paymentable;
+use Modules\Main\Models\City;
class Company extends Model
{
use HasFactory;
@@ -30,4 +31,9 @@ class Company extends Model
'details' => 'array',
'type' => CompanyType::class
];
+
+ public function city()
+ {
+ return $this->belongsTo(City::class);
+ }
}
diff --git a/app/Modules/User/Http/Livewire/UserSelectorLivewire.php b/app/Modules/User/Http/Livewire/UserSelectorLivewire.php
index 974dedf..5f68b04 100644
--- a/app/Modules/User/Http/Livewire/UserSelectorLivewire.php
+++ b/app/Modules/User/Http/Livewire/UserSelectorLivewire.php
@@ -8,13 +8,43 @@
use Modules\Contracts\Models\ContractStatus;
use Modules\User\Models\UserRole;
use Modules\User\Models\Role;
+use Modules\User\Models\User;
use Modules\Main\Models\Company\CompanyAdmin;
class UserSelectorLivewire extends Component
{
- public $search;
+ public $id;
+ public $name;
+ public $query;
+ public $users;
+ public function mount()
+ {
+ $this->query = '';
+ $this->users = [];
+ }
+ public function clearSearch()
+ {
+ $this->query = '';
+ }
+ public function setUser($id)
+ {
+ $user = User::find($id);
+ $this->id = $id;
+ $this->name = $user->name;
+ }
+ public function unsetUser()
+ {
+ unset($this->id);
+ unset($this->name);
+ $this->query = '';
+ }
public function render()
{
+ if ($this->query)
+ {
+ $users = User::where('name', 'like', '%' . $this->query . '%')->take(10)->get();
+ $this->users = $users->toArray();
+ }
return view('user::livewire.search.selector');
}
}
\ No newline at end of file
diff --git a/app/Modules/User/Views/livewire/search/selector.blade.php b/app/Modules/User/Views/livewire/search/selector.blade.php
index 1a8d5fd..64f67aa 100644
--- a/app/Modules/User/Views/livewire/search/selector.blade.php
+++ b/app/Modules/User/Views/livewire/search/selector.blade.php
@@ -1,22 +1,67 @@
-
-
-
-
-
-
Пользователь не найден
+ @if ($id && $name)
+
-
+ @else
+
+
+
+
+
+ @if ($query)
+
+
+
+ @endif
+
+ @if ($query && count($users) == 0)
+
+
+
+
+
Пользователь не найден
+
+
+
+ @endif
+ @if ($query && count($users) > 0)
+
+ @endif
+ @endif
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 4f008c2..e9c4c83 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -33,54 +33,48 @@
{{ $title }}
@endisset
-
-
-
+
+
+ @livewire('notices.user-notices-button')
+
+
+
+
+
+
+
+
+
+