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

formatting

Browse Source
This commit is contained in:
Denis Duliçi 2022-06-18 00:36:59 +03:00
parent e5b3c18105
commit 25b254ab1a
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Utilities/Reports.php
View File

@ -26,7 +26,7 @@ class Reports
Module::enabled()->each(function ($module) use (&$list) { Module::enabled()->each(function ($module) use (&$list) {
$m = module($module->alias); $m = module($module->alias);
if (!$m || empty($m->get('reports'))) { if (! $m || $m->disabled() || empty($m->get('reports'))) {
return; return;
} }
@ -38,12 +38,6 @@ class Reports
continue; continue;
} }
$alias = static::getModuleAlias($class);
if (! empty($alias) && (new Reports)->moduleIsDisabled($alias)) {
continue;
}
$classes[$class] = static::getDefaultName($class); $classes[$class] = static::getDefaultName($class);
} }
@ -60,7 +54,7 @@ class Reports
return false; return false;
} }
if ($model->alias != 'core' && (new Reports)->moduleIsDisabled($model->alias)) { if (($model->alias != 'core') && (new static)->moduleIsDisabled($model->alias)) {
return false; return false;
} }

12
app/Utilities/Widgets.php
View File

@ -36,7 +36,7 @@ class Widgets
$m = module($module->alias); $m = module($module->alias);
if (! $m || empty($m->get('widgets'))) { if (! $m || $m->disabled() || empty($m->get('widgets'))) {
return; return;
} }
@ -48,12 +48,6 @@ class Widgets
continue; continue;
} }
$alias = static::getModuleAlias($class);
if (! empty($alias) && (new Widgets)->moduleIsDisabled($alias)) {
continue;
}
$classes[$class] = static::getDefaultName($class); $classes[$class] = static::getDefaultName($class);
} }
@ -71,7 +65,7 @@ class Widgets
$model = Widget::where('dashboard_id', session('dashboard_id'))->where('class', $class_name)->first(); $model = Widget::where('dashboard_id', session('dashboard_id'))->where('class', $class_name)->first();
if ($model->alias != 'core' && (new Widgets)->moduleIsDisabled($model->alias)) { if (($model->alias != 'core') && (new static)->moduleIsDisabled($model->alias)) {
return false; return false;
} }
@ -92,7 +86,7 @@ class Widgets
return false; return false;
} }
if ($model->alias != 'core' && (new Widgets)->moduleIsDisabled($model->alias)) { if (($model->alias != 'core') && (new static)->moduleIsDisabled($model->alias)) {
return false; return false;
} }