fix! обновлена политика для компании

app/Modules/Admin/Http/Controllers/AdminUsersController.php

@@ -51,9 +51,15 @@ public function edit(User $user)
     }
     public function store(Request $request)
     {
-        $data = $request->only('name', 'phone', 'email');
+        $data = $request->only('name', 'phone', 'email', 'role_id');
         $user = User::create($data);
         $password = $user->setForcedPassword(false);
+        if ($request->role) {
+            UserRole::updateOrCreate([
+                'user_id' => $user->id,
+                'role_id' => $request->role_id
+            ]);
+        }
         return to_route('admin.users')->withSuccess('Учетная запись для ' . $request->name . ' создана. Пароль пользователя: ' . $password);
     }
 

app/Modules/Admin/Views/users/index.blade.php

@@ -91,6 +91,9 @@
                 </div>
                 <div class="modal-body">
                     @csrf
+                    @if(isset($role))
+                    <input type="hidden" name="role_id" value="{{ $role }}">
+                    @endisset
                     <div class="my-3">
                         <label for="nameInput" class="form-label">ФИО (полностью)</label>
                         <input class="form-control" type="text" id="nameInput" name="name" required>

app/Modules/Main/Http/Policies/CompanyPolicy.php

@@ -7,6 +7,7 @@
 use Modules\User\Models\Role;
 use Modules\Main\Models\Company\Company;
 use Modules\Main\Models\Company\CompanyAdmin;
+use Modules\CityManager\Models\CityManager;
 
 class CompanyPolicy
 {
@@ -45,6 +46,12 @@ public function update(User $user, Company $company): bool
         {
             return true;
         }
+        if (
+            CityManager::where('user_id', $user->id)->where('city_id', $company->city_id)->count() == 1
+        )
+        {
+            return true;
+        }
         if (
             CompanyAdmin::where('user_id', $user->id)->where('company_id', $company->id)->count() == 1
             && UserRole::where('user_id', $user->id)->where('role_id', Role::COMPANY_ADMIN)->count() == 1

public/pull.php

@@ -24,7 +24,8 @@
 
 if($json['total_commits'] > 0)
 {
-	$result = shell_exec("cd /var/www/lk && git reset --hard HEAD && git pull && php artisan migrate");
+	//$result = shell_exec("cd /var/www/lk && git reset --hard HEAD && git pull && php artisan migrate");
+	$result = shell_exec("cd /var/www/lk && git reset --hard HEAD && git pull");
 	echo "<p>$result</p>";
 }