Deleting problem of currencies at wizard step is fixed. It also solves issue #934
Feature tests are added.
This commit is contained in:
parent
e1b2c74b44
commit
0051f43c67
@ -17,12 +17,12 @@ class Roles extends Seeder
|
|||||||
public function run()
|
public function run()
|
||||||
{
|
{
|
||||||
Model::unguard();
|
Model::unguard();
|
||||||
|
|
||||||
$this->create($this->roles(), $this->map());
|
$this->create($this->roles(), $this->map());
|
||||||
|
|
||||||
Model::reguard();
|
Model::reguard();
|
||||||
}
|
}
|
||||||
|
|
||||||
private function roles()
|
private function roles()
|
||||||
{
|
{
|
||||||
$rows = [
|
$rows = [
|
||||||
@ -76,7 +76,7 @@ class Roles extends Seeder
|
|||||||
'settings-schedule' => 'r',
|
'settings-schedule' => 'r',
|
||||||
'settings-taxes' => 'c,r,u,d',
|
'settings-taxes' => 'c,r,u,d',
|
||||||
'wizard-companies' => 'c,r,u',
|
'wizard-companies' => 'c,r,u',
|
||||||
'wizard-currencies' => 'c,r,u',
|
'wizard-currencies' => 'c,r,u,d',
|
||||||
'wizard-finish' => 'c,r,u',
|
'wizard-finish' => 'c,r,u',
|
||||||
'wizard-taxes' => 'c,r,u',
|
'wizard-taxes' => 'c,r,u',
|
||||||
],
|
],
|
||||||
@ -127,10 +127,10 @@ class Roles extends Seeder
|
|||||||
'portal-profile' => 'r,u',
|
'portal-profile' => 'r,u',
|
||||||
],
|
],
|
||||||
];
|
];
|
||||||
|
|
||||||
return $rows;
|
return $rows;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function map()
|
private function map()
|
||||||
{
|
{
|
||||||
$rows = [
|
$rows = [
|
||||||
@ -139,14 +139,14 @@ class Roles extends Seeder
|
|||||||
'u' => 'update',
|
'u' => 'update',
|
||||||
'd' => 'delete'
|
'd' => 'delete'
|
||||||
];
|
];
|
||||||
|
|
||||||
return $rows;
|
return $rows;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function create($roles, $map)
|
private function create($roles, $map)
|
||||||
{
|
{
|
||||||
$mapPermission = collect($map);
|
$mapPermission = collect($map);
|
||||||
|
|
||||||
foreach ($roles as $key => $modules) {
|
foreach ($roles as $key => $modules) {
|
||||||
// Create a new role
|
// Create a new role
|
||||||
$role = Role::create([
|
$role = Role::create([
|
||||||
@ -154,26 +154,26 @@ class Roles extends Seeder
|
|||||||
'display_name' => ucwords(str_replace("_", " ", $key)),
|
'display_name' => ucwords(str_replace("_", " ", $key)),
|
||||||
'description' => ucwords(str_replace("_", " ", $key))
|
'description' => ucwords(str_replace("_", " ", $key))
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$this->command->info('Creating Role '. strtoupper($key));
|
$this->command->info('Creating Role '. strtoupper($key));
|
||||||
|
|
||||||
// Reading role permission modules
|
// Reading role permission modules
|
||||||
foreach ($modules as $module => $value) {
|
foreach ($modules as $module => $value) {
|
||||||
$permissions = explode(',', $value);
|
$permissions = explode(',', $value);
|
||||||
|
|
||||||
foreach ($permissions as $p => $perm) {
|
foreach ($permissions as $p => $perm) {
|
||||||
$permissionValue = $mapPermission->get($perm);
|
$permissionValue = $mapPermission->get($perm);
|
||||||
|
|
||||||
$moduleName = ucwords(str_replace("-", " ", $module));
|
$moduleName = ucwords(str_replace("-", " ", $module));
|
||||||
|
|
||||||
$permission = Permission::firstOrCreate([
|
$permission = Permission::firstOrCreate([
|
||||||
'name' => $permissionValue . '-' . $module,
|
'name' => $permissionValue . '-' . $module,
|
||||||
'display_name' => ucfirst($permissionValue) . ' ' . $moduleName,
|
'display_name' => ucfirst($permissionValue) . ' ' . $moduleName,
|
||||||
'description' => ucfirst($permissionValue) . ' ' . $moduleName,
|
'description' => ucfirst($permissionValue) . ' ' . $moduleName,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$this->command->info('Creating Permission to '.$permissionValue.' for '. $moduleName);
|
$this->command->info('Creating Permission to '.$permissionValue.' for '. $moduleName);
|
||||||
|
|
||||||
if (!$role->hasPermission($permission->name)) {
|
if (!$role->hasPermission($permission->name)) {
|
||||||
$role->attachPermission($permission);
|
$role->attachPermission($permission);
|
||||||
} else {
|
} else {
|
||||||
|
@ -3,16 +3,17 @@
|
|||||||
Route::group(['as' => 'wizard.'], function () {
|
Route::group(['as' => 'wizard.'], function () {
|
||||||
Route::get('companies', 'Wizard\Companies@edit')->name('companies.edit');
|
Route::get('companies', 'Wizard\Companies@edit')->name('companies.edit');
|
||||||
Route::patch('companies', 'Wizard\Companies@update')->name('companies.update');
|
Route::patch('companies', 'Wizard\Companies@update')->name('companies.update');
|
||||||
|
|
||||||
Route::get('currencies', 'Wizard\Currencies@index')->name('currencies.index');
|
Route::get('currencies', 'Wizard\Currencies@index')->name('currencies.index');
|
||||||
Route::get('currencies/{currency}/delete', 'Wizard\Currencies@destroy')->name('currencies.delete');
|
Route::delete('currencies/{currency}', 'Wizard\Currencies@destroy')->name('currencies.delete');
|
||||||
Route::post('currencies', 'Wizard\Currencies@store')->name('currencies.store');
|
Route::post('currencies', 'Wizard\Currencies@store')->name('currencies.store');
|
||||||
Route::patch('currencies/{currency}', 'Wizard\Currencies@update')->name('currencies.update');
|
Route::patch('currencies/{currency}', 'Wizard\Currencies@update')->name('currencies.update');
|
||||||
|
|
||||||
Route::get('taxes', 'Wizard\Taxes@index')->name('taxes.index');
|
Route::get('taxes', 'Wizard\Taxes@index')->name('taxes.index');
|
||||||
Route::get('taxes/{tax}/delete', 'Wizard\Taxes@destroy')->name('taxes.delete');
|
Route::get('taxes/{tax}/delete', 'Wizard\Taxes@destroy')->name('taxes.delete');
|
||||||
Route::post('taxes', 'Wizard\Taxes@store')->name('taxes.store');
|
Route::post('taxes', 'Wizard\Taxes@store')->name('taxes.store');
|
||||||
Route::patch('taxes/{tax}', 'Wizard\Taxes@update')->name('taxes.update');
|
Route::patch('taxes/{tax}', 'Wizard\Taxes@update')->name('taxes.update');
|
||||||
|
|
||||||
Route::get('finish', 'Wizard\Finish@index')->name('finish.index');
|
Route::get('finish', 'Wizard\Finish@index')->name('finish.index');
|
||||||
});
|
});
|
||||||
|
|
70
tests/Feature/Wizard/CurrenciesTest.php
Normal file
70
tests/Feature/Wizard/CurrenciesTest.php
Normal file
@ -0,0 +1,70 @@
|
|||||||
|
<?php
|
||||||
|
namespace Tests\Feature\Wizard;
|
||||||
|
|
||||||
|
use App\Jobs\Setting\CreateCurrency;
|
||||||
|
use Tests\Feature\FeatureTestCase;
|
||||||
|
|
||||||
|
class CurrenciesTest extends FeatureTestCase
|
||||||
|
{
|
||||||
|
|
||||||
|
public function testItShouldSeeCurrencyListPage()
|
||||||
|
{
|
||||||
|
$this->loginAs()
|
||||||
|
->get(route('wizard.currencies.index'))
|
||||||
|
->assertStatus(200)
|
||||||
|
->assertSeeText(trans_choice('general.currencies', 2));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testItShouldCreateCurrency()
|
||||||
|
{
|
||||||
|
$this->loginAs()
|
||||||
|
->post(route('wizard.currencies.store'), $this->getCurrencyRequest())
|
||||||
|
->assertStatus(200);
|
||||||
|
|
||||||
|
$this->assertFlashLevel('success');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testItShouldUpdateCurrency()
|
||||||
|
{
|
||||||
|
$request = $this->getCurrencyRequest();
|
||||||
|
|
||||||
|
$currency = $this->dispatch(new CreateCurrency($request));
|
||||||
|
|
||||||
|
$request['name'] = $this->faker->text(15);
|
||||||
|
|
||||||
|
$this->loginAs()
|
||||||
|
->patch(route('wizard.currencies.update', $currency->id), $request)
|
||||||
|
->assertStatus(200);
|
||||||
|
|
||||||
|
$this->assertFlashLevel('success');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testItShouldDeleteCurrency()
|
||||||
|
{
|
||||||
|
$currency = $this->dispatch(new CreateCurrency($this->getCurrencyRequest()));
|
||||||
|
|
||||||
|
$this->loginAs()
|
||||||
|
->delete(route('wizard.currencies.delete', $currency->id))
|
||||||
|
->assertStatus(200);
|
||||||
|
|
||||||
|
$this->assertFlashLevel('success');
|
||||||
|
}
|
||||||
|
|
||||||
|
private function getCurrencyRequest()
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'company_id' => $this->company->id,
|
||||||
|
'name' => $this->faker->text(15),
|
||||||
|
'code' => $this->faker->text(strtoupper(5)),
|
||||||
|
'rate' => $this->faker->boolean(1),
|
||||||
|
'precision' => $this->faker->text(5),
|
||||||
|
'symbol' => $this->faker->text(5),
|
||||||
|
'symbol_first' => 1,
|
||||||
|
'symbol_position' => 'after_amount',
|
||||||
|
'decimal_mark' => $this->faker->text(5),
|
||||||
|
'thousands_separator' => $this->faker->text(5),
|
||||||
|
'enabled' => $this->faker->boolean ? 1 : 0,
|
||||||
|
'default_currency' => 0
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user