shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deleting problem of currencies at wizard step is fixed. It also solves issue #934

Browse Source 
Feature tests are added.
This commit is contained in:
Sevan Nerse
2019-12-12 00:04:07 +03:00
parent e1b2c74b44
commit 0051f43c67
3 changed files with 91 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
database/seeds/Roles.php
View File

@ -17,12 +17,12 @@ class Roles extends Seeder
public function run()
{
Model::unguard();
$this->create($this->roles(), $this->map());
Model::reguard();
}
private function roles()
{
$rows = [
@ -76,7 +76,7 @@ class Roles extends Seeder
'settings-schedule' => 'r',
'settings-taxes' => 'c,r,u,d',
'wizard-companies' => 'c,r,u',
'wizard-currencies' => 'c,r,u',
'wizard-currencies' => 'c,r,u,d',
'wizard-finish' => 'c,r,u',
'wizard-taxes' => 'c,r,u',
],
@ -127,10 +127,10 @@ class Roles extends Seeder
'portal-profile' => 'r,u',
],
];
return $rows;
}
private function map()
{
$rows = [
@ -139,14 +139,14 @@ class Roles extends Seeder
'u' => 'update',
'd' => 'delete'
];
return $rows;
}
private function create($roles, $map)
{
$mapPermission = collect($map);
foreach ($roles as $key => $modules) {
// Create a new role
$role = Role::create([
@ -154,26 +154,26 @@ class Roles extends Seeder
'display_name' => ucwords(str_replace("_", " ", $key)),
'description' => ucwords(str_replace("_", " ", $key))
]);
$this->command->info('Creating Role '. strtoupper($key));
// Reading role permission modules
foreach ($modules as $module => $value) {
$permissions = explode(',', $value);
foreach ($permissions as $p => $perm) {
$permissionValue = $mapPermission->get($perm);
$moduleName = ucwords(str_replace("-", " ", $module));
$permission = Permission::firstOrCreate([
'name' => $permissionValue . '-' . $module,
'display_name' => ucfirst($permissionValue) . ' ' . $moduleName,
'description' => ucfirst($permissionValue) . ' ' . $moduleName,
]);
$this->command->info('Creating Permission to '.$permissionValue.' for '. $moduleName);
if (!$role->hasPermission($permission->name)) {
$role->attachPermission($permission);
} else {