issue no. 88

Resolve erros while create/update user

app/Http/Controllers/Backend/Access/User/UserController.php

@@ -97,6 +97,7 @@ class UserController extends Controller
         $permissions = Permission::getSelectData('display_name');
         $userPermissions = $user->permissions()->get()->pluck('id')->toArray();
 
+
         return view('backend.access.users.edit')->with([
             'user'            => $user,
             'userRoles'       => $user->roles->pluck('id')->all(),

app/Http/Requests/Backend/Access/User/StoreUserRequest.php

@@ -32,6 +32,8 @@ class StoreUserRequest extends Request
             'last_name'  => 'required|max:255',
             'email'      => ['required', 'email', 'max:255', Rule::unique('users')],
             'password'   => 'required|min:6|confirmed',
+            'assignees_roles' => 'required',
+            'permissions'=> 'required',
         ];
     }
 
@@ -43,6 +45,7 @@ class StoreUserRequest extends Request
     public function messages()
     {
         return [
+            'assignees_roles' => 'Please Select Role'
         ];
     }
 }

app/Http/Requests/Backend/Access/User/UpdateUserRequest.php

@@ -30,6 +30,8 @@ class UpdateUserRequest extends Request
             'email'      => 'required|email',
             'first_name' => 'required',
             'last_name'  => 'required',
+            'permissions'=> 'required',
+            'assignees_roles' => 'required',
         ];
     }
 
@@ -41,6 +43,7 @@ class UpdateUserRequest extends Request
     public function messages()
     {
         return [
+            'assignees_roles' => 'Please Select Role'
         ];
     }
 }

app/Repositories/Backend/Access/User/UserRepository.php

@@ -2,20 +2,21 @@
 
 namespace App\Repositories\Backend\Access\User;
 
+use App\Models\Access\User\User;
+use Illuminate\Support\Facades\DB;
+use App\Exceptions\GeneralException;
+use App\Repositories\BaseRepository;
+use Illuminate\Support\Facades\Hash;
 use App\Events\Backend\Access\User\UserCreated;
-use App\Events\Backend\Access\User\UserDeactivated;
 use App\Events\Backend\Access\User\UserDeleted;
-use App\Events\Backend\Access\User\UserPasswordChanged;
-use App\Events\Backend\Access\User\UserPermanentlyDeleted;
-use App\Events\Backend\Access\User\UserReactivated;
-use App\Events\Backend\Access\User\UserRestored;
 use App\Events\Backend\Access\User\UserUpdated;
-use App\Exceptions\GeneralException;
-use App\Models\Access\User\User;
+use App\Events\Backend\Access\User\UserRestored;
+use App\Events\Backend\Access\User\UserDeactivated;
+use App\Events\Backend\Access\User\UserReactivated;
+use App\Events\Backend\Access\User\UserPasswordChanged;
 use App\Repositories\Backend\Access\Role\RoleRepository;
-use App\Repositories\BaseRepository;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Hash;
+use App\Events\Backend\Access\User\UserPermanentlyDeleted;
+use App\Notifications\Frontend\Auth\UserNeedsConfirmation;
 
 /**
  * Class UserRepository.
@@ -112,20 +113,27 @@ class UserRepository extends BaseRepository
                    // Attach New Permissions
                 $user->attachPermissions($permissions);
 
+
                 //Send confirmation email if requested and account approval is off
                 if (isset($data['confirmation_email']) && $user->confirmed == 0) {
-                    $email_type = 1;
+                    $user->notify(new UserNeedsConfirmation($user->confirmation_code));
                 }
 
                 event(new UserCreated($user));
 
+                /*if (isset($data['confirmation_email']) && $user->confirmed == 0) {
+                    $email_type = 1;
+                }*/
+
+
+
                 // Send email to the user
-                $options = [
+               /* $options = [
                     'data'                => $user->toArray(),
                     'email_template_type' => $email_type,
-                ];
+                ];*/
 
-                createNotification('', 1, 2, $options);
+                //createNotification('', 1, 2, $options);
 
                 return true;
             }

resources/views/backend/access/users/edit.blade.php

@@ -102,9 +102,9 @@
                                             {{ trans('labels.backend.access.users.all_permissions') }}
                                         @else
                                             @if (count($role->permissions) > 0)
-                                                <blockquote class="small">{{--
-                                            --}}@foreach ($role->permissions as $perm){{--
-                                            --}}{{$perm->display_name}}
+                                                <blockquote class="small">
+                                                    @foreach ($role->permissions as $perm)
+                                                        {{$perm->display_name}}
                                                     @endforeach
                                                 </blockquote>
                                             @else
@@ -127,10 +127,11 @@
                                 <div class="row">
                                     <div class="col-xs-12 get-available-permissions">
                                         @if ($permissions)
+
                                             @foreach ($permissions as $id => $display_name)
                                             <div class="control-group">
                                                 <label class="control control--checkbox" for="perm_{{ $id }}">
-                                                <input type="checkbox" name="permissions[{{ $id }}]" value="{{ $id }}" id="perm_{{ $id }}" {{ isset($userPermissions[$id]) && in_array($id, $userPermissions) ? 'checked' : '' }} /> <label for="perm_{{ $id }}">{{ $display_name }}</label>
+                                                    <input type="checkbox" name="permissions[{{ $id }}]" value="{{ $id }}" id="perm_{{ $id }}" {{ isset($userPermissions) && in_array($id, $userPermissions) ? 'checked' : '' }} /> <label for="perm_{{ $id }}">{{ $display_name }}</label>
                                                     <div class="control__indicator"></div>
                                                 </label>
                                             </div>