Fixed issue with editing roles in teams mode

Author: andrewdrake

resources/lang/en/lang.php

@@ -206,6 +206,8 @@
     'role_cant_be_deleted' => "role can't be deleted",
     'roles' => 'roles',
     'add_role' => 'add role',
+    'create_role' => 'create role',
+    'edit_role' => 'edit role',
     'phone_numbers' => 'phone numbers',
     'emails' => 'emails',
     'addresses' => 'addresses',

resources/views/roles/edit.blade.php

@@ -11,7 +11,7 @@
         <div class="card-body">
             <div class="tab-content">
                 <div class="tab-pane active" id="roles" role="tabpanel">
-                    <h3 class="mb-3">{{ ucfirst(__('laravel-crm::lang.role')) }}: {{ $role->name }} <span class="float-right">
+                    <h3 class="mb-3">{{ ucfirst(__('laravel-crm::lang.edit_role')) }}: {{ $role->name }} <span class="float-right">
                             <a type="button" class="btn btn-outline-secondary btn-sm" href="{{ url(route('laravel-crm.roles.index')) }}"><span class="fa fa-angle-double-left"></span> {{ ucfirst(__('laravel-crm::lang.back_to_roles')) }}</a>
                         </span></h3>
                     @include('laravel-crm::roles.partials.fields')

src/Http/Controllers/RoleController.php

@@ -53,12 +53,22 @@ public function store(StoreRoleRequest $request)
         }
 
         app()[\Spatie\Permission\PermissionRegistrar::class]->forgetCachedPermissions();
-        $role = Role::create([
-            'name' => $request->name,
-            'description' => $request->description,
-            'crm_role' => 1,
-        ]);
 
+        if (config('laravel-crm.teams')) {
+            $role = Role::create([
+                'name' => $request->name,
+                'description' => $request->description,
+                'crm_role' => 1,
+                'team_id' => auth()->user()->currentTeam->id,
+            ]);
+        } else {
+            $role = Role::create([
+                'name' => $request->name,
+                'description' => $request->description,
+                'crm_role' => 1,
+            ]);
+        }
+        
         $role->syncPermissions($permissionsArray);
 
         flash(ucfirst(trans('laravel-crm::lang.role_stored')))->success()->important();

src/Http/Controllers/UserController.php

@@ -95,8 +95,8 @@ public function store(StoreUserRequest $request)
 
         if ($request->role) {
             if ($role = Role::find($request->role)) {
-                if($removeRole = $user->roles()->where('crm_role',1)->first()){
-                    $user->removeRole($removeRole); 
+                if ($removeRole = $user->roles()->where('crm_role', 1)->first()) {
+                    $user->removeRole($removeRole);
                 }
 
                 $user->assignRole($role);
@@ -174,7 +174,7 @@ public function update(UpdateUserRequest $request, User $user)
 
         if ($request->role) {
             if ($role = Role::find($request->role)) {
-                if($removeRole = $user->roles()->where('crm_role',1)->first()){
+                if ($removeRole = $user->roles()->where('crm_role', 1)->first()) {
                     $user->removeRole($removeRole);
                 }
 

src/Models/Role.php

@@ -3,7 +3,6 @@
 namespace VentureDrake\LaravelCrm\Models;
 
 use Spatie\Permission\Models\Role as SpatieRole;
-use VentureDrake\LaravelCrm\Traits\BelongsToTeams;
 
 class Role extends SpatieRole
 {