diff --git a/app/Http/Controllers/Common/Dashboard.php b/app/Http/Controllers/Common/Dashboard.php index 2bb039c12..bdf00ac3d 100644 --- a/app/Http/Controllers/Common/Dashboard.php +++ b/app/Http/Controllers/Common/Dashboard.php @@ -41,7 +41,7 @@ class Dashboard extends Controller // Widgets $widgets = Widget::where('dashboard_id', $dashboard->id)->orderBy('sort', 'asc')->get()->filter(function ($widget) { return WidgetUtility::canRead($widget->class); - })->all(); + }); $financial_start = $this->getFinancialStart()->format('Y-m-d'); diff --git a/app/Utilities/Reports.php b/app/Utilities/Reports.php index 68393b065..493be8705 100644 --- a/app/Utilities/Reports.php +++ b/app/Utilities/Reports.php @@ -8,7 +8,7 @@ use Illuminate\Support\Str; class Reports { - public static function getClasses() + public static function getClasses($check_permission = true) { $classes = []; @@ -31,7 +31,7 @@ class Reports }); foreach ($list as $class) { - if (!class_exists($class) || !static::canRead($class)) { + if (!class_exists($class) || ($check_permission && !static::canRead($class))) { continue; } diff --git a/app/Utilities/Widgets.php b/app/Utilities/Widgets.php index 61809da08..d10cc7211 100644 --- a/app/Utilities/Widgets.php +++ b/app/Utilities/Widgets.php @@ -8,7 +8,7 @@ use Illuminate\Support\Str; class Widgets { - public static function getClasses() + public static function getClasses($check_permission = true) { $classes = []; @@ -35,7 +35,7 @@ class Widgets }); foreach ($list as $class) { - if (!class_exists($class) || !static::canRead($class)) { + if (!class_exists($class) || ($check_permission && !static::canRead($class))) { continue; } diff --git a/database/migrations/2019_11_14_000000_create_reports_table.php b/database/migrations/2019_11_14_000000_create_reports_table.php index 95390049a..9a9809f7a 100644 --- a/database/migrations/2019_11_14_000000_create_reports_table.php +++ b/database/migrations/2019_11_14_000000_create_reports_table.php @@ -16,9 +16,9 @@ class CreateReportsTable extends Migration Schema::create('reports', function (Blueprint $table) { $table->increments('id'); $table->integer('company_id'); + $table->string('class'); $table->string('name'); $table->text('description'); - $table->string('class'); $table->string('group'); $table->string('period'); $table->string('basis'); diff --git a/database/seeds/Dashboards.php b/database/seeds/Dashboards.php index c306335fe..e083857ea 100644 --- a/database/seeds/Dashboards.php +++ b/database/seeds/Dashboards.php @@ -36,7 +36,7 @@ class Dashboards extends Seeder 'enabled' => 1, ]); - $widgets = WidgetUtility::getClasses(); + $widgets = WidgetUtility::getClasses(false); $sort = 1;