diff --git a/Database/Seeders/PermissionsSeeder.php b/Database/Seeders/PermissionsSeeder.php index 770944c..d202bfb 100644 --- a/Database/Seeders/PermissionsSeeder.php +++ b/Database/Seeders/PermissionsSeeder.php @@ -22,22 +22,17 @@ foreach ($data as $value) { $permission = Permission::updateOrCreate([ 'name' => $value['name'], - 'guard_name' => 'web' // or 'api - ], [ - 'permission_group_id' => $value['group'] + 'guard_name' => 'web' + ], [ // or 'api + 'permission_group_id' => $value['group'] ]); $roles = Role::all(); foreach ($roles as $role) { - if ($role->name == 'administrator') { + if ($role->name == 'super-administrator') { $role->givePermissionTo($permission); - } else { - if ($permission->name == 'user.read' || $permission->name == 'role.read' || $permission->name == 'permission.read') { - $role->givePermissionTo($permission); - } } } - } } diff --git a/Database/Seeders/RolesSeeder.php b/Database/Seeders/RolesSeeder.php index a53ef8d..41b4725 100644 --- a/Database/Seeders/RolesSeeder.php +++ b/Database/Seeders/RolesSeeder.php @@ -26,8 +26,11 @@ public function data() { return [ + ['name' => 'super-administrator'], ['name' => 'administrator'], - ['name' => 'user'], + ['name' => 'finance'], + ['name' => 'procurement'], + ['name' => 'sales'], ]; } } diff --git a/Database/Seeders/UsersSeeder.php b/Database/Seeders/UsersSeeder.php index d25b7fb..35ddea1 100644 --- a/Database/Seeders/UsersSeeder.php +++ b/Database/Seeders/UsersSeeder.php @@ -17,24 +17,17 @@ */ public function run(Generator $faker) { - $roleAdmin = Role::find(1); - $roleUser = Role::find(2); + $roles = Role::all(); - $user = User::create([ - 'name' => $faker->name, - 'email' => 'demo@demo.com', - 'password' => Hash::make('demo'), - 'email_verified_at' => now(), - ]); + foreach ($roles as $role) { + $user = User::create([ + 'name' => $faker->name, + 'email' => $role->name.'@demo.com', + 'password' => Hash::make('demo'), + 'email_verified_at' => now(), + ]); - $admin = User::create([ - 'name' => $faker->name, - 'email' => 'admin@demo.com', - 'password' => Hash::make('demo'), - 'email_verified_at' => now(), - ]); - - $admin->assignRole($roleAdmin,); - $user->assignRole($roleUser); + $user->assignRole($role); + } } }