From 94e4e951b97a3c97ff72076a4c4afaf794c6223c Mon Sep 17 00:00:00 2001 From: denisdulici Date: Wed, 8 Jan 2020 11:33:39 +0300 Subject: [PATCH] removed wizard permissions --- app/Http/Controllers/Wizard/Companies.php | 12 +++++++++ app/Http/Controllers/Wizard/Currencies.php | 12 +++++++++ app/Http/Controllers/Wizard/Finish.php | 10 +++++++- app/Http/Controllers/Wizard/Taxes.php | 12 +++++++++ app/Listeners/Update/V20/Version200.php | 30 ++++++++++++++++++++++ database/seeds/Roles.php | 4 --- 6 files changed, 75 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/Wizard/Companies.php b/app/Http/Controllers/Wizard/Companies.php index d41b2b083..4d519fa8c 100644 --- a/app/Http/Controllers/Wizard/Companies.php +++ b/app/Http/Controllers/Wizard/Companies.php @@ -12,6 +12,18 @@ class Companies extends Controller { use Uploads; + /** + * Instantiate a new controller instance. + */ + public function __construct() + { + // Add CRUD permission check + $this->middleware('permission:create-common-companies')->only(['create', 'store', 'duplicate', 'import']); + $this->middleware('permission:read-common-companies')->only(['index', 'show', 'edit', 'export']); + $this->middleware('permission:update-common-companies')->only(['update', 'enable', 'disable']); + $this->middleware('permission:delete-common-companies')->only('destroy'); + } + /** * Show the form for creating a new resource. * diff --git a/app/Http/Controllers/Wizard/Currencies.php b/app/Http/Controllers/Wizard/Currencies.php index c9f8e74a9..50eb9f72e 100644 --- a/app/Http/Controllers/Wizard/Currencies.php +++ b/app/Http/Controllers/Wizard/Currencies.php @@ -12,6 +12,18 @@ use App\Models\Setting\Currency; class Currencies extends Controller { + /** + * Instantiate a new controller instance. + */ + public function __construct() + { + // Add CRUD permission check + $this->middleware('permission:create-settings-currencies')->only(['create', 'store', 'duplicate', 'import']); + $this->middleware('permission:read-settings-currencies')->only(['index', 'show', 'edit', 'export']); + $this->middleware('permission:update-settings-currencies')->only(['update', 'enable', 'disable']); + $this->middleware('permission:delete-settings-currencies')->only('destroy'); + } + /** * Show the form for editing the specified resource. * diff --git a/app/Http/Controllers/Wizard/Finish.php b/app/Http/Controllers/Wizard/Finish.php index fa0157066..4844f2adb 100644 --- a/app/Http/Controllers/Wizard/Finish.php +++ b/app/Http/Controllers/Wizard/Finish.php @@ -4,12 +4,20 @@ namespace App\Http\Controllers\Wizard; use Illuminate\Routing\Controller; use App\Traits\Modules; -use App\Models\Module\Module; class Finish extends Controller { use Modules; + /** + * Instantiate a new controller instance. + */ + public function __construct() + { + // Add CRUD permission check + $this->middleware('permission:read-admin-panel')->only(['index', 'show', 'edit', 'export']); + } + /** * Show the form for creating a new resource. * diff --git a/app/Http/Controllers/Wizard/Taxes.php b/app/Http/Controllers/Wizard/Taxes.php index 0dbbb6c80..cf643794c 100644 --- a/app/Http/Controllers/Wizard/Taxes.php +++ b/app/Http/Controllers/Wizard/Taxes.php @@ -11,6 +11,18 @@ use App\Models\Setting\Tax; class Taxes extends Controller { + /** + * Instantiate a new controller instance. + */ + public function __construct() + { + // Add CRUD permission check + $this->middleware('permission:create-settings-taxes')->only(['create', 'store', 'duplicate', 'import']); + $this->middleware('permission:read-settings-taxes')->only(['index', 'show', 'edit', 'export']); + $this->middleware('permission:update-settings-taxes')->only(['update', 'enable', 'disable']); + $this->middleware('permission:delete-settings-taxes')->only('destroy'); + } + /** * Show the form for editing the specified resource. * diff --git a/app/Listeners/Update/V20/Version200.php b/app/Listeners/Update/V20/Version200.php index 66f08542e..bcfaef30e 100644 --- a/app/Listeners/Update/V20/Version200.php +++ b/app/Listeners/Update/V20/Version200.php @@ -756,6 +756,36 @@ class Version200 extends Listener 'admin' => [ 'read-modules-token', 'update-modules-token', + 'create-wizard-companies', + 'read-wizard-companies', + 'update-wizard-companies', + 'create-wizard-currencies', + 'read-wizard-currencies', + 'update-wizard-currencies', + 'delete-wizard-currencies', + 'create-wizard-taxes', + 'read-wizard-taxes', + 'update-wizard-taxes', + 'create-wizard-finish', + 'read-wizard-finish', + 'update-wizard-finish', + ], + 'manager' => [ + 'read-modules-token', + 'update-modules-token', + 'create-wizard-companies', + 'read-wizard-companies', + 'update-wizard-companies', + 'create-wizard-currencies', + 'read-wizard-currencies', + 'update-wizard-currencies', + 'delete-wizard-currencies', + 'create-wizard-taxes', + 'read-wizard-taxes', + 'update-wizard-taxes', + 'create-wizard-finish', + 'read-wizard-finish', + 'update-wizard-finish', ], 'customer' => [ 'read-customer-panel', diff --git a/database/seeds/Roles.php b/database/seeds/Roles.php index 14054392f..055d493be 100644 --- a/database/seeds/Roles.php +++ b/database/seeds/Roles.php @@ -86,10 +86,6 @@ class Roles extends Seeder 'widgets-total-expenses' => 'r', 'widgets-total-income' => 'r', 'widgets-total-profit' => 'r', - 'wizard-companies' => 'c,r,u', - 'wizard-currencies' => 'c,r,u,d', - 'wizard-finish' => 'c,r,u', - 'wizard-taxes' => 'c,r,u', ], 'manager' => [ 'admin-panel' => 'r',