diff --git a/app/Http/Controllers/BranchController.php b/app/Http/Controllers/BranchController.php index 82d6a9a..65c6885 100644 --- a/app/Http/Controllers/BranchController.php +++ b/app/Http/Controllers/BranchController.php @@ -17,7 +17,14 @@ public function __construct() { - $this->user = Auth::guard('web')->user(); + // Mengatur middleware auth + $this->middleware('auth'); + + // Mengatur user setelah middleware auth dijalankan + $this->middleware(function ($request, $next) { + $this->user = Auth::user(); + return $next($request); + }); } public function index() diff --git a/app/Http/Controllers/CurrencyController.php b/app/Http/Controllers/CurrencyController.php index c9e87ea..1cdd1fb 100644 --- a/app/Http/Controllers/CurrencyController.php +++ b/app/Http/Controllers/CurrencyController.php @@ -9,6 +9,7 @@ use Modules\Basicdata\Exports\CurrencyExport; use Modules\Basicdata\Http\Requests\CurrencyRequest; use Modules\Basicdata\Models\Currency; + use Illuminate\Support\Facades\Auth; class CurrencyController extends Controller { @@ -16,7 +17,14 @@ public function __construct() { - $this->user = Auth::guard('web')->user(); + // Mengatur middleware auth + $this->middleware('auth'); + + // Mengatur user setelah middleware auth dijalankan + $this->middleware(function ($request, $next) { + $this->user = Auth::user(); + return $next($request); + }); } public function index() diff --git a/app/Http/Controllers/HolidayCalendarController.php b/app/Http/Controllers/HolidayCalendarController.php index 5998ac4..01e5b26 100644 --- a/app/Http/Controllers/HolidayCalendarController.php +++ b/app/Http/Controllers/HolidayCalendarController.php @@ -9,6 +9,7 @@ use Modules\Basicdata\Exports\HolidayCalendarExport; use Modules\Basicdata\Http\Requests\HolidayCalendarRequest; use Modules\Basicdata\Models\HolidayCalendar; + use Illuminate\Support\Facades\Auth; class HolidayCalendarController extends Controller { @@ -16,7 +17,14 @@ public function __construct() { - $this->user = Auth::guard('web')->user(); + // Mengatur middleware auth + $this->middleware('auth'); + + // Mengatur user setelah middleware auth dijalankan + $this->middleware(function ($request, $next) { + $this->user = Auth::user(); + return $next($request); + }); } public function index() diff --git a/database/seeders/PermissionSeeder.php b/database/seeders/PermissionSeeder.php index 4d6c1fc..8ce9983 100644 --- a/database/seeders/PermissionSeeder.php +++ b/database/seeders/PermissionSeeder.php @@ -16,14 +16,10 @@ $data = $this->data(); foreach ($data as $value) { - $group = PermissionGroup::updateOrCreate([ + PermissionGroup::updateOrCreate([ 'name' => $value['name'], 'slug' => Str::slug($value['name']) ]); - - foreach ($this->crudActions($group->name) as $action) { - $data[] = ['name' => $action, 'group' => $group->id]; - } } } @@ -33,18 +29,4 @@ ['name' => 'basic-data'] ]; } - - public function crudActions($name) - { - $actions = []; - // list of permission actions - $crud = ['create', 'read', 'update', 'delete','export', 'authorize', 'report','restore']; - - - foreach ($crud as $value) { - $actions[] = $name . '.' . $value; - } - - return $actions; - } }