diff --git a/app/controllers/admin/DashboardController.php b/app/controllers/admin/DashboardController.php index 98bc82e85c..bd0b3b2575 100755 --- a/app/controllers/admin/DashboardController.php +++ b/app/controllers/admin/DashboardController.php @@ -4,6 +4,7 @@ use AdminController; use View; use Asset; use Actionlog; +use Company; class DashboardController extends AdminController { @@ -16,12 +17,15 @@ class DashboardController extends AdminController { // Show the page - $recent_activity = Actionlog::orderBy('created_at','DESC')->with('accessorylog','consumablelog','licenselog','assetlog','adminlog','userlog')->take(7)->get(); + $recent_activity = Company::scopeActionLogs(Actionlog::orderBy('created_at','DESC')) + ->with('accessorylog','consumablelog','licenselog','assetlog','adminlog','userlog') + ->take(7) + ->get(); - $asset_stats['total'] = Asset::Hardware()->count(); + $asset_stats['total'] = Company::scopeCompanayables(Asset::Hardware())->count(); - $asset_stats['rtd']['total'] = Asset::Hardware()->RTD()->count(); + $asset_stats['rtd']['total'] = Company::scopeCompanayables(Asset::Hardware()->RTD())->count(); if ($asset_stats['rtd']['total'] > 0) { $asset_stats['rtd']['percent'] = round(($asset_stats['rtd']['total']/$asset_stats['total']) * 100); @@ -30,7 +34,7 @@ class DashboardController extends AdminController } - $asset_stats['pending']['total'] = Asset::Hardware()->Pending()->count(); + $asset_stats['pending']['total'] = Company::scopeCompanayables(Asset::Hardware()->Pending())->count(); if ($asset_stats['pending']['total'] > 0) { $asset_stats['pending']['percent'] = round(($asset_stats['pending']['total']/$asset_stats['total']) * 100); @@ -39,7 +43,7 @@ class DashboardController extends AdminController } - $asset_stats['deployed']['total'] = Asset::Hardware()->Deployed()->count(); + $asset_stats['deployed']['total'] = Company::scopeCompanayables(Asset::Hardware()->Deployed())->count(); if ($asset_stats['deployed']['total'] > 0) { $asset_stats['deployed']['percent'] = round(($asset_stats['deployed']['total']/$asset_stats['total']) * 100); @@ -48,7 +52,7 @@ class DashboardController extends AdminController } - $asset_stats['undeployable']['total'] = Asset::Hardware()->Undeployable()->count(); + $asset_stats['undeployable']['total'] = Company::scopeCompanayables(Asset::Hardware()->Undeployable())->count(); if ($asset_stats['undeployable']['total'] > 0) { $asset_stats['undeployable']['percent'] = round(($asset_stats['undeployable']['total']/$asset_stats['total']) * 100); @@ -56,7 +60,7 @@ class DashboardController extends AdminController $asset_stats['undeployable']['percent'] = 0; } - $asset_stats['archived']['total'] = Asset::Hardware()->Archived()->count(); + $asset_stats['archived']['total'] = Company::scopeCompanayables(Asset::Hardware()->Archived())->count(); if ($asset_stats['archived']['total'] > 0) { $asset_stats['archived']['percent'] = round(($asset_stats['archived']['total']/$asset_stats['total']) * 100); diff --git a/app/models/Asset.php b/app/models/Asset.php index 6ad26d3922..1a0ee9faae 100755 --- a/app/models/Asset.php +++ b/app/models/Asset.php @@ -258,7 +258,7 @@ return false; public static function assetcount() { - return DB::table( 'assets' ) + return Company::scopeCompanayables( DB::table( 'assets' ) ) ->where( 'physical', '=', '1' ) ->whereNull( 'deleted_at', 'and' ) ->count(); @@ -270,7 +270,7 @@ return false; public static function availassetcount() { - return Asset::RTD() + return Company::scopeCompanayables( Asset::RTD() ) ->whereNull( 'deleted_at' ) ->count(); diff --git a/app/models/License.php b/app/models/License.php index 3776e2004e..7a38dfa950 100755 --- a/app/models/License.php +++ b/app/models/License.php @@ -69,7 +69,7 @@ class License extends Depreciable */ public static function assetcount() { - return DB::table('license_seats') + return Company::scopeCompanayableChildren('license', LicenseSeat::with('license')) ->whereNull('deleted_at') ->count(); } @@ -92,7 +92,7 @@ class License extends Depreciable */ public static function availassetcount() { - return DB::table('license_seats') + return Company::scopeCompanayableChildren('license', LicenseSeat::with('license')) ->whereNull('assigned_to') ->whereNull('asset_id') ->whereNull('deleted_at')